Skip to content

HSEARCH-3701 + HSEARCH-3703 Upgrade to WildFly 17.0.1.Final (follow-up) + Remove the dependency to javax.xml.bind.api in JBoss modules #2086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 12, 2019
Merged

HSEARCH-3701 + HSEARCH-3703 Upgrade to WildFly 17.0.1.Final (follow-up) + Remove the dependency to javax.xml.bind.api in JBoss modules #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32d0095
HSEARCH-3701 Remove unnecessary configuration
yrodiere Sep 12, 2019
b9e9a49
HSEARCH-3703 Remove the dependency to javax.xml.bind.api in JBoss mod…
yrodiere Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion jbossmodules/elasticsearch/src/main/modules/search/elasticsearch/module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down
16 changes: 1 addition & 15 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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".
Expand Down Expand Up @@ -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>
Expand Down