HHH-7450 add simplify plugin

build.gradle

@@ -81,9 +81,11 @@ libraries = [
         logging_processor:  'org.jboss.logging:jboss-logging-processor:1.0.0.Final',
 
         // jaxb task
-        jaxb:           'com.sun.xml.bind:jaxb-xjc:2.1.6',
-        jaxb2_basics:   'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.0',
-        jaxb2_ant:      'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.0',
+        jaxb:           'com.sun.xml.bind:jaxb-xjc:2.2.5',
+        jaxb2_basics:   'org.jvnet.jaxb2_commons:jaxb2-basics:0.6.3',
+        jaxb2_ant:      'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.6.3',
+        jaxb2_jaxb:     'org.jvnet.jaxb2_commons:jaxb2-basics-jaxb:2.2.4-1',
+        jaxb2_jaxb_xjc: 'org.jvent.jaxb2_commons:jaxb2-basics-jaxb-xjc:2.2.4-1',
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~ testing
 
         // logging for testing
@@ -165,6 +167,8 @@ subprojects { subProject ->
             jaxb( libraries.jaxb )
             jaxb( libraries.jaxb2_basics )
             jaxb( libraries.jaxb2_ant )
+            jaxb( libraries.jaxb2_jaxb )
+            jaxb( libraries.jaxb2_jaxb_xjc )
             deployerJars "org.apache.maven.wagon:wagon-http:1.0"
         }
 

hibernate-core/hibernate-core.gradle

@@ -95,7 +95,7 @@ task jaxb {
                 schema: hbmXsd.path,
                 extension: 'true'
         ) {
-            arg line:     '-Xinheritance'
+            arg line:     '-Xinheritance -Xsimplify'
         }
 
         // orm.xml (jpa)

hibernate-core/src/main/resources/org/hibernate/hibernate-mapping-4.0.xsd

@@ -11,8 +11,11 @@ arbitrary number of queries, and import declarations of arbitrary classes.
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
            xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
+           xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+           xmlns:simplify="http://jaxb2-commons.dev.java.net/basic/simplify"
            targetNamespace="http://www.hibernate.org/xsd/hibernate-mapping"
            elementFormDefault="qualified"
+           jaxb:extensionBindingPrefixes="simplify"
            version="4.0">
 
   <!--