Workaround XJC generation issue

hibernate · May 23, 2022 · f2446e2 · f2446e2
1 parent 81d749e
commit f2446e2
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
@@ -129,14 +129,21 @@ xjc {
 //            xjcBindingFile = file( 'src/main/xjb/mapping-bindings.xjb' )
 //            xjcExtensions += ['inheritance']
 //        }
-        mapping {
-            xsdFile = file( 'src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd' )
-            xjcBindingFile = file( 'src/main/xjb/mapping-bindings.xjb' )
-            xjcExtensions += ['inheritance', 'simplify']
-        }
+//        mapping {
+//            xsdFile = file( 'src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd' )
+//            xjcBindingFile = file( 'src/main/xjb/mapping-bindings.xjb' )
+//            xjcExtensions += ['inheritance', 'simplify']
+//        }
     }
 }
 
+task mappingXsd (type: org.hibernate.build.gradle.xjc.jakarta.XjcTask) {
+    outputDirectory = project.jaxbTargetDir
+    xsdFile = file( 'src/main/resources/org/hibernate/xsd/mapping/mapping-3.1.0.xsd' )
+    xjcBindingFile = file( 'src/main/xjb/mapping-bindings.xjb' )
+    xjcExtensions = ['inheritance', 'simplify']
+}
+tasks.findByPath( sourceSets.findByName( SourceSet.MAIN_SOURCE_SET_NAME ).getCompileJavaTaskName() ).dependsOn mappingXsd
 
 task copyBundleResources (type: Copy) {
     inputs.property( "db", db )