From 32d0095249eecee7a8518174c46fca8e8455d46f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Thu, 12 Sep 2019 09:58:25 +0200
Subject: [PATCH 1/2] HSEARCH-3701 Remove unnecessary configuration

The javadoc options are not necessary (bugs were fixed in the JDK), and
OSGi is already disabled for JDK11+.
---
 pom.xml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 045456df6f8..2b849223084 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,7 +372,7 @@
         <maven.compiler.argument.source>${maven.compiler.source}</maven.compiler.argument.source>
         <maven.compiler.argument.testTarget>${maven.compiler.testTarget}</maven.compiler.argument.testTarget>
         <maven.compiler.argument.testSource>${maven.compiler.testSource}</maven.compiler.argument.testSource>
-        
+
         <!--
                 Options to compile with the Eclipse compiler when building with maven (not with the IDE).
                 See profile "compiler-eclipse".
@@ -2071,20 +2071,6 @@
             </modules>
         </profile>
 
-        <profile>
-            <id>jdk12+</id>
-            <activation>
-                <jdk>[12,)</jdk>
-            </activation>
-            <!-- Skip the OSGi and WildFly integration tests with JDK >= 12 -->
-            <properties>
-                <!-- no specific issue was reported yet -->
-                <failsafe.osgi.skip>true</failsafe.osgi.skip>
-                <!-- https://bugs.openjdk.java.net/browse/JDK-8212233?focusedCommentId=14245762 -->
-                <javadoc.additionalOptions.java-version>-html5 -source 8</javadoc.additionalOptions.java-version>
-            </properties>
-        </profile>
-        
         <profile>
             <id>compiler-eclipse</id>
             <build>

From b9e9a49351c971489739eb67c5ad32d08cc93a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Thu, 12 Sep 2019 10:17:25 +0200
Subject: [PATCH 2/2] HSEARCH-3703 Remove the dependency to javax.xml.bind.api
 in JBoss modules

---
 .../src/main/modules/search/elasticsearch/module.xml             | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jbossmodules/elasticsearch/src/main/modules/search/elasticsearch/module.xml b/jbossmodules/elasticsearch/src/main/modules/search/elasticsearch/module.xml
index e598b9d3c88..f30ebaf324c 100644
--- a/jbossmodules/elasticsearch/src/main/modules/search/elasticsearch/module.xml
+++ b/jbossmodules/elasticsearch/src/main/modules/search/elasticsearch/module.xml
@@ -14,7 +14,6 @@
         <module name="org.elasticsearch.client.elasticsearch-rest-client" slot="${module-slot.org.elasticsearch.client}"/>
         <module name="com.google.code.gson" slot="${module-slot.com.google.code.gson}"/>
         <module name="org.elasticsearch.client.elasticsearch-rest-client-sniffer" slot="${module-slot.org.elasticsearch.client}"/>
-        <module name="javax.xml.bind.api"/>
         <module name="org.hibernate.commons-annotations"/>
         <module name="org.jboss.logging"/>
         <module name="org.apache.httpcomponents"/>