From e2e93e51b71fb8a24a9b69fcbd3f8bb6a1e06ae2 Mon Sep 17 00:00:00 2001
From: Steve Ebersole <steve@hibernate.org>
Date: Mon, 19 Jul 2021 16:45:50 -0500
Subject: [PATCH] improvements to JAXB XJC handling

---
 build.gradle                         |  2 +-
 hibernate-core/hibernate-core.gradle | 18 +++++++++---------
 settings.gradle                      | 10 ++++++++++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 42d9a83c6e..19ea1af9c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,7 @@ plugins {
 	id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0'
 	id 'eclipse'
 
-	id 'org.hibernate.build.xjc' version '2.0.1' apply false
+	id 'org.hibernate.build.xjc' version '2.2.0' apply false
 	id 'org.hibernate.matrix-test' version '3.1.0' apply false
 	id 'biz.aQute.bnd' version '5.1.1' apply false
 }
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 466498b252..143455c307 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -192,22 +192,22 @@ idea {
 }
 
 xjc {
-    outputDir = project.jaxbTargetDir
+    outputDirectory = project.jaxbTargetDir
 
     schemas {
         cfg {
-            xsd = file( 'src/main/resources/org/hibernate/xsd/cfg/legacy-configuration-4.0.xsd' )
-            xjcBinding = file( 'src/main/xjb/hbm-configuration-bindings.xjb' )
+            xsdFile = 'src/main/resources/org/hibernate/xsd/cfg/legacy-configuration-4.0.xsd'
+            xjcBindingFile = 'src/main/xjb/hbm-configuration-bindings.xjb'
         }
         hbm {
-            xsd = file( 'src/main/resources/org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd' )
-            xjcBinding = file( 'src/main/xjb/hbm-mapping-bindings.xjb' )
-            xjcExtensions = ['inheritance', 'simplify']
+            xsdFile = file( 'src/main/resources/org/hibernate/xsd/mapping/legacy-mapping-4.0.xsd' )
+            xjcBindingFile = file( 'src/main/xjb/hbm-mapping-bindings.xjb' )
+            xjcExtensions += ['inheritance', 'simplify']
         }
         mapping {
-            xsd = file( 'src/main/resources/org/hibernate/jpa/orm_2_2.xsd' )
-            xjcBinding = file( 'src/main/xjb/mapping-bindings.xjb' )
-            xjcExtensions = ['inheritance']
+            xsdFile = file( 'src/main/resources/org/hibernate/jpa/orm_2_2.xsd' )
+            xjcBindingFile = file( 'src/main/xjb/mapping-bindings.xjb' )
+            xjcExtensions += ['inheritance']
         }
     }
 }
diff --git a/settings.gradle b/settings.gradle
index 522b027e49..69f97a3a2a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -5,6 +5,16 @@
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
 
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven {
+            name = 'localPluginRepository'
+            url = uri( "${gradle.gradleUserHomeDir}/tmp/plugins" )
+        }
+    }
+}
+
 plugins {
     id 'com.gradle.enterprise' version '3.6.1'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.4.2'