From d8174d550ec98157aba9c1b703fbb9d98092dffb Mon Sep 17 00:00:00 2001 From: Patrik Dudits Date: Fri, 8 Nov 2019 11:42:46 +0100 Subject: [PATCH 1/5] PAYARA-4260: Replace remaining javax API packages from distribution javax artifacts still pop up on compilation classpaths as implementation dependencies, but the final distributions are javax api-free --- api/payara-api/pom.xml | 4 +- api/pom.xml | 6 +- appserver/admin/admin-core/pom.xml | 4 +- appserver/admin/runtime/jsr77/pom.xml | 4 +- appserver/admingui/common/pom.xml | 8 +- appserver/admingui/war/pom.xml | 4 +- appserver/appclient/client/acc/pom.xml | 12 +- .../batch/glassfish-batch-commands/pom.xml | 4 +- .../batch/glassfish-batch-connector/pom.xml | 4 +- .../batch/hazelcast-jbatch-store/pom.xml | 4 +- appserver/common/amx-javaee/pom.xml | 4 +- appserver/common/container-common/pom.xml | 4 +- appserver/common/mejb/pom.xml | 4 +- appserver/common/stats77/pom.xml | 4 +- appserver/concurrent/concurrent-impl/pom.xml | 4 +- .../connectors/connectors-runtime/pom.xml | 4 +- appserver/deployment/client/pom.xml | 4 +- appserver/deployment/dol/pom.xml | 8 +- appserver/deployment/javaee-core/pom.xml | 4 +- appserver/deployment/javaee-full/pom.xml | 4 +- appserver/ejb/ejb-connector/pom.xml | 4 +- appserver/ejb/ejb-container/pom.xml | 4 +- appserver/ejb/ejb-http-remoting/admin/pom.xml | 6 +- .../ejb/ejb-http-remoting/client/pom.xml | 4 +- .../ejb/ejb-http-remoting/endpoint/pom.xml | 4 +- appserver/ejb/ejb-internal-api/pom.xml | 4 +- .../payara-micro/payara-micro-boot/pom.xml | 6 +- appserver/grizzly/grizzly-container/pom.xml | 4 +- appserver/monitoring-console/core/pom.xml | 6 +- appserver/monitoring-console/webapp/pom.xml | 10 +- appserver/orb/orb-connector/pom.xml | 4 +- .../packager/glassfish-common-full/pom.xml | 8 +- .../packager/glassfish-common-web/pom.xml | 8 +- appserver/packager/glassfish-common/pom.xml | 8 +- appserver/packager/glassfish-jcdi/pom.xml | 4 +- appserver/packager/glassfish-web/pom.xml | 20 +- appserver/packager/json/pom.xml | 4 +- appserver/packager/metro/pom.xml | 4 +- .../cdi-auth-roles/pom.xml | 10 +- .../hazelcast-ejb-timer/pom.xml | 6 +- .../jaspic-servlet-utils/pom.xml | 6 +- .../microprofile/config/pom.xml | 4 +- .../microprofile/fault-tolerance/pom.xml | 6 +- .../microprofile/healthcheck/pom.xml | 6 +- .../microprofile/jwt-auth/pom.xml | 10 +- .../microprofile/metrics/pom.xml | 6 +- .../microprofile/microprofile-common/pom.xml | 6 +- .../microprofile/openapi/pom.xml | 6 +- .../microprofile/opentracing-jaxws/pom.xml | 6 +- .../notification-datadog-core/pom.xml | 6 +- .../notification-email-core/pom.xml | 6 +- .../notification-hipchat-core/pom.xml | 6 +- .../notification-jms-core/pom.xml | 6 +- .../notification-newrelic-core/pom.xml | 6 +- .../notification-slack-core/pom.xml | 6 +- .../notification-xmpp-core/pom.xml | 6 +- .../opentracing-cdi/pom.xml | 6 +- .../payara-jsr107/pom.xml | 6 +- .../payara-micro-cdi/pom.xml | 6 +- .../rest-monitoring-service/pom.xml | 6 +- .../security-oauth2/pom.xml | 12 +- .../security-openid/pom.xml | 14 +- .../yubikey-authentication/pom.xml | 6 +- appserver/pom.xml | 192 ++++++++++-------- .../javamail/javamail-runtime/pom.xml | 4 +- .../resources/resources-connector/pom.xml | 4 +- appserver/tests/payara-samples/pom.xml | 8 +- .../samples/ejb-http-remoting/api/pom.xml | 4 +- .../ejb-http-remoting/server-app/pom.xml | 4 +- .../tests/payara-samples/samples/pom.xml | 4 +- appserver/transaction/jta/pom.xml | 4 +- appserver/web/cdi-api-fragment/pom.xml | 2 +- appserver/web/gf-weld-connector/pom.xml | 4 +- appserver/web/jstl-connector/pom.xml | 4 +- appserver/web/war-util/pom.xml | 4 +- appserver/web/weld-integration/pom.xml | 8 +- appserver/webservices/jsr109-impl/pom.xml | 4 +- nucleus/admin/config-api/pom.xml | 4 +- nucleus/admin/rest/rest-service/pom.xml | 4 +- nucleus/core/kernel/pom.xml | 4 +- nucleus/hk2/hk2-config/pom.xml | 8 +- nucleus/packager/nucleus-hk2/pom.xml | 4 +- .../notification-cdi-eventbus-core/pom.xml | 6 +- .../payara-modules/notification-core/pom.xml | 6 +- .../notification-eventbus-core/pom.xml | 6 +- .../opentracing-adapter/pom.xml | 6 +- .../requesttracing-core/pom.xml | 6 +- nucleus/pom.xml | 22 +- 88 files changed, 368 insertions(+), 338 deletions(-) diff --git a/api/payara-api/pom.xml b/api/payara-api/pom.xml index e87e917d856..49c9d1571d3 100644 --- a/api/payara-api/pom.xml +++ b/api/payara-api/pom.xml @@ -174,8 +174,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api provided true diff --git a/api/pom.xml b/api/pom.xml index 195d35b4087..9be4771d8be 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -81,9 +81,9 @@ - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided true diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml index c758e5c72bc..af8e432053b 100755 --- a/appserver/admin/admin-core/pom.xml +++ b/appserver/admin/admin-core/pom.xml @@ -74,8 +74,8 @@ test - javax.el - javax.el-api + jakarta.el + jakarta.el-api org.glassfish diff --git a/appserver/admin/runtime/jsr77/pom.xml b/appserver/admin/runtime/jsr77/pom.xml index 5c50e304bd2..4af7a938178 100755 --- a/appserver/admin/runtime/jsr77/pom.xml +++ b/appserver/admin/runtime/jsr77/pom.xml @@ -55,8 +55,8 @@ - javax.management.j2ee - javax.management.j2ee-api + jakarta.management.j2ee + jakarta.management.j2ee-api org.glassfish.deployment diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml index f1a6423bba2..a72366c0552 100644 --- a/appserver/admingui/common/pom.xml +++ b/appserver/admingui/common/pom.xml @@ -100,8 +100,8 @@ provided - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api @@ -115,8 +115,8 @@ jakarta.servlet-api - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api org.glassfish diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml index d36d7a1f35a..d298dc42e9d 100644 --- a/appserver/admingui/war/pom.xml +++ b/appserver/admingui/war/pom.xml @@ -71,7 +71,7 @@ org.glassfish.api.admingui.ConsoleProvider - fish.payara.server.internal.admingui.console-common,org.glassfish.hk2.hk2,fish.payara.server.internal.admingui.console-plugin-service, fish.payara.server.internal.deployment.deployment-client, jakarta.servlet-api, javax.servlet.jsp-api, com.sun.el.javax.el, com.sun.jsftemplating, fish.payara.server.internal.admingui.dataprovider, com.sun.pkg.client + fish.payara.server.internal.admingui.console-common,org.glassfish.hk2.hk2,fish.payara.server.internal.admingui.console-plugin-service, fish.payara.server.internal.deployment.deployment-client, jakarta.servlet-api, jakarta.servlet.jsp-api, com.sun.el.javax.el, com.sun.jsftemplating, fish.payara.server.internal.admingui.dataprovider, com.sun.pkg.client @@ -98,7 +98,7 @@ - + diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml index 4fb7792b205..d935885748a 100755 --- a/appserver/appclient/client/acc/pom.xml +++ b/appserver/appclient/client/acc/pom.xml @@ -390,8 +390,8 @@ - javax.json.bind - javax.json.bind-api + jakarta.json.bind + jakarta.json.bind-api @@ -401,8 +401,8 @@ - javax.xml.registry - javax.xml.registry-api + jakarta.xml.registry + jakarta.xml.registry-api - javax.xml.rpc - javax.xml.rpc-api + jakarta.xml.rpc + jakarta.xml.rpc-api diff --git a/appserver/packager/glassfish-common-web/pom.xml b/appserver/packager/glassfish-common-web/pom.xml index a87a9140fc9..639526c86bc 100644 --- a/appserver/packager/glassfish-common-web/pom.xml +++ b/appserver/packager/glassfish-common-web/pom.xml @@ -309,8 +309,8 @@ jakarta.resource-api - javax.management.j2ee - javax.management.j2ee-api + jakarta.management.j2ee + jakarta.management.j2ee-api jakarta.security.auth.message @@ -342,8 +342,8 @@ jakarta.ejb-api - javax.interceptor - javax.interceptor-api + jakarta.interceptor + jakarta.interceptor-api jakarta.transaction diff --git a/appserver/packager/glassfish-common/pom.xml b/appserver/packager/glassfish-common/pom.xml index 5224a8cd9ef..703a26124a3 100644 --- a/appserver/packager/glassfish-common/pom.xml +++ b/appserver/packager/glassfish-common/pom.xml @@ -156,8 +156,8 @@ ${project.version} - javax.enterprise.deploy - javax.enterprise.deploy-api + jakarta.enterprise.deploy + jakarta.enterprise.deploy-api fish.payara.server.internal.admingui @@ -175,8 +175,8 @@ ${project.version} - javax.enterprise.concurrent - javax.enterprise.concurrent-api + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api org.glassfish diff --git a/appserver/packager/glassfish-jcdi/pom.xml b/appserver/packager/glassfish-jcdi/pom.xml index 01376b94f8a..d9ffbaa22a3 100644 --- a/appserver/packager/glassfish-jcdi/pom.xml +++ b/appserver/packager/glassfish-jcdi/pom.xml @@ -127,8 +127,8 @@ - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api diff --git a/appserver/packager/glassfish-web/pom.xml b/appserver/packager/glassfish-web/pom.xml index aa460fe04d7..a52829392bd 100644 --- a/appserver/packager/glassfish-web/pom.xml +++ b/appserver/packager/glassfish-web/pom.xml @@ -133,8 +133,8 @@ Required in Payara 5, but optional for JDK 8+ builds in Payara 4 --> - javax.security.enterprise - javax.security.enterprise-api + jakarta.security.enterprise + jakarta.security.enterprise-api org.glassfish.soteria @@ -231,16 +231,16 @@ ${project.version} - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api org.glassfish.web javax.servlet.jsp - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api org.glassfish.web @@ -249,8 +249,8 @@ - javax.security.enterprise - javax.security.enterprise-api + jakarta.security.enterprise + jakarta.security.enterprise-api org.glassfish.soteria @@ -262,8 +262,8 @@ javax.el - javax.websocket - javax.websocket-api + jakarta.websocket + jakarta.websocket-api org.glassfish.tyrus diff --git a/appserver/packager/json/pom.xml b/appserver/packager/json/pom.xml index 7e61e6bdd28..0ff671a10de 100644 --- a/appserver/packager/json/pom.xml +++ b/appserver/packager/json/pom.xml @@ -134,8 +134,8 @@ - javax.json.bind - javax.json.bind-api + jakarta.json.bind + jakarta.json.bind-api true diff --git a/appserver/packager/metro/pom.xml b/appserver/packager/metro/pom.xml index e1ab315a7fd..4bf9627e205 100644 --- a/appserver/packager/metro/pom.xml +++ b/appserver/packager/metro/pom.xml @@ -192,8 +192,8 @@ stax2-api - javax.xml.registry - javax.xml.registry-api + jakarta.xml.registry + jakarta.xml.registry-api diff --git a/appserver/payara-appserver-modules/cdi-auth-roles/pom.xml b/appserver/payara-appserver-modules/cdi-auth-roles/pom.xml index 4b4a057d331..12ad2963199 100644 --- a/appserver/payara-appserver-modules/cdi-auth-roles/pom.xml +++ b/appserver/payara-appserver-modules/cdi-auth-roles/pom.xml @@ -95,13 +95,13 @@ jersey-common - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} - javax.security.enterprise - javax.security.enterprise-api + jakarta.security.enterprise + jakarta.security.enterprise-api org.glassfish.soteria diff --git a/appserver/payara-appserver-modules/hazelcast-ejb-timer/pom.xml b/appserver/payara-appserver-modules/hazelcast-ejb-timer/pom.xml index d3bba923909..60c7ca12288 100644 --- a/appserver/payara-appserver-modules/hazelcast-ejb-timer/pom.xml +++ b/appserver/payara-appserver-modules/hazelcast-ejb-timer/pom.xml @@ -75,9 +75,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} diff --git a/appserver/payara-appserver-modules/jaspic-servlet-utils/pom.xml b/appserver/payara-appserver-modules/jaspic-servlet-utils/pom.xml index 5e5afe4d5ef..b9e29b9e531 100644 --- a/appserver/payara-appserver-modules/jaspic-servlet-utils/pom.xml +++ b/appserver/payara-appserver-modules/jaspic-servlet-utils/pom.xml @@ -65,9 +65,9 @@ - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} diff --git a/appserver/payara-appserver-modules/microprofile/config/pom.xml b/appserver/payara-appserver-modules/microprofile/config/pom.xml index b8de960eb4b..b936cb7f05b 100644 --- a/appserver/payara-appserver-modules/microprofile/config/pom.xml +++ b/appserver/payara-appserver-modules/microprofile/config/pom.xml @@ -74,8 +74,8 @@ jakarta.annotation-api - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api diff --git a/appserver/payara-appserver-modules/microprofile/fault-tolerance/pom.xml b/appserver/payara-appserver-modules/microprofile/fault-tolerance/pom.xml index 8d8cec07f2b..b43375ec8ce 100644 --- a/appserver/payara-appserver-modules/microprofile/fault-tolerance/pom.xml +++ b/appserver/payara-appserver-modules/microprofile/fault-tolerance/pom.xml @@ -89,9 +89,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} org.hamcrest diff --git a/appserver/payara-appserver-modules/microprofile/healthcheck/pom.xml b/appserver/payara-appserver-modules/microprofile/healthcheck/pom.xml index 5f362ce4a33..42ad66174fe 100644 --- a/appserver/payara-appserver-modules/microprofile/healthcheck/pom.xml +++ b/appserver/payara-appserver-modules/microprofile/healthcheck/pom.xml @@ -94,9 +94,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} diff --git a/appserver/payara-appserver-modules/microprofile/jwt-auth/pom.xml b/appserver/payara-appserver-modules/microprofile/jwt-auth/pom.xml index 707c75e56fd..190b5e47e46 100644 --- a/appserver/payara-appserver-modules/microprofile/jwt-auth/pom.xml +++ b/appserver/payara-appserver-modules/microprofile/jwt-auth/pom.xml @@ -86,14 +86,14 @@ - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} - javax.security.enterprise - javax.security.enterprise-api + jakarta.security.enterprise + jakarta.security.enterprise-api diff --git a/appserver/payara-appserver-modules/microprofile/metrics/pom.xml b/appserver/payara-appserver-modules/microprofile/metrics/pom.xml index 636508d2550..68d78d1f7e7 100644 --- a/appserver/payara-appserver-modules/microprofile/metrics/pom.xml +++ b/appserver/payara-appserver-modules/microprofile/metrics/pom.xml @@ -107,9 +107,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} diff --git a/appserver/payara-appserver-modules/microprofile/microprofile-common/pom.xml b/appserver/payara-appserver-modules/microprofile/microprofile-common/pom.xml index 693739e2c25..95326bc9e0b 100644 --- a/appserver/payara-appserver-modules/microprofile/microprofile-common/pom.xml +++ b/appserver/payara-appserver-modules/microprofile/microprofile-common/pom.xml @@ -73,9 +73,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} diff --git a/appserver/payara-appserver-modules/microprofile/openapi/pom.xml b/appserver/payara-appserver-modules/microprofile/openapi/pom.xml index 627a844ef72..98a8ada3e9c 100644 --- a/appserver/payara-appserver-modules/microprofile/openapi/pom.xml +++ b/appserver/payara-appserver-modules/microprofile/openapi/pom.xml @@ -94,9 +94,9 @@ jackson-dataformat-yaml - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} junit diff --git a/appserver/payara-appserver-modules/microprofile/opentracing-jaxws/pom.xml b/appserver/payara-appserver-modules/microprofile/opentracing-jaxws/pom.xml index c2691df6089..633c9977688 100644 --- a/appserver/payara-appserver-modules/microprofile/opentracing-jaxws/pom.xml +++ b/appserver/payara-appserver-modules/microprofile/opentracing-jaxws/pom.xml @@ -61,9 +61,9 @@ provided - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} true provided diff --git a/appserver/payara-appserver-modules/notification-datadog-core/pom.xml b/appserver/payara-appserver-modules/notification-datadog-core/pom.xml index fbe9f68a4bb..5e59cc96c19 100644 --- a/appserver/payara-appserver-modules/notification-datadog-core/pom.xml +++ b/appserver/payara-appserver-modules/notification-datadog-core/pom.xml @@ -57,9 +57,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/notification-email-core/pom.xml b/appserver/payara-appserver-modules/notification-email-core/pom.xml index 110837f1df1..7c16664a1f7 100644 --- a/appserver/payara-appserver-modules/notification-email-core/pom.xml +++ b/appserver/payara-appserver-modules/notification-email-core/pom.xml @@ -60,9 +60,9 @@ - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/notification-hipchat-core/pom.xml b/appserver/payara-appserver-modules/notification-hipchat-core/pom.xml index 552c48b2cf5..095d1f383b5 100644 --- a/appserver/payara-appserver-modules/notification-hipchat-core/pom.xml +++ b/appserver/payara-appserver-modules/notification-hipchat-core/pom.xml @@ -59,9 +59,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/notification-jms-core/pom.xml b/appserver/payara-appserver-modules/notification-jms-core/pom.xml index cf1178c35bd..37f33adeb4a 100644 --- a/appserver/payara-appserver-modules/notification-jms-core/pom.xml +++ b/appserver/payara-appserver-modules/notification-jms-core/pom.xml @@ -59,9 +59,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/notification-newrelic-core/pom.xml b/appserver/payara-appserver-modules/notification-newrelic-core/pom.xml index 89a0938282f..8193b604821 100644 --- a/appserver/payara-appserver-modules/notification-newrelic-core/pom.xml +++ b/appserver/payara-appserver-modules/notification-newrelic-core/pom.xml @@ -57,9 +57,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/notification-slack-core/pom.xml b/appserver/payara-appserver-modules/notification-slack-core/pom.xml index d784b4ee027..57d5727c2e9 100644 --- a/appserver/payara-appserver-modules/notification-slack-core/pom.xml +++ b/appserver/payara-appserver-modules/notification-slack-core/pom.xml @@ -59,9 +59,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/notification-xmpp-core/pom.xml b/appserver/payara-appserver-modules/notification-xmpp-core/pom.xml index d16ea468421..e34b381f5ba 100644 --- a/appserver/payara-appserver-modules/notification-xmpp-core/pom.xml +++ b/appserver/payara-appserver-modules/notification-xmpp-core/pom.xml @@ -57,9 +57,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/opentracing-cdi/pom.xml b/appserver/payara-appserver-modules/opentracing-cdi/pom.xml index bdd6770bfbb..b44e2a2e7d8 100644 --- a/appserver/payara-appserver-modules/opentracing-cdi/pom.xml +++ b/appserver/payara-appserver-modules/opentracing-cdi/pom.xml @@ -59,9 +59,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} diff --git a/appserver/payara-appserver-modules/payara-jsr107/pom.xml b/appserver/payara-appserver-modules/payara-jsr107/pom.xml index 900fd9ef687..39ab09a8330 100644 --- a/appserver/payara-appserver-modules/payara-jsr107/pom.xml +++ b/appserver/payara-appserver-modules/payara-jsr107/pom.xml @@ -98,9 +98,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} fish.payara.api diff --git a/appserver/payara-appserver-modules/payara-micro-cdi/pom.xml b/appserver/payara-appserver-modules/payara-micro-cdi/pom.xml index ff087720a89..3777c5d4548 100644 --- a/appserver/payara-appserver-modules/payara-micro-cdi/pom.xml +++ b/appserver/payara-appserver-modules/payara-micro-cdi/pom.xml @@ -83,9 +83,9 @@ true - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} fish.payara.api diff --git a/appserver/payara-appserver-modules/rest-monitoring/rest-monitoring-service/pom.xml b/appserver/payara-appserver-modules/rest-monitoring/rest-monitoring-service/pom.xml index e50c63e06eb..3332858bba0 100644 --- a/appserver/payara-appserver-modules/rest-monitoring/rest-monitoring-service/pom.xml +++ b/appserver/payara-appserver-modules/rest-monitoring/rest-monitoring-service/pom.xml @@ -66,9 +66,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/security-oauth2/pom.xml b/appserver/payara-appserver-modules/security-oauth2/pom.xml index bd979a6ec81..42abcfd8936 100644 --- a/appserver/payara-appserver-modules/security-oauth2/pom.xml +++ b/appserver/payara-appserver-modules/security-oauth2/pom.xml @@ -69,8 +69,8 @@ provided - javax.security.enterprise - javax.security.enterprise-api + jakarta.security.enterprise + jakarta.security.enterprise-api provided @@ -91,13 +91,13 @@ provided - javax.inject - javax.inject + jakarta.inject + jakarta.inject-api provided - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api provided diff --git a/appserver/payara-appserver-modules/security-openid/pom.xml b/appserver/payara-appserver-modules/security-openid/pom.xml index 2162a55bb3f..3e3ab536257 100644 --- a/appserver/payara-appserver-modules/security-openid/pom.xml +++ b/appserver/payara-appserver-modules/security-openid/pom.xml @@ -76,8 +76,8 @@ - javax.security.enterprise - javax.security.enterprise-api + jakarta.security.enterprise + jakarta.security.enterprise-api provided @@ -96,14 +96,14 @@ provided - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api provided - javax - javaee-api - 8.0 + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/payara-appserver-modules/yubikey-authentication/pom.xml b/appserver/payara-appserver-modules/yubikey-authentication/pom.xml index 9acfc4bce2b..10d53f1ed60 100644 --- a/appserver/payara-appserver-modules/yubikey-authentication/pom.xml +++ b/appserver/payara-appserver-modules/yubikey-authentication/pom.xml @@ -90,9 +90,9 @@ provided - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/appserver/pom.xml b/appserver/pom.xml index bb61954a4ca..22248045c65 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -64,11 +64,11 @@ 3.2.5 - 2.3.3 + 2.3.6 2.3.4 - 1.2.2 + 1.2.7 1.2.5 @@ -77,14 +77,14 @@ 2.3.9.payara-p3 - 1.1 + 1.1.2 1.15 2.3.0 - 1.0 + 1.0.2 1.0.4.payara-p2 @@ -95,15 +95,15 @@ 1.3.2 - 1.0 + 1.1.2 1.0.payara-p2 - 1.2.1 + 1.2.5 - 1 - 2.0.SP1 + 1.0 + 2.0.2 3.1.1.Final 3.1.1.Final 3.1.Final @@ -112,14 +112,14 @@ 1.0 - 1.0 - 1.1-b01.payara-p3 + 1.0.2 + 1.1-b01.payara-p3 1.6.1 - 1.1.2 + 1.1.3 2.0.2 @@ -148,16 +148,16 @@ 4.1 - 1.0.7 - 1.1.1 + 1.0.10 + 1.1.4 1.7.3 - 1.6 + 1.7.2 - 1.1.1 + 1.1.4 1.2.1 @@ -296,8 +296,8 @@ - javax.json.bind - javax.json.bind-api + jakarta.json.bind + jakarta.json.bind-api ${json.bind-api.version} false @@ -341,14 +341,14 @@ - javax.security.enterprise - javax.security.enterprise-api + jakarta.security.enterprise + jakarta.security.enterprise-api ${javax.security-api.version} false api ${javax.security.enterprise-spec.version} - ${javax.security.enterprise.version} + ${jakarta.security.enterprise.version} javax.security.enterprise org.glassfish.soteria @@ -384,8 +384,8 @@ - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api ${jstl-api.version} false @@ -412,8 +412,8 @@ - javax.batch - javax.batch-api + jakarta.batch + jakarta.batch-api ${javax.batch-api.version} false @@ -440,8 +440,8 @@ - javax.enterprise.concurrent - javax.enterprise.concurrent-api + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api ${concurrent-api.version} false @@ -482,8 +482,8 @@ - javax.websocket - javax.websocket-api + jakarta.websocket + jakarta.websocket-api ${websocket-api.version} false @@ -524,14 +524,14 @@ - javax.interceptor - javax.interceptor-api - ${javax.interceptor-api.version} + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor-api.version} false api - ${javax.interceptor-api.version} - ${javax.interceptor-api.version} + ${jakarta.interceptor-api.version} + ${jakarta.interceptor-api.version} javax.interceptor @@ -548,32 +548,32 @@ - javax.xml.registry - javax.xml.registry-api - ${javax.xml.registry-api.version} + jakarta.xml.registry + jakarta.xml.registry-api + ${jakarta.xml.registry-api.version} false api 1.0 - ${javax.xml.registry-api.version} + ${jakarta.xml.registry-api.version} javax.xml.registry - javax.xml.rpc - javax.xml.rpc-api - ${javax.xml.rpc-api.version} + jakarta.xml.rpc + jakarta.xml.rpc-api + ${jakarta.xml.rpc-api.version} false api 1.1 - ${javax.xml.rpc-api.version} + ${jakarta.xml.rpc-api.version} javax.xml.rpc - javax.enterprise.deploy - javax.enterprise.deploy-api + jakarta.enterprise.deploy + jakarta.enterprise.deploy-api ${javax.enterprise.deploy-api.version} false @@ -584,8 +584,8 @@ - javax.management.j2ee - javax.management.j2ee-api + jakarta.management.j2ee + jakarta.management.j2ee-api ${javax.management.j2ee-api.version} false @@ -596,8 +596,8 @@ - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api ${jsp-api.version} false @@ -610,11 +610,11 @@ org.glassfish javax.el - ${javax.el.version} + ${jakarta.el.version} impl 3.0 - ${javax.el.version} + ${jakarta.el.version} javax.el com.sun.el @@ -642,9 +642,9 @@ ${jakarta.ejb-api.version} - javax.interceptor - javax.interceptor-api - ${javax.interceptor-api.version} + jakarta.interceptor + jakarta.interceptor-api + ${jakarta.interceptor-api.version} jakarta.transaction @@ -657,19 +657,19 @@ ${jakarta.transaction.cdi-api.version} - javax.xml.rpc - javax.xml.rpc-api - ${javax.xml.rpc-api.version} + jakarta.xml.rpc + jakarta.xml.rpc-api + ${jakarta.xml.rpc-api.version} - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api ${cdi-api.version} - javax.inject - javax.inject - ${javax.inject.version} + jakarta.inject + jakarta.inject-api + ${jakarta.inject.version} jakarta.resource @@ -677,8 +677,8 @@ ${jakarta.resource-api.version} - javax.enterprise.deploy - javax.enterprise.deploy-api + jakarta.enterprise.deploy + jakarta.enterprise.deploy-api ${javax.enterprise.deploy-api.version} @@ -701,14 +701,14 @@ - javax.security.enterprise - javax.security.enterprise-api + jakarta.security.enterprise + jakarta.security.enterprise-api ${javax.security.enterprise-api.version} org.glassfish.soteria javax.security.enterprise - ${javax.security.enterprise.version} + ${jakarta.security.enterprise.version} @@ -798,9 +798,9 @@ ${jaxb-extra-osgi.version} - javax.xml.registry - javax.xml.registry-api - ${javax.xml.registry-api.version} + jakarta.xml.registry + jakarta.xml.registry-api + ${jakarta.xml.registry-api.version} org.codehaus.woodstox @@ -837,6 +837,12 @@ org.jboss.weld weld-api ${weld-api.version} + + + javax.enterprise + cdi-api + + org.jboss.classfilewriter @@ -867,11 +873,17 @@ org.glassfish.web javax.servlet.jsp ${jsp-impl.version} + + + javax.servlet.jsp + jsp-api + + org.glassfish javax.el - ${javax.el.version} + ${jakarta.el.version} com.sun.faces.extensions @@ -898,6 +910,20 @@ com.sun.jsftemplating jsftemplating ${jsftemplating.version} + + + javax.servlet + javax.servlet-api + + + javax.faces + javax.faces-api + + + javax.el + el-api + + com.sun.jsftemplating @@ -945,13 +971,13 @@ ${jms-api.version} - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api ${jsp-api.version} - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api ${jstl-api.version} @@ -962,8 +988,8 @@ - javax.json.bind - javax.json.bind-api + jakarta.json.bind + jakarta.json.bind-api ${json.bind-api.version} @@ -1000,8 +1026,8 @@ - javax.management.j2ee - javax.management.j2ee-api + jakarta.management.j2ee + jakarta.management.j2ee-api ${javax.management.j2ee-api.version} @@ -1081,13 +1107,13 @@ ${ha-api.version} - javax.websocket - javax.websocket-api + jakarta.websocket + jakarta.websocket-api ${websocket-api.version} - javax.enterprise.concurrent - javax.enterprise.concurrent-api + jakarta.enterprise.concurrent + jakarta.enterprise.concurrent-api ${concurrent-api.version} @@ -1111,8 +1137,8 @@ 2.0.4 - javax.batch - javax.batch-api + jakarta.batch + jakarta.batch-api ${javax.batch-api.version} diff --git a/appserver/resources/javamail/javamail-runtime/pom.xml b/appserver/resources/javamail/javamail-runtime/pom.xml index 44db457cca3..6c23056a526 100644 --- a/appserver/resources/javamail/javamail-runtime/pom.xml +++ b/appserver/resources/javamail/javamail-runtime/pom.xml @@ -110,8 +110,8 @@ ${project.version} - javax.interceptor - javax.interceptor-api + jakarta.interceptor + jakarta.interceptor-api com.sun.mail diff --git a/appserver/resources/resources-connector/pom.xml b/appserver/resources/resources-connector/pom.xml index 58f0856222e..e5b139df222 100755 --- a/appserver/resources/resources-connector/pom.xml +++ b/appserver/resources/resources-connector/pom.xml @@ -87,8 +87,8 @@ hk2-core - javax.el - javax.el-api + jakarta.el + jakarta.el-api fish.payara.server.internal.common diff --git a/appserver/tests/payara-samples/pom.xml b/appserver/tests/payara-samples/pom.xml index bc1500a4327..382b60867a4 100644 --- a/appserver/tests/payara-samples/pom.xml +++ b/appserver/tests/payara-samples/pom.xml @@ -61,8 +61,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api 8.0 provided @@ -294,8 +294,8 @@ - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api 1.3.2 diff --git a/appserver/tests/payara-samples/samples/ejb-http-remoting/api/pom.xml b/appserver/tests/payara-samples/samples/ejb-http-remoting/api/pom.xml index e8f8fd0bdaf..d745ea31b47 100644 --- a/appserver/tests/payara-samples/samples/ejb-http-remoting/api/pom.xml +++ b/appserver/tests/payara-samples/samples/ejb-http-remoting/api/pom.xml @@ -77,8 +77,8 @@ provided - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api 8.0.1 provided diff --git a/appserver/tests/payara-samples/samples/ejb-http-remoting/server-app/pom.xml b/appserver/tests/payara-samples/samples/ejb-http-remoting/server-app/pom.xml index dbcb0202b0a..64bb6a50807 100644 --- a/appserver/tests/payara-samples/samples/ejb-http-remoting/server-app/pom.xml +++ b/appserver/tests/payara-samples/samples/ejb-http-remoting/server-app/pom.xml @@ -66,8 +66,8 @@ - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api 8.0.1 provided diff --git a/appserver/tests/payara-samples/samples/pom.xml b/appserver/tests/payara-samples/samples/pom.xml index 5ed4034be23..956609bf30c 100644 --- a/appserver/tests/payara-samples/samples/pom.xml +++ b/appserver/tests/payara-samples/samples/pom.xml @@ -36,8 +36,8 @@ junit - javax - javaee-api + jakarta.platform + jakarta.jakartaee-api fish.payara.samples diff --git a/appserver/transaction/jta/pom.xml b/appserver/transaction/jta/pom.xml index 5371639848d..1c1f15c7fed 100644 --- a/appserver/transaction/jta/pom.xml +++ b/appserver/transaction/jta/pom.xml @@ -96,8 +96,8 @@ jakarta.transaction-api - javax.interceptor - javax.interceptor-api + jakarta.interceptor + jakarta.interceptor-api jakarta.resource diff --git a/appserver/web/cdi-api-fragment/pom.xml b/appserver/web/cdi-api-fragment/pom.xml index 0fb1d36bb77..3cf73cd76f2 100644 --- a/appserver/web/cdi-api-fragment/pom.xml +++ b/appserver/web/cdi-api-fragment/pom.xml @@ -75,7 +75,7 @@ ${project.groupId}.${project.artifactId} 2 - javax.enterprise.cdi-api + jakarta.enterprise.cdi-api org.glassfish.weld ${project.description} diff --git a/appserver/web/gf-weld-connector/pom.xml b/appserver/web/gf-weld-connector/pom.xml index a736bc771b3..17298d1d61f 100644 --- a/appserver/web/gf-weld-connector/pom.xml +++ b/appserver/web/gf-weld-connector/pom.xml @@ -72,8 +72,8 @@ ${project.version} - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api true diff --git a/appserver/web/jstl-connector/pom.xml b/appserver/web/jstl-connector/pom.xml index dffcd64cced..8839b7bb515 100644 --- a/appserver/web/jstl-connector/pom.xml +++ b/appserver/web/jstl-connector/pom.xml @@ -77,8 +77,8 @@ javax.servlet.jsp.jstl - javax.servlet.jsp.jstl - javax.servlet.jsp.jstl-api + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api fish.payara.server.internal.common diff --git a/appserver/web/war-util/pom.xml b/appserver/web/war-util/pom.xml index eb5169c4534..edd2c69fa60 100755 --- a/appserver/web/war-util/pom.xml +++ b/appserver/web/war-util/pom.xml @@ -80,8 +80,8 @@ ${project.version} - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api org.glassfish diff --git a/appserver/web/weld-integration/pom.xml b/appserver/web/weld-integration/pom.xml index f76f7dc6b56..8e962510680 100644 --- a/appserver/web/weld-integration/pom.xml +++ b/appserver/web/weld-integration/pom.xml @@ -104,8 +104,8 @@ ${project.version} - javax.enterprise - cdi-api + jakarta.enterprise + jakarta.enterprise.cdi-api org.jboss.logging @@ -146,6 +146,10 @@ javax.enterprise cdi-api + + jakarta.enterprise + jakarta.enterprise.cdi-api + javassist javassist diff --git a/appserver/webservices/jsr109-impl/pom.xml b/appserver/webservices/jsr109-impl/pom.xml index 0506ec90625..e5aeba39949 100755 --- a/appserver/webservices/jsr109-impl/pom.xml +++ b/appserver/webservices/jsr109-impl/pom.xml @@ -106,8 +106,8 @@ ${project.version} - javax.xml.rpc - javax.xml.rpc-api + jakarta.xml.rpc + jakarta.xml.rpc-api org.glassfish.metro diff --git a/nucleus/admin/config-api/pom.xml b/nucleus/admin/config-api/pom.xml index d51f23a516f..57f5d0ffbdd 100644 --- a/nucleus/admin/config-api/pom.xml +++ b/nucleus/admin/config-api/pom.xml @@ -147,8 +147,8 @@ test - javax.el - javax.el-api + jakarta.el + jakarta.el-api test diff --git a/nucleus/admin/rest/rest-service/pom.xml b/nucleus/admin/rest/rest-service/pom.xml index 683f0b218c5..9984ed1a735 100644 --- a/nucleus/admin/rest/rest-service/pom.xml +++ b/nucleus/admin/rest/rest-service/pom.xml @@ -83,8 +83,8 @@ hk2 - javax.el - javax.el-api + jakarta.el + jakarta.el-api fish.payara.server.internal.core diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml index 76456a172cc..2c0352b2488 100755 --- a/nucleus/core/kernel/pom.xml +++ b/nucleus/core/kernel/pom.xml @@ -251,8 +251,8 @@ hibernate-validator - javax.validation - validation-api + jakarta.validation + jakarta.validation-api org.glassfish diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml index 15050716058..b53c15ffdbf 100644 --- a/nucleus/hk2/hk2-config/pom.xml +++ b/nucleus/hk2/hk2-config/pom.xml @@ -56,7 +56,7 @@ glassfish-jar - 3 + 3 7 @@ -110,7 +110,7 @@ - javax.validation.*;resolution:=optional;version="${range;[==,${javax.validation.version.upperbound});${javax.validation.version}} + javax.validation.*;resolution:=optional;version="${range;[==,${jakarta.validation.version.upperbound});${jakarta.validation.version}} ", org.hibernate.validator.*;resolution:=optional;version="${range;[==,${hibernate.validator.version.upperbound});${hibernate.validator.version}}", * @@ -151,8 +151,8 @@ - javax.el - javax.el-api + jakarta.el + jakarta.el-api test diff --git a/nucleus/packager/nucleus-hk2/pom.xml b/nucleus/packager/nucleus-hk2/pom.xml index 49463c8e01a..b1cca363a9a 100644 --- a/nucleus/packager/nucleus-hk2/pom.xml +++ b/nucleus/packager/nucleus-hk2/pom.xml @@ -115,8 +115,8 @@ - javax.validation - validation-api + jakarta.validation + jakarta.validation-api org.hibernate.validator diff --git a/nucleus/payara-modules/notification-cdi-eventbus-core/pom.xml b/nucleus/payara-modules/notification-cdi-eventbus-core/pom.xml index a582dc3ca82..3f2a6c7831b 100644 --- a/nucleus/payara-modules/notification-cdi-eventbus-core/pom.xml +++ b/nucleus/payara-modules/notification-cdi-eventbus-core/pom.xml @@ -64,9 +64,9 @@ - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/nucleus/payara-modules/notification-core/pom.xml b/nucleus/payara-modules/notification-core/pom.xml index 09774a0d43e..4bdf60cdc31 100644 --- a/nucleus/payara-modules/notification-core/pom.xml +++ b/nucleus/payara-modules/notification-core/pom.xml @@ -101,9 +101,9 @@ ${hk2.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/nucleus/payara-modules/notification-eventbus-core/pom.xml b/nucleus/payara-modules/notification-eventbus-core/pom.xml index 0f369a2dd15..07588820f23 100644 --- a/nucleus/payara-modules/notification-eventbus-core/pom.xml +++ b/nucleus/payara-modules/notification-eventbus-core/pom.xml @@ -62,9 +62,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} provided diff --git a/nucleus/payara-modules/opentracing-adapter/pom.xml b/nucleus/payara-modules/opentracing-adapter/pom.xml index 95b04db12af..b07ab605f80 100644 --- a/nucleus/payara-modules/opentracing-adapter/pom.xml +++ b/nucleus/payara-modules/opentracing-adapter/pom.xml @@ -64,9 +64,9 @@ ${project.version} - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} \ No newline at end of file diff --git a/nucleus/payara-modules/requesttracing-core/pom.xml b/nucleus/payara-modules/requesttracing-core/pom.xml index b4af5a3c718..48bdafa7f3a 100644 --- a/nucleus/payara-modules/requesttracing-core/pom.xml +++ b/nucleus/payara-modules/requesttracing-core/pom.xml @@ -120,9 +120,9 @@ test - javax - javaee-api - ${javaee.api.version} + jakarta.platform + jakarta.jakartaee-api + ${jakartaee.api.version} test diff --git a/nucleus/pom.xml b/nucleus/pom.xml index e80f8e27786..8b379cb500f 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -146,7 +146,7 @@ true - 8.0 + 8.0.0 4.0.2 @@ -165,13 +165,13 @@ 2.29.1.payara-p1 - 2.0.1.Final + 2.0.2 6.0.16.Final 6.0.16.Final - 3.0.1-b11 - 3.0.1-b06 + 3.0.1-b11 + 3.0.3 2.3.2 @@ -896,9 +896,9 @@ Parent is ${project.parent} - javax.validation - validation-api - ${javax.validation.version} + jakarta.validation + jakarta.validation-api + ${jakarta.validation.version} org.hibernate.validator @@ -914,14 +914,14 @@ Parent is ${project.parent} - javax.el - javax.el-api - ${javax.el-api.version} + jakarta.el + jakarta.el-api + ${jakarta.el-api.version} org.glassfish javax.el - ${javax.el.version} + ${jakarta.el.version} From 6c134589d559829e1c08fd363b69cff851525be7 Mon Sep 17 00:00:00 2001 From: Patrik Dudits Date: Fri, 8 Nov 2019 14:13:08 +0100 Subject: [PATCH 2/5] PAYARA-4260: Replace javax.el with jakarta.el --- appserver/admin/admin-core/pom.xml | 2 +- appserver/admingui/common/pom.xml | 2 +- appserver/jdbc/jdbc-runtime/pom.xml | 2 +- appserver/packager/glassfish-web/pom.xml | 2 +- appserver/pom.xml | 4 ++-- appserver/web/war-util/pom.xml | 2 +- appserver/web/web-glue/pom.xml | 2 +- nucleus/admin/config-api/pom.xml | 2 +- nucleus/core/kernel/pom.xml | 2 +- nucleus/hk2/hk2-config/pom.xml | 2 +- nucleus/packager/nucleus-hk2/pom.xml | 2 +- nucleus/pom.xml | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml index af8e432053b..4ffeb4d6992 100755 --- a/appserver/admin/admin-core/pom.xml +++ b/appserver/admin/admin-core/pom.xml @@ -79,7 +79,7 @@ org.glassfish - javax.el + jakarta.el diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml index a72366c0552..1646f86a406 100644 --- a/appserver/admingui/common/pom.xml +++ b/appserver/admingui/common/pom.xml @@ -120,7 +120,7 @@ org.glassfish - javax.el + jakarta.el org.glassfish diff --git a/appserver/jdbc/jdbc-runtime/pom.xml b/appserver/jdbc/jdbc-runtime/pom.xml index 10959e82692..f87b6dfb55a 100644 --- a/appserver/jdbc/jdbc-runtime/pom.xml +++ b/appserver/jdbc/jdbc-runtime/pom.xml @@ -98,7 +98,7 @@ org.glassfish - javax.el + jakarta.el test diff --git a/appserver/packager/glassfish-web/pom.xml b/appserver/packager/glassfish-web/pom.xml index a52829392bd..c9c9df813f4 100644 --- a/appserver/packager/glassfish-web/pom.xml +++ b/appserver/packager/glassfish-web/pom.xml @@ -259,7 +259,7 @@ org.glassfish - javax.el + jakarta.el jakarta.websocket diff --git a/appserver/pom.xml b/appserver/pom.xml index 22248045c65..2506fca3b5d 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -609,7 +609,7 @@ org.glassfish - javax.el + jakarta.el ${jakarta.el.version} impl @@ -882,7 +882,7 @@ org.glassfish - javax.el + jakarta.el ${jakarta.el.version} diff --git a/appserver/web/war-util/pom.xml b/appserver/web/war-util/pom.xml index edd2c69fa60..d2f83f2e5de 100755 --- a/appserver/web/war-util/pom.xml +++ b/appserver/web/war-util/pom.xml @@ -85,7 +85,7 @@ org.glassfish - javax.el + jakarta.el jakarta.servlet diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml index 07b38198f82..85c1023091f 100755 --- a/appserver/web/web-glue/pom.xml +++ b/appserver/web/web-glue/pom.xml @@ -173,7 +173,7 @@ org.glassfish - javax.el + jakarta.el fish.payara.server.internal.admin diff --git a/nucleus/admin/config-api/pom.xml b/nucleus/admin/config-api/pom.xml index 57f5d0ffbdd..dbb9ff4b000 100644 --- a/nucleus/admin/config-api/pom.xml +++ b/nucleus/admin/config-api/pom.xml @@ -153,7 +153,7 @@ org.glassfish - javax.el + jakarta.el test diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml index 2c0352b2488..83af9851f32 100755 --- a/nucleus/core/kernel/pom.xml +++ b/nucleus/core/kernel/pom.xml @@ -256,7 +256,7 @@ org.glassfish - javax.el + jakarta.el fish.payara.server.internal.packager diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml index b53c15ffdbf..ef33e64d894 100644 --- a/nucleus/hk2/hk2-config/pom.xml +++ b/nucleus/hk2/hk2-config/pom.xml @@ -157,7 +157,7 @@ org.glassfish - javax.el + jakarta.el test diff --git a/nucleus/packager/nucleus-hk2/pom.xml b/nucleus/packager/nucleus-hk2/pom.xml index b1cca363a9a..054ef4284e5 100644 --- a/nucleus/packager/nucleus-hk2/pom.xml +++ b/nucleus/packager/nucleus-hk2/pom.xml @@ -126,7 +126,7 @@ org.glassfish - javax.el + jakarta.el diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 8b379cb500f..95f26360d81 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -170,7 +170,7 @@ 6.0.16.Final - 3.0.1-b11 + 3.0.3 3.0.3 @@ -920,7 +920,7 @@ Parent is ${project.parent} org.glassfish - javax.el + jakarta.el ${jakarta.el.version} From 1efe865cc21a9dd830b5a7dc6776bfa8395a6588 Mon Sep 17 00:00:00 2001 From: Patrik Dudits Date: Fri, 8 Nov 2019 23:56:19 +0100 Subject: [PATCH 3/5] PAYARA-4260: Update JSP classpaths to reflect new jakarta artifacts --- .../src/main/resources/config/default-web.xml | 22 +++++++++---------- .../src/main/resources/config/default-web.xml | 22 +++++++++---------- .../src/main/resources/config/default-web.xml | 22 +++++++++---------- .../src/main/resources/config/default-web.xml | 22 +++++++++---------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/appserver/admin/gf_template/src/main/resources/config/default-web.xml b/appserver/admin/gf_template/src/main/resources/config/default-web.xml index 2e74d10be4e..30130a92775 100644 --- a/appserver/admin/gf_template/src/main/resources/config/default-web.xml +++ b/appserver/admin/gf_template/src/main/resources/config/default-web.xml @@ -317,10 +317,10 @@ /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 @@ -328,16 +328,16 @@ 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 diff --git a/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml b/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml index 4ba178294ed..94142a392eb 100644 --- a/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml +++ b/appserver/admin/gf_template_web/src/main/resources/config/default-web.xml @@ -314,10 +314,10 @@ /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 @@ -325,16 +325,16 @@ 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 diff --git a/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml b/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml index 9c9d5c00127..e5c0e41d9bc 100644 --- a/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml +++ b/appserver/admin/production_domain_template/src/main/resources/config/default-web.xml @@ -299,10 +299,10 @@ /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 @@ -310,16 +310,16 @@ 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 diff --git a/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml b/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml index 222812fe307..d60f67ad91c 100644 --- a/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml +++ b/appserver/admin/production_domain_template_web/src/main/resources/config/default-web.xml @@ -323,10 +323,10 @@ /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 @@ -334,16 +334,16 @@ 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 From 256d5f5eb6553e2fba918f79c8240edad55b0fe8 Mon Sep 17 00:00:00 2001 From: Patrik Dudits Date: Mon, 11 Nov 2019 14:41:43 +0100 Subject: [PATCH 4/5] PAYARA-4260: Exclude javax validation api via validator implementation Caused asadmin to miss validation classes, although it needs them --- nucleus/hk2/hk2-config/pom.xml | 4 ++++ nucleus/pom.xml | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml index ef33e64d894..b33c15f5195 100644 --- a/nucleus/hk2/hk2-config/pom.xml +++ b/nucleus/hk2/hk2-config/pom.xml @@ -148,6 +148,10 @@ hibernate-validator ${hibernate.validator.version} + + jakarta.validation + jakarta.validation-api + diff --git a/nucleus/pom.xml b/nucleus/pom.xml index 95f26360d81..2186ca0333d 100644 --- a/nucleus/pom.xml +++ b/nucleus/pom.xml @@ -904,6 +904,12 @@ Parent is ${project.parent} org.hibernate.validator hibernate-validator ${hibernate.validator.version} + + + javax.validation + validation-api + + org.hibernate.validator From 58a9e8aab37f3912283696000a682f439d762e07 Mon Sep 17 00:00:00 2001 From: Patrik Dudits Date: Mon, 11 Nov 2019 20:30:20 +0100 Subject: [PATCH 5/5] PAYARA-4260: Rollback bundle names of jakarta.servlet.jsp-api Bundle name of jakarta artifact still refers to javax --- appserver/admingui/war/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appserver/admingui/war/pom.xml b/appserver/admingui/war/pom.xml index d298dc42e9d..d36d7a1f35a 100644 --- a/appserver/admingui/war/pom.xml +++ b/appserver/admingui/war/pom.xml @@ -71,7 +71,7 @@ org.glassfish.api.admingui.ConsoleProvider - fish.payara.server.internal.admingui.console-common,org.glassfish.hk2.hk2,fish.payara.server.internal.admingui.console-plugin-service, fish.payara.server.internal.deployment.deployment-client, jakarta.servlet-api, jakarta.servlet.jsp-api, com.sun.el.javax.el, com.sun.jsftemplating, fish.payara.server.internal.admingui.dataprovider, com.sun.pkg.client + fish.payara.server.internal.admingui.console-common,org.glassfish.hk2.hk2,fish.payara.server.internal.admingui.console-plugin-service, fish.payara.server.internal.deployment.deployment-client, jakarta.servlet-api, javax.servlet.jsp-api, com.sun.el.javax.el, com.sun.jsftemplating, fish.payara.server.internal.admingui.dataprovider, com.sun.pkg.client @@ -98,7 +98,7 @@ - +