diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 0000000..2579e37
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+
+    <module name="Header">
+        <property name="headerFile" value="${config_loc}/headers/header-java.txt"/>
+        <property name="fileExtensions" value="java,gradle,groovy"/>
+    </module>
+
+    <module name="Header">
+        <property name="headerFile" value="${config_loc}/headers/header-xml.txt"/>
+        <property name="fileExtensions" value="xml,xsd,xjb"/>
+    </module>
+
+    <module name="TreeWalker">
+        <module name="RegexpSinglelineJava">
+            <property name="ignoreComments" value="true" />
+            <property name="format" value="^\t* +\t*\S" />
+            <property name="message" value="Line has leading space characters; indentation should be performed with tabs only." />
+        </module>
+
+        <module name="Regexp">
+            <property name="format" value="/^(master|slave)$/"/>
+            <property name="illegalPattern" value="true"/>
+            <property name="message" value="Conscious Language (use of terms 'master' or 'slave' not allowed)"/>
+        </module>
+
+        <module name="MissingDeprecated" />
+
+        <module name="MissingOverride" />
+
+        <module name="PackageAnnotation" />
+
+        <module name="NeedBraces" />
+
+        <module name="LeftCurly">
+            <property name="option" value="eol" />
+        </module>
+
+        <module name="RightCurly">
+            <property name="option" value="alone" />
+        </module>
+
+        <module name="EqualsHashCode" />
+
+        <module name="StringLiteralEquality" />
+
+        <module name="NoFinalizer" />
+
+        <module name="OneStatementPerLine" />
+
+        <module name="UpperEll" />
+
+        <module name="IllegalImport">
+            <property name="illegalPkgs" value="java.awt, sun, org.slf4j"/>
+        </module>
+
+        <!--
+            Source code comment-based suppressions
+        -->
+        <module name="SuppressionCommentFilter">
+            <!--
+                Allow a finalize() method within these comments.  DriverManagerConnectionProviderImpl e.g.
+                uses a finalizer to make sure we release all of its cached connections.
+            -->
+            <property name="offCommentFormat" value="CHECKSTYLE:START_ALLOW_FINALIZER"/>
+            <property name="onCommentFormat" value="CHECKSTYLE:END_ALLOW_FINALIZER"/>
+            <property name="checkFormat" value="NoFinalizer"/>
+        </module>
+
+        <module name="SuppressWithNearbyCommentFilter">
+            <property name="commentFormat" value="noinspection StatementWithEmptyBody"/>
+            <property name="checkFormat" value="EmptyStatement"/>
+            <property name="influenceFormat" value="1"/>
+        </module>
+    </module>
+
+    <!-- We are not using NewLineAtEndOfFile because the new line chars change
+       on different operating systems and that rule allows only one type. This rule
+       is not actually checking for new lines, but it will work if we check that
+       there are not white spaces at the end of a line with another rule. -->
+    <module name="RegexpMultiline">
+        <property name="format" value="\S\z" />
+        <property name="message" value="Missing new line at the end of file" />
+    </module>
+
+    <module name="RegexpMultiline">
+        <property name="format" value="\S(r?\n){5,}\z" />
+        <property name="message" value="Files should end with no more than 5 (empty) new lines" />
+    </module>
+
+</module>
diff --git a/config/checkstyle/headers/header-java.txt b/config/checkstyle/headers/header-java.txt
new file mode 100644
index 0000000..d206a2c
--- /dev/null
+++ b/config/checkstyle/headers/header-java.txt
@@ -0,0 +1,6 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
\ No newline at end of file
diff --git a/config/checkstyle/headers/header-xml.txt b/config/checkstyle/headers/header-xml.txt
new file mode 100644
index 0000000..b47f5fc
--- /dev/null
+++ b/config/checkstyle/headers/header-xml.txt
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright: Red Hat Inc. and Hibernate Authors
+  -->
\ No newline at end of file
diff --git a/gradle/checkstyle.gradle b/gradle/checkstyle.gradle
new file mode 100644
index 0000000..8ec96fb
--- /dev/null
+++ b/gradle/checkstyle.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'checkstyle'
+
+checkstyle {
+	sourceSets = [ project.sourceSets.main ]
+	showViolations = false
+}
+// only include explicit sources (and thereby exclude generated sources)
+tasks.checkstyleMain.source = 'src/main'
diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index 1455827..a23ce87 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -1,5 +1,7 @@
 apply plugin: "java-library"
 apply from: rootProject.file( "gradle/module.gradle" )
+apply from: rootProject.file( "gradle/checkstyle.gradle" )
+
 
 dependencies {
 	testImplementation testLibs.junit5Api
@@ -29,4 +31,4 @@ tasks.withType( JavaCompile ).configureEach {
 tasks.register( "compile" ) {compile->
 	compile.dependsOn tasks.named( sourceSets.main.compileJavaTaskName )
 	compile.dependsOn tasks.named( sourceSets.test.compileJavaTaskName )
-}
\ No newline at end of file
+}
diff --git a/hibernate-models-common/hibernate-models-common.gradle b/hibernate-models-common/hibernate-models-common.gradle
index 3702657..07d96b9 100644
--- a/hibernate-models-common/hibernate-models-common.gradle
+++ b/hibernate-models-common/hibernate-models-common.gradle
@@ -1,2 +1 @@
 apply from: rootProject.file( "gradle/java-module.gradle" )
-
diff --git a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/package-info.java b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/package-info.java
index dbf0577..447038c 100644
--- a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/package-info.java
+++ b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/package-info.java
@@ -6,10 +6,10 @@
  */
 
 /**
- * Overall, this module is responsible for taking
+ * Overall, this module is responsible for taking a
  * {@linkplain org.hibernate.boot.model.process.spi.ManagedResources managed-resources} and
  * binding them into Hibernate's {@linkplain org.hibernate.mapping boot-time model}.
  *
  * @author Steve Ebersole
  */
-package org.hibernate.models.orm;
\ No newline at end of file
+package org.hibernate.models.orm;
diff --git a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/xml/internal/package-info.java b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/xml/internal/package-info.java
index 600b29c..08b0fc2 100644
--- a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/xml/internal/package-info.java
+++ b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/xml/internal/package-info.java
@@ -38,4 +38,4 @@
  *
  * @author Steve Ebersole
  */
-package org.hibernate.models.orm.xml.internal;
\ No newline at end of file
+package org.hibernate.models.orm.xml.internal;
diff --git a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/xml/package-info.java b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/xml/package-info.java
index 617fff8..6687048 100644
--- a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/xml/package-info.java
+++ b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/xml/package-info.java
@@ -23,9 +23,7 @@
  *         applies overlay/override XML.
  *     </li>
  * </ol>
- * <p/>
- * First step is some {@linkplain }
  *
  * @author Steve Ebersole
  */
-package org.hibernate.models.orm.xml;
\ No newline at end of file
+package org.hibernate.models.orm.xml;
diff --git a/hibernate-models-source/src/main/java/org/hibernate/models/source/internal/jandex/JandexAnnotationUsage.java b/hibernate-models-source/src/main/java/org/hibernate/models/source/internal/jandex/JandexAnnotationUsage.java
index 1934e42..ba58391 100644
--- a/hibernate-models-source/src/main/java/org/hibernate/models/source/internal/jandex/JandexAnnotationUsage.java
+++ b/hibernate-models-source/src/main/java/org/hibernate/models/source/internal/jandex/JandexAnnotationUsage.java
@@ -67,4 +67,4 @@ public <V> V setAttributeValue(String name, V value) {
 		//noinspection unchecked
 		return (V) ( (Map<String,Object>) attributeValueMap ).put( name, value );
 	}
-}
\ No newline at end of file
+}
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
index 5b158e2..144e451 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/AbstractBinder.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
index 2f4aa74..ef281cf 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/CacheableFileXmlSource.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java
index c7b47db..ffbf85a 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/ContextProvidingValidationEventHandler.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
index f4a0367..c936201 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/FileXmlSource.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
index 933ebe4..3d914bc 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamAccessXmlSource.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
index 2bca618..2e78794 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/InputStreamXmlSource.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
index 80fe08b..7daee30 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/JarFileEntryXmlSource.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/JaxpSourceXmlSource.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/JaxpSourceXmlSource.java
index 2e8ad18..68823a9 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/JaxpSourceXmlSource.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/JaxpSourceXmlSource.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
index fa4dff1..dd34127 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/MappingBinder.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
index ea94b3a..333a628 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/UrlXmlSource.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java
index 5506a58..65ee8cc 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/XmlSources.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java
index a0ea008..f9f35c8 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/BaseXMLEventReader.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java
index aaa38e9..c470318 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/BufferedXMLEventReader.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java
index f202a79..34fc69f 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/FilteringXMLEventReader.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java
index bc6468c..37cec11 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/HbmEventReader.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java
index 4784f6f..4d128f4 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/JpaOrmXmlEventReader.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
index 0332bb9..ba1ca31 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalSchemaLocator.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
index 7f46731..80dc59a 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/LocalXmlResourceResolver.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/MappingEventReader.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/MappingEventReader.java
index 8545eb3..9064d1e 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/MappingEventReader.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/MappingEventReader.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/XMLStreamConstantsUtils.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/XMLStreamConstantsUtils.java
index 53e8737..791d733 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/XMLStreamConstantsUtils.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/XMLStreamConstantsUtils.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/XmlInfrastructureException.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/XmlInfrastructureException.java
index 1a4e6c4..81de2fe 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/XmlInfrastructureException.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/XmlInfrastructureException.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.internal.stax;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/package-info.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/package-info.java
index 99caa21..6061ae2 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/package-info.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/internal/stax/package-info.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 
 /**
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java
index 2f11f1a..88d1c76 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/AccessTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheAccessTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheAccessTypeMarshalling.java
index 631d472..d855375 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheAccessTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheAccessTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 
 package org.hibernate.boot.jaxb.mapping.internal;
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheModeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheModeMarshalling.java
index 0919789..9e14cce 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheModeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CacheModeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CollectionClassificationMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CollectionClassificationMarshalling.java
index 9e960ea..910c566 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CollectionClassificationMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/CollectionClassificationMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java
index 670a1b6..c59c018 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ConstraintModeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java
index 15a9041..99d5947 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/DiscriminatorTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java
index 84322b8..506a3e2 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/EnumTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java
index 7c8c458..d4f822b 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FetchTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FlushModeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FlushModeMarshalling.java
index 8fb41c1..1d9730c 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FlushModeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/FlushModeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTimingMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTimingMarshalling.java
index 8b91e6a..7dbf695 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTimingMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTimingMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java
index 85678a6..db1a758 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/GenerationTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java
index 9fa4cc5..7dd1c90 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/InheritanceTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LimitedCollectionClassificationMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LimitedCollectionClassificationMarshalling.java
index 3b56b14..909a9d3 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LimitedCollectionClassificationMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LimitedCollectionClassificationMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java
index f526692..2db5b5a 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/LockModeTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OnDeleteActionMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OnDeleteActionMarshalling.java
index 731e7a9..13200cd 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OnDeleteActionMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OnDeleteActionMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OptimisticLockStyleMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OptimisticLockStyleMarshalling.java
index 28060d7..e6c59ae 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OptimisticLockStyleMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/OptimisticLockStyleMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java
index 283ea47..c715b09 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ParameterModeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/PolymorphismTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/PolymorphismTypeMarshalling.java
index 025886c..7b979ae 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/PolymorphismTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/PolymorphismTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ResultCheckStyleMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ResultCheckStyleMarshalling.java
index 5cf0cf5..a926d57 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ResultCheckStyleMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/ResultCheckStyleMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java
index 8d310ef..5f063f9 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/TemporalTypeMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/UuidGeneratorStyleMarshalling.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/UuidGeneratorStyleMarshalling.java
index efb7c0d..b57b865 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/UuidGeneratorStyleMarshalling.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/internal/UuidGeneratorStyleMarshalling.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.internal;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java
index 7766e36..01e2e20 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAnyMapping.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAssociationAttribute.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAssociationAttribute.java
index 5f01796..577bd3e 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAssociationAttribute.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAssociationAttribute.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAttributesContainer.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAttributesContainer.java
index ad73ddd..814f542 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAttributesContainer.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbAttributesContainer.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBaseAttributesContainer.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBaseAttributesContainer.java
index 4abde9c..e59f3d7 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBaseAttributesContainer.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBaseAttributesContainer.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java
index dcbebf8..6380b7a 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbBasicMapping.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbDiscriminatorMapping.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbDiscriminatorMapping.java
index ba91542..ed41926 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbDiscriminatorMapping.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbDiscriminatorMapping.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java
index a7629c7..fa8b950 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddable.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddedMapping.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddedMapping.java
index a0fefb8..75b4a74 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddedMapping.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEmbeddedMapping.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntity.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntity.java
index 0d600eb..b0b54a5 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntity.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntity.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntityOrMappedSuperclass.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntityOrMappedSuperclass.java
index 568c39a..f4b1513 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntityOrMappedSuperclass.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbEntityOrMappedSuperclass.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbFetchableAttribute.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbFetchableAttribute.java
index 885e5f2..27a2147 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbFetchableAttribute.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbFetchableAttribute.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallback.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallback.java
index 3160d84..97dcaad 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallback.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallback.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallbackContainer.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallbackContainer.java
index e72e853..f700fcd 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallbackContainer.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbLifecycleCallbackContainer.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbManagedType.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbManagedType.java
index 8bc84c7..65acf7e 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbManagedType.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbManagedType.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbMappedSuperclass.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbMappedSuperclass.java
index f057c32..12031d4 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbMappedSuperclass.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbMappedSuperclass.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNamedQuery.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNamedQuery.java
index 1954a59..ad0323f 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNamedQuery.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNamedQuery.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNaturalId.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNaturalId.java
index 4b70c5d..e9f910b 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNaturalId.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNaturalId.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNotFoundCapable.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNotFoundCapable.java
index dfdd9d3..28b60b1 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNotFoundCapable.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbNotFoundCapable.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPersistentAttribute.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPersistentAttribute.java
index d74643c..6e9f3f1 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPersistentAttribute.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPersistentAttribute.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java
index bba67ac..97ffddf 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbPluralAttribute.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSchemaAware.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSchemaAware.java
index 9249b66..ce29efd 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSchemaAware.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbSchemaAware.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbToOneAttribute.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbToOneAttribute.java
index 0342ee8..0466ea2 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbToOneAttribute.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/mapping/spi/JaxbToOneAttribute.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.mapping.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java
index 6e27b12..816e2f7 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/Binder.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/Binding.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/Binding.java
index c7b15bb..e0e6c2a 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/Binding.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/Binding.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/JaxbBindableMappingDescriptor.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/JaxbBindableMappingDescriptor.java
index 969b254..b67e204 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/JaxbBindableMappingDescriptor.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/JaxbBindableMappingDescriptor.java
@@ -1,8 +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 http://www.gnu.org/licenses/lgpl-2.1.html.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.spi;
 
diff --git a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/XmlSource.java b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/XmlSource.java
index 8d81fcf..4928ced 100644
--- a/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/XmlSource.java
+++ b/hibernate-orm/src/main/java/org/hibernate/boot/jaxb/spi/XmlSource.java
@@ -1,8 +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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.boot.jaxb.spi;
 
diff --git a/hibernate-orm/src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd b/hibernate-orm/src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd
index 413b2aa..7ab88d3 100644
--- a/hibernate-orm/src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd
+++ b/hibernate-orm/src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd
@@ -3,8 +3,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 http://www.gnu.org/licenses/lgpl-2.1.html.
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright: Red Hat Inc. and Hibernate Authors
   -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns="http://www.hibernate.org/xsd/orm/mapping"
diff --git a/hibernate-orm/src/main/xjb/mapping-bindings.xjb b/hibernate-orm/src/main/xjb/mapping-bindings.xjb
index f4ca617..e512a77 100644
--- a/hibernate-orm/src/main/xjb/mapping-bindings.xjb
+++ b/hibernate-orm/src/main/xjb/mapping-bindings.xjb
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ SPDX-License-Identifier: Apache-2.0
+  ~ Copyright: Red Hat Inc. and Hibernate Authors
+  -->
+
 <bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
         xmlns:xsd="http://www.w3.org/2001/XMLSchema"
         xmlns:inheritance="http://jaxb2-commons.dev.java.net/basic/inheritance"
diff --git a/settings.gradle b/settings.gradle
index 91e204c..9d29bd7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +1,14 @@
 pluginManagement {
+	plugins {
+		id "org.checkerframework" version "0.6.34" apply false
+	}
 	repositories {
 		gradlePluginPortal()
 		mavenCentral()
 	}
 }
 
-rootProject.name = 'hibernate-models2'
+rootProject.name = "hibernate-models2"
 
 dependencyResolutionManagement {
 	repositories {