Modules for EAP does not include all hibernate artifacts and reference removed modules for EAP 7.4

The EAP modules RHDG 8.2 are not working as there are missing artifacts.

The missing artifacts are
<resource-root path="hibernate-search-backend-lucene-6.0.2.Final-redhat-00002.jar"/>
<resource-root path="hibernate-commons-annotations-5.0.5.Final-redhat-00002.jar"/>

With 7.4 there are some modules removed from EAP, so must change to optional
<module name="org.eclipse.microprofile.config.api" export="true" optional="true"/>
<module name="org.eclipse.microprofile.metrics.api" export="true" optional="true"/>
<module name="io.smallrye.config" services="export" export="true" optional="true"/>
<module name="io.smallrye.metrics" services="import" export="true" optional="true"/>