improvements to JAXB XJC handling

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
 }

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']
         }
     }
 }

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'