Skip to content
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

PAYARA-4253 PAYARA-4060: Replace remaining JAVA EE api artifacts with Jakarta EE's #4313

Merged
merged 5 commits into from
Nov 13, 2019
+433 −393
Merged

PAYARA-4253 PAYARA-4060: Replace remaining JAVA EE api artifacts with Jakarta EE's #4313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8174d5
PAYARA-4260: Replace remaining javax API packages from distribution
pdudits Nov 8, 2019
6c13458
PAYARA-4260: Replace javax.el with jakarta.el
pdudits Nov 8, 2019
1efe865
PAYARA-4260: Update JSP classpaths to reflect new jakarta artifacts
pdudits Nov 8, 2019
256d5f5
PAYARA-4260: Exclude javax validation api via validator implementation
pdudits Nov 11, 2019
58a9e8a
PAYARA-4260: Rollback bundle names of jakarta.servlet.jsp-api
pdudits Nov 11, 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
4 changes: 2 additions & 2 deletions api/payara-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@

<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>${javaee.api.version}</version>
<groupId>jakarta.platform</groupId>
<artifactId>jakarta.jakartaee-api</artifactId>
<version>${jakartaee.api.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions appserver/admin/admin-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>javax.el-api</artifactId>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<artifactId>jakarta.el</artifactId>
</dependency>
</dependencies>

Expand Down
22 changes: 11 additions & 11 deletions appserver/admin/gf_template/src/main/resources/config/default-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,27 +317,27 @@
<param-value>
/lib/
\lib\
javax.el.jar
javax.servlet-api.jar
javax.servlet.jsp-api.jar
javax.servlet.jsp.jstl-api.jar
jakarta.el.jar
jakarta.servlet-api.jar
jakarta.servlet.jsp-api.jar
jakarta.servlet.jsp.jstl-api.jar
javax.servlet.jsp.jstl.jar
jakarta.jms-api.jar
jakarta.faces.jar
javax.servlet.jsp.jar
jspcaching-connector.jar
web-glue.jar
hibernate-validator.jar
jakarta.ejb.jar
javax.enterprise.deploy-api.jar
jakarta.ejb-api.jar
jakarta.enterprise.deploy-api.jar
jakarta.mail.jar
javax.management.j2ee-api.jar
jakarta.management.j2ee-api.jar
jakarta.persistence.jar
javax.resource-api.jar
javax.security.auth.message.jar
javax.security.jacc.jar
jakarta.resource-api.jar
jakarta.security.auth.message-api.jar
jakarta.security.jacc-api.jar
jakarta.transaction-api.jar
javax.xml.rpc-api.jar
jakarta.xml.rpc-api.jar
webservices-osgi.jar
weld-osgi-bundle.jar
jersey-mvc-jsp.jar
Expand Down
22 changes: 11 additions & 11 deletions appserver/admin/gf_template_web/src/main/resources/config/default-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,27 +314,27 @@
<param-value>
/lib/
\lib\
javax.el.jar
javax.servlet-api.jar
javax.servlet.jsp-api.jar
javax.servlet.jsp.jstl-api.jar
jakarta.el.jar
jakarta.servlet-api.jar
jakarta.servlet.jsp-api.jar
jakarta.servlet.jsp.jstl-api.jar
javax.servlet.jsp.jstl.jar
jakarta.jms-api.jar
jakarta.faces.jar
javax.servlet.jsp.jar
jspcaching-connector.jar
web-glue.jar
bean-validator.jar
jakarta.ejb.jar
javax.enterprise.deploy-api.jar
jakarta.ejb-api.jar
jakarta.enterprise.deploy-api.jar
jakarta.mail.jar
javax.management.j2ee-api.jar
jakarta.management.j2ee-api.jar
jakarta.persistence.jar
javax.resource-api.jar
javax.security.auth.message.jar
javax.security.jacc.jar
jakarta.resource-api.jar
jakarta.security.auth.message-api.jar
jakarta.security.jacc-api.jar
jakarta.transaction-api.jar
javax.xml.rpc-api.jar
jakarta.xml.rpc-api.jar
webservices-osgi.jar
weld-osgi-bundle.jar
jersey-mvc-jsp.jar
Expand Down
22 changes: 11 additions & 11 deletions appserver/admin/production_domain_template/src/main/resources/config/default-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,27 +299,27 @@
<param-value>
/lib/
\lib\
javax.el.jar
javax.servlet-api.jar
javax.servlet.jsp-api.jar
javax.servlet.jsp.jstl-api.jar
jakarta.el.jar
jakarta.servlet-api.jar
jakarta.servlet.jsp-api.jar
jakarta.servlet.jsp.jstl-api.jar
javax.servlet.jsp.jstl.jar
jakarta.jms-api.jar
jakarta.faces.jar
javax.servlet.jsp.jar
jspcaching-connector.jar
web-glue.jar
hibernate-validator.jar
jakarta.ejb.jar
javax.enterprise.deploy-api.jar
jakarta.ejb-api.jar
jakarta.enterprise.deploy-api.jar
jakarta.mail.jar
javax.management.j2ee-api.jar
jakarta.management.j2ee-api.jar
jakarta.persistence.jar
javax.resource-api.jar
javax.security.auth.message.jar
javax.security.jacc.jar
jakarta.resource-api.jar
jakarta.security.auth.message-api.jar
jakarta.security.jacc-api.jar
jakarta.transaction-api.jar
javax.xml.rpc-api.jar
jakarta.xml.rpc-api.jar
webservices-osgi.jar
weld-osgi-bundle.jar
jersey-mvc-jsp.jar
Expand Down
22 changes: 11 additions & 11 deletions appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,27 +323,27 @@
<param-value>
/lib/
\lib\
javax.el.jar
javax.servlet-api.jar
javax.servlet.jsp-api.jar
javax.servlet.jsp.jstl-api.jar
jakarta.el.jar
jakarta.servlet-api.jar
jakarta.servlet.jsp-api.jar
jakarta.servlet.jsp.jstl-api.jar
javax.servlet.jsp.jstl.jar
jakarta.jms-api.jar
jakarta.faces.jar
javax.servlet.jsp.jar
jspcaching-connector.jar
web-glue.jar
bean-validator.jar
jakarta.ejb.jar
javax.enterprise.deploy-api.jar
jakarta.ejb-api.jar
jakarta.enterprise.deploy-api.jar
jakarta.mail.jar
javax.management.j2ee-api.jar
jakarta.management.j2ee-api.jar
jakarta.persistence.jar
javax.resource-api.jar
javax.security.auth.message.jar
javax.security.jacc.jar
jakarta.resource-api.jar
jakarta.security.auth.message-api.jar
jakarta.security.jacc-api.jar
jakarta.transaction-api.jar
javax.xml.rpc-api.jar
jakarta.xml.rpc-api.jar
webservices-osgi.jar
weld-osgi-bundle.jar
jersey-mvc-jsp.jar
Expand Down
4 changes: 2 additions & 2 deletions appserver/admin/runtime/jsr77/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@

<dependencies>
<dependency>
<groupId>javax.management.j2ee</groupId>
<artifactId>javax.management.j2ee-api</artifactId>
<groupId>jakarta.management.j2ee</groupId>
<artifactId>jakarta.management.j2ee-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.deployment</groupId>
Expand Down
10 changes: 5 additions & 5 deletions appserver/admingui/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -115,12 +115,12 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>javax.servlet.jsp-api</artifactId>
<groupId>jakarta.servlet.jsp</groupId>
<artifactId>jakarta.servlet.jsp-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<artifactId>jakarta.el</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
Expand Down
12 changes: 6 additions & 6 deletions appserver/appclient/client/acc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,8 @@
</dependency>

<dependency>
<groupId>javax.json.bind</groupId>
<artifactId>javax.json.bind-api</artifactId>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
</dependency>

<dependency>
Expand All @@ -401,8 +401,8 @@

<!-- JAXR -JSR-93 Support-->
<dependency>
<groupId>javax.xml.registry</groupId>
<artifactId>javax.xml.registry-api</artifactId>
<groupId>jakarta.xml.registry</groupId>
<artifactId>jakarta.xml.registry-api</artifactId>
</dependency>

<!--
Expand Down Expand Up @@ -445,8 +445,8 @@
<artifactId>weld-se-shaded</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>

</dependencies>
Expand Down
4 changes: 2 additions & 2 deletions appserver/batch/glassfish-batch-commands/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<name>Batch Commands for Glassfish</name>
<dependencies>
<dependency>
<groupId>javax.batch</groupId>
<artifactId>javax.batch-api</artifactId>
<groupId>jakarta.batch</groupId>
<artifactId>jakarta.batch-api</artifactId>
</dependency>
<dependency>
<groupId>com.ibm.jbatch</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/batch/glassfish-batch-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.batch</groupId>
<artifactId>javax.batch-api</artifactId>
<groupId>jakarta.batch</groupId>
<artifactId>jakarta.batch-api</artifactId>
</dependency>
<dependency>
<groupId>com.ibm.jbatch</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/batch/hazelcast-jbatch-store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
<artifactId>hazelcast</artifactId>
</dependency>
<dependency>
<groupId>javax.batch</groupId>
<artifactId>javax.batch-api</artifactId>
<groupId>jakarta.batch</groupId>
<artifactId>jakarta.batch-api</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions appserver/common/amx-javaee/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@

<dependencies>
<dependency>
<groupId>javax.management.j2ee</groupId>
<artifactId>javax.management.j2ee-api</artifactId>
<groupId>jakarta.management.j2ee</groupId>
<artifactId>jakarta.management.j2ee-api</artifactId>
</dependency>
<dependency>
<groupId>fish.payara.server.internal.common</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/common/container-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>fish.payara.server.internal.common</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/common/mejb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
<dependencies>

<dependency>
<groupId>javax.management.j2ee</groupId>
<artifactId>javax.management.j2ee-api</artifactId>
<groupId>jakarta.management.j2ee</groupId>
<artifactId>jakarta.management.j2ee-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.ejb</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/common/stats77/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.management.j2ee</groupId>
<artifactId>javax.management.j2ee-api</artifactId>
<groupId>jakarta.management.j2ee</groupId>
<artifactId>jakarta.management.j2ee-api</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions appserver/concurrent/concurrent-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.enterprise.concurrent</groupId>
<artifactId>javax.enterprise.concurrent-api</artifactId>
<groupId>jakarta.enterprise.concurrent</groupId>
<artifactId>jakarta.enterprise.concurrent-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appserver/connectors/connectors-runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@
<artifactId>gmbal</artifactId>
</dependency>
<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions appserver/deployment/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.enterprise.deploy</groupId>
<artifactId>javax.enterprise.deploy-api</artifactId>
<groupId>jakarta.enterprise.deploy</groupId>
<artifactId>jakarta.enterprise.deploy-api</artifactId>
</dependency>
<dependency>
<groupId>fish.payara.server.internal.deployment</groupId>
Expand Down
8 changes: 4 additions & 4 deletions appserver/deployment/dol/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,16 @@
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise.deploy</groupId>
<artifactId>javax.enterprise.deploy-api</artifactId>
<groupId>jakarta.enterprise.deploy</groupId>
<artifactId>jakarta.enterprise.deploy-api</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
Expand Down
Loading