HHH-14563 Remove the DOM4J dependency from hibernate-core

hibernate-core/hibernate-core.gradle

@@ -61,11 +61,6 @@ dependencies {
     compile( libraries.classmate )
     compile( libraries.activation )
 
-    // We need dom4j for a number of things temporarily:
-    //      1) (unsupported) EntityMode.DOM4J support
-    //      2) Envers
-    //      3) hibernate-commons-annotations
-    compile( libraries.dom4j )
     compile( libraries.commons_annotations )
     antlr( libraries.antlr )
 

hibernate-entitymanager/hibernate-entitymanager.gradle

@@ -4,7 +4,6 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' )
 
 dependencies {
 	compile( project( ':hibernate-core' ) )
-	compile( libraries.dom4j )
 	compile( libraries.commons_annotations )
 	compile( libraries.jpa )
 	compile( libraries.byteBuddy )

hibernate-envers/hibernate-envers.gradle

@@ -16,6 +16,9 @@ dependencies {
         exclude group: "org.javassist", module: "javassist"
     }
 
+    // TODO HHH-13703: get rid of this dependency
+    compile( libraries.dom4j )
+
     provided( libraries.ant )
     annotationProcessor( project( ':hibernate-jpamodelgen' ) )
 

hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/AdditionalJaxbMappingProducerImpl.java

@@ -76,7 +76,7 @@ public class AdditionalJaxbMappingProducerImpl implements AdditionalJaxbMappingP
 
 		final MappingCollector mappingCollector = new MappingCollector() {
 			@Override
-			public void addDocument(Document document) throws DocumentException {
+			public void addDocument(Document document) {
 				dump( document );
 
 				// while the commented-out code here is more efficient (well, understanding that

hibernate-osgi/hibernate-osgi.gradle

@@ -95,6 +95,7 @@ dependencies {
 	karafDistro "org.apache.karaf:apache-karaf:${project.karafVersion}@tar.gz"
 
 	hibernateEnvers( project( ':hibernate-envers' ) )
+	hibernateEnvers( libraries.dom4j )
 }
 
 jar {
@@ -160,6 +161,9 @@ karaf {
 			name = 'hibernate-envers'
 			description = 'Feature for easily adding Envers support to hibernate-orm'
 			includeProject = false
+			feature ('wrap') {
+				prerequisite = true
+			}
 			configurations 'hibernateEnvers'
 			feature('hibernate-orm') {
 				version = project.version