Skip to content

Commit

Permalink
[WFLY-18524] Update alias modules org.glassfish.jakarta.el to org.gla…
Browse files Browse the repository at this point in the history
…ssfish.expressly
  • Loading branch information
soul2zimate committed Sep 20, 2023
1 parent d2c508b commit 7a71f0d
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 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 @@ -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 @@ -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 @@ -57,7 +57,7 @@
<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.glassfish.expressly" />
<module name="io.smallrye.jandex"/>
<module name="org.jboss.staxmapper"/>
<module name="org.jboss.as.controller"/>
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 @@ -35,7 +35,7 @@
<module name="java.logging"/>
<module name="java.sql"/>
<module name="java.xml"/>
<module name="org.glassfish.jakarta.el" export="true"/>
<module name="org.glassfish.expressly" export="true"/>
</dependencies>

<resources>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<module name="java.sql"/>
<module name="java.xml"/>
<module name="jakarta.faces.api:${jsf-impl-name}-${jsf-version}"/>
<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 @@ -33,7 +33,7 @@
<module name="java.logging"/>
<module name="java.sql"/>
<module name="java.xml"/>
<module name="org.glassfish.jakarta.el" export="true"/>
<module name="org.glassfish.expressly" export="true"/>

<!-- extra dependencies for MyFaces 1.1
<module name="org.apache.commons.logging"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<module name="java.naming"/>
<module name="java.sql"/>
<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"/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<module name="jakarta.json.api"/>
<module name="jakarta.ejb.api"/>
<module name="jakarta.xml.bind.api"/>
<module name="org.glassfish.jakarta.el"/>
<module name="org.glassfish.expressly"/>
<module name="java.xml"/>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<module name="jakarta.ejb.api"/>
<module name="jakarta.servlet.jstl.api"/>
<module name="jakarta.xml.bind.api"/>
<module name="org.glassfish.jakarta.el"/>
<module name="org.glassfish.expressly"/>
<module name="java.xml"/>

<!-- extra dependencies for MyFaces -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<module name="jakarta.json.api"/>
<module name="jakarta.ejb.api"/>
<module name="jakarta.xml.bind.api"/>
<module name="org.glassfish.jakarta.el"/>
<module name="org.glassfish.expressly"/>
<module name="java.xml"/>

<!-- extra dependencies for MyFaces -->
Expand Down

0 comments on commit 7a71f0d

Please sign in to comment.