Skip to content

Commit

Permalink
Merge pull request wildfly#17199 from soul2zimate/WFLY-18524-main
Browse files Browse the repository at this point in the history
[WFLY-18524] Update various alias modules
  • Loading branch information
bstansberry authored Sep 20, 2023
2 parents 64eda13 + 7a71f0d commit 7573ea0
Show file tree
Hide file tree
Showing 57 changed files with 60 additions and 60 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</resources>

<dependencies>
<module name="org.glassfish.jakarta.el" export="true"/>
<module name="org.glassfish.expressly" export="true"/>
<module name="jakarta.inject.api" export="true"/>
<module name="jakarta.interceptor.api" export="true"/>
<!-- This is so that all modules depending on CDI automatically get access to annotations such as @PreDestroy -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</exports>
</module>

<module name="org.glassfish.jakarta.el" export="true"/>
<module name="org.glassfish.expressly" export="true"/>

<!--TODO remove the WELD dependencies from this module, they should be in implementation module only. See comments on https://github.com/wildfly/wildfly/pull/16155 for possible causes-->
<module name="org.jboss.weld.api"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<module name="java.xml"/>


<module name="org.glassfish.jakarta.el"/>
<module name="org.glassfish.expressly"/>
<module name="org.jboss.weld.core"/>
<module name="org.jboss.weld.spi"/>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
<dependencies>
<module name="java.desktop"/>
<module name="jakarta.servlet.api" export="true"/>
<module name="org.glassfish.jakarta.el" export="true"/>
<module name="org.glassfish.expressly" export="true"/>
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<module name="jakarta.servlet.api"/>
<module name="javax.wsdl4j.api"/>
<module name="jakarta.xml.bind.api" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.glassfish.jaxb" services="import"/>
<module name="jakarta.xml.soap.api"/>
<module name="jakarta.xml.ws.api"/>
<module name="org.apache.commons.lang3"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<module name="jakarta.resource.api" />
<module name="javax.wsdl4j.api" />
<module name="jakarta.xml.bind.api" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.glassfish.jaxb" services="import"/>
<module name="com.sun.xml.messaging.saaj" export="true" services="export"/>
<module name="jakarta.xml.soap.api" />
<module name="jakarta.xml.ws.api" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<module name="jakarta.servlet.api" />
<module name="javax.wsdl4j.api" />
<module name="jakarta.xml.bind.api" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.glassfish.jaxb" services="import"/>
<module name="jakarta.xml.soap.api" />
<module name="jakarta.xml.ws.api" />
<module name="org.apache.commons.lang3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<dependencies>
<module name="asm.asm" />
<module name="com.sun.xml.bind" services="import"/>
<module name="org.glassfish.jaxb" services="import"/>
<module name="java.logging" />
<module name="java.security.jgss" />
<module name="java.xml" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<module name="org.apache.commons.codec"/>
<module name="org.slf4j"/>
<module name="jakarta.xml.bind.api" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.glassfish.jaxb" services="import"/>
<module name="java.xml"/>
<module name="java.xml.crypto"/>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<module name="jdk.security.jgss"/>
<module name="java.security.jgss"/>
<module name="jakarta.xml.bind.api" services="import"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.glassfish.jaxb" services="import"/>
<module name="com.sun.xml.messaging.saaj" export="true" services="export"/>
<module name="org.apache.commons.codec"/>
<module name="org.apache.commons.logging"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<module name="org.infinispan.protostream"/>
<module name="org.infinispan.hibernate-cache" services="import"/>
<module name="org.jboss.as.jpa.spi"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.vfs"/>
<module name="org.wildfly.clustering.marshalling.protostream"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<module name="org.glassfish.jaxb"/>
<module name="org.antlr"/>
<module name="org.jboss.as.jpa.spi"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.logging"/>
<module name="org.hibernate.commons-annotations"/>
<module name="org.hibernate.jipijapa-hibernate6" services="import"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<dependencies>
<module name="org.jboss.logging"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>

<!-- Optional dependencies to import services (used for resolution of bean references in particular). -->
<module name="org.hibernate.search.backend.lucene" optional="true" services="import"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<dependencies>
<module name="jakarta.persistence.api"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.as.jpa.spi"/>
<module name="org.hibernate.search.mapper.orm"/>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<module name="jakarta.enterprise.api"/>
<module name="jakarta.transaction.api"/>
<module name="org.jboss.logging" />
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.hibernate.search.engine" export="true" />
<module name="org.hibernate.search.mapper.pojo" export="true" />
<module name="org.hibernate" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<dependencies>
<module name="org.jboss.logging" />
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="java.sql" export="true" /> <!-- For java.sql.Date, etc. -->
<module name="org.hibernate.search.engine" export="true" />
<module name="org.hibernate.commons-annotations" export="true" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<module name="jakarta.persistence.api"/>
<module name="jakarta.validation.api"/>
<module name="jakarta.xml.bind.api"/>
<module name="org.glassfish.jakarta.el"/>
<module name="org.glassfish.expressly"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.weld.core"/>
<module name="org.jboss.weld.spi"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<module name="org.infinispan.component.annotations"/>
<module name="org.infinispan.protostream"/>
<module name="org.infinispan.protostream.types"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.logging"/>
<!-- WFLY-14283 Allow Infinispan to resolve exceptions containing JBoss Marshalling TraceInformation -->
<module name="org.jboss.marshalling" optional="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<module name="org.jboss.ironjacamar.api"/>
<module name="org.jboss.ironjacamar.impl"/>
<module name="org.jboss.ironjacamar.jdbcadapters"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.jts.integration"/>
<module name="org.wildfly.transaction.client"/>
<module name="org.jboss.logging"/>
Expand All @@ -81,7 +81,7 @@
<module name="org.wildfly.clustering.server.spi"/>
<module name="org.wildfly.clustering.service"/>
<module name="org.wildfly.common"/>
<module name="org.glassfish.jakarta.el"/>
<module name="org.glassfish.expressly"/>
</dependencies>

</module>
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@
<module name="jakarta.interceptor.api"/>
<module name="jakarta.security.jacc.api"/>
<module name="jakarta.transaction.api" optional="true"/>
<module name="org.glassfish.javax.enterprise.concurrent"/>
<module name="org.glassfish.jakarta.enterprise.concurrent"/>
<module name="org.jboss.staxmapper"/>
<module name="org.jboss.as.controller"/>
<module name="org.jboss.as.naming" optional="true"/>
<module name="org.wildfly.security.elytron-private"/>
<module name="org.wildfly.extension.request-controller" />
<module name="org.jboss.as.server" />
<module name="org.jboss.invocation"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.modules"/>
<module name="org.jboss.msc"/>
<module name="org.jboss.logging"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<module name="org.jboss.iiop-client"/>
<module name="org.jboss.invocation"/>
<module name="org.jboss.ironjacamar.api"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<!-- For recovery manager (com.arjuna.ats.jbossatx.jta.RecoveryManagerService) -->
<module name="org.jboss.jts.integration"/>
<module name="org.jboss.logging"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<module name="org.wildfly.extension.undertow"/>
<module name="io.undertow.core"/>
<module name="io.undertow.servlet"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.metadata.common"/>
<module name="org.jboss.metadata.web"/>
<module name="org.jboss.modules"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<module name="org.jboss.as.transactions"/>
<module name="org.jboss.jboss-transaction-spi"/>
<module name="org.jboss.invocation"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.modules"/>
<module name="org.jboss.msc"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<module name="java.sql"/>
<module name="jakarta.persistence.api"/>
<module name="jakarta.transaction.api"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.logging"/>
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<module name="org.jboss.as.web-common"/>
<!-- Only used if capability org.wildfly.weld is available -->
<module name="org.jboss.as.weld.common" optional="true"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.modules"/>
<module name="org.jboss.msc"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<module name="org.jboss.as.controller"/>
<module name="org.jboss.as.server"/>
<module name="org.jboss.as.ee"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.metadata.common"/>
<module name="org.jboss.modules"/>
<module name="org.jboss.msc"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<module name="org.wildfly.iiop-openjdk"/>
<module name="org.wildfly.common"/>
<module name="org.wildfly.transaction.client"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.modules"/>
<module name="org.wildfly.security.manager"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<module name="jakarta.servlet.api"/>
<module name="jakarta.xml.ws.api"/>
<module name="org.jboss.invocation"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.metadata.common"/>
<module name="org.jboss.metadata.web"/>
<module name="org.jboss.metadata.ear"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<module name="asm.asm" export="true"/>
<module name="javax.wsdl4j.api" export="true"/>
<module name="jakarta.xml.ws.api" export="true"/>
<module name="com.sun.xml.bind" services="export" export="true"/>
<module name="org.glassfish.jaxb" services="export" export="true"/>
<module name="org.jboss.ws.api" export="true"/>
<module name="org.jboss.ws.spi" export="true"/>
<module name="org.jboss.ws.common" services="import" export="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
<module name="jakarta.servlet.jsp.api"/>
<module name="jakarta.transaction.api"/>
<module name="jakarta.validation.api"/>
<module name="org.glassfish.jakarta.el" />
<module name="org.jboss.jandex"/>
<module name="org.glassfish.expressly" />
<module name="io.smallrye.jandex"/>
<module name="org.jboss.staxmapper"/>
<module name="org.jboss.as.controller"/>
<!-- Only needed if capability 'org.wildfly.legacy-security.server-security-manager' is present -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<module name="org.jboss.xts"/>
<!-- need this to get the SPIProviderResolver -->
<module name="org.jboss.ws.spi"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.weld.core" />
<module name="org.jboss.modules"/>
<module name="jakarta.enterprise.api"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<dependencies>
<module name="jakarta.xml.bind.api"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.glassfish.jaxb" services="import"/>
<module name="org.apache.commons.logging"/>
<module name="org.apache.commons.beanutils"/>
<module name="java.xml"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</resources>

<dependencies>
<module name="com.sun.xml.bind"/>
<module name="org.glassfish.jaxb"/>
<module name="jakarta.xml.bind.api"/>
<module name="jakarta.enterprise.api"/>
<module name="jakarta.servlet.api"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</resources>

<dependencies>
<module name="com.sun.xml.bind"/>
<module name="org.glassfish.jaxb"/>
<module name="jakarta.xml.bind.api"/>
<module name="jakarta.enterprise.api"/>
<module name="jakarta.servlet.api"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<module name="jakarta.servlet.api"/>
<module name="jakarta.transaction.api"/>
<module name="jakarta.validation.api"/>
<module name="org.glassfish.jakarta.el" />
<module name="org.glassfish.expressly" />
<module name="org.jboss.classfilewriter"/>
<module name="org.jboss.weld.api" export="true"/>
<module name="org.jboss.weld.spi" export="true"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<module name="jakarta.servlet.api" />
<module name="jakarta.xml.bind.api" />
<module name="jakarta.security.auth.message.api"/>
<module name="com.sun.xml.bind" services="import"/>
<module name="org.glassfish.jaxb" services="import"/>
<module name="jakarta.xml.ws.api" />
<module name="org.jboss.ws.api" />
<module name="org.jboss.ws.spi" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<module name="org.jboss.as.naming"/>
<module name="org.jboss.as.server"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.metadata.common"/>
<module name="org.jboss.modules"/>
<module name="org.jboss.msc"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@
<module name="org.glassfish.soteria" />
<module name="jakarta.security.enterprise.api" />
<module name="jakarta.enterprise.api" />
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
</dependencies>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<module name="org.jboss.as.server"/>
<!-- Only used if capability org.wildfly.weld is available -->
<module name="org.jboss.as.weld.common" optional="true"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.metadata.common"/>
<module name="org.jboss.modules"/>
<module name="org.jboss.msc"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<module name="org.jboss.msc"/>
<module name="org.jboss.logging"/>
<module name="org.jboss.vfs"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.jts"/>
<module name="jakarta.servlet.api"/>
<module name="io.undertow.core"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<module name="jakarta.servlet.api"/>
<module name="jakarta.servlet.jsp.api"/>
<module name="jakarta.websocket.api"/>
<module name="org.jboss.jandex"/>
<module name="io.smallrye.jandex"/>
<module name="org.jboss.staxmapper"/>
<module name="org.jboss.as.clustering.common"/>
<module name="org.wildfly.clustering.service"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class JavaEEDependencyProcessor implements DeploymentUnitProcessor {
"javax.rmi.api",
"jakarta.xml.bind.api",
GLASSFISH_EL,
"org.glassfish.javax.enterprise.concurrent"
"org.glassfish.jakarta.enterprise.concurrent"
};


Expand Down
Loading

0 comments on commit 7573ea0

Please sign in to comment.