diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml index a83907d3422..a9fc0388e6e 100755 --- a/appserver/admin/admin-core/pom.xml +++ b/appserver/admin/admin-core/pom.xml @@ -60,8 +60,8 @@ - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/appserver/admin/template/src/main/resources/config/default-web.xml b/appserver/admin/template/src/main/resources/config/default-web.xml index 7ce7835058f..bc2cc37b4fa 100644 --- a/appserver/admin/template/src/main/resources/config/default-web.xml +++ b/appserver/admin/template/src/main/resources/config/default-web.xml @@ -301,7 +301,7 @@ /lib/ \lib\ - jakarta.el.jar + expressly.jar jakarta.el-api.jar jakarta.servlet-api.jar jakarta.servlet.jsp-api.jar diff --git a/appserver/admingui/common/pom.xml b/appserver/admingui/common/pom.xml index 12b3c47e388..6300dd0ff22 100644 --- a/appserver/admingui/common/pom.xml +++ b/appserver/admingui/common/pom.xml @@ -72,8 +72,8 @@ jakarta.el-api - org.glassfish - jakarta.el + org.glassfish.expressly + expressly org.glassfish diff --git a/appserver/connectors/admin/pom.xml b/appserver/connectors/admin/pom.xml index f881b659c88..45c9a236c6b 100644 --- a/appserver/connectors/admin/pom.xml +++ b/appserver/connectors/admin/pom.xml @@ -105,8 +105,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/appserver/extras/embedded/all/pom.xml b/appserver/extras/embedded/all/pom.xml index 4cffd331ea8..25d70286613 100644 --- a/appserver/extras/embedded/all/pom.xml +++ b/appserver/extras/embedded/all/pom.xml @@ -1549,8 +1549,8 @@ true - org.glassfish - jakarta.el + org.glassfish.expressly + expressly true diff --git a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml index e606b07d946..77757074f69 100755 --- a/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml +++ b/appserver/extras/embedded/shell/glassfish-embedded-static-shell/pom.xml @@ -1051,8 +1051,8 @@ true - org.glassfish - jakarta.el + org.glassfish.expressly + expressly true diff --git a/appserver/extras/embedded/web/pom.xml b/appserver/extras/embedded/web/pom.xml index b809b8a57d1..e5c5073a40e 100644 --- a/appserver/extras/embedded/web/pom.xml +++ b/appserver/extras/embedded/web/pom.xml @@ -1005,8 +1005,8 @@ true - org.glassfish - jakarta.el + org.glassfish.expressly + expressly true diff --git a/appserver/extras/javaee/manifest-jar/pom.xml b/appserver/extras/javaee/manifest-jar/pom.xml index fb0e2c3be7d..3838ac3cfb9 100644 --- a/appserver/extras/javaee/manifest-jar/pom.xml +++ b/appserver/extras/javaee/manifest-jar/pom.xml @@ -37,7 +37,7 @@ - ../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail-api.jar ../modules/jakarta.activation-api.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/jakarta.el.jar ../modules/jakarta.el-api.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence-api.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/jakarta.validation-api.jar ../modules/cdi-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar + ../modules/jakarta.servlet-api.jar ../modules/jakarta.annotation-api.jar ../modules/jakarta.ejb-api.jar ../modules/jakarta.transaction-api.jar ../modules/jakarta.resource-api.jar ../modules/jakarta.authentication-api.jar ../modules/jakarta.authorization-api.jar ../modules/jakarta.xml.bind-api.jar ../modules/webservices-api-osgi.jar ../modules/jakarta.mail-api.jar ../modules/jakarta.activation-api.jar ../modules/jakarta.faces.jar ../modules/jakarta.servlet.jsp-api.jar ../modules/expressly.jar ../modules/jakarta.el-api.jar ../modules/jakarta.servlet.jsp.jstl-api.jar ../modules/jakarta.persistence-api.jar ../modules/jakarta.jms-api.jar ../modules/hibernate-validator.jar ../modules/jakarta.validation-api.jar ../modules/cdi-api.jar ../modules/jakarta.ws.rs-api.jar ../modules/jakarta.json.jar ../modules/jakarta.json.bind-api.jar ../modules/jakarta.websocket-api.jar ../modules/jakarta.enterprise.concurrent-api.jar ../modules/jakarta.batch-api.jar ../modules/jakarta.inject-api.jar true diff --git a/appserver/featuresets/web/pom.xml b/appserver/featuresets/web/pom.xml index e8681655b33..6c55114a3a4 100644 --- a/appserver/featuresets/web/pom.xml +++ b/appserver/featuresets/web/pom.xml @@ -1158,8 +1158,8 @@ - org.glassfish - jakarta.el + org.glassfish.expressly + expressly * diff --git a/appserver/jdbc/admin/pom.xml b/appserver/jdbc/admin/pom.xml index 6bfa41a5f3a..7ed9ff8684e 100644 --- a/appserver/jdbc/admin/pom.xml +++ b/appserver/jdbc/admin/pom.xml @@ -106,8 +106,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/appserver/jdbc/jdbc-runtime/pom.xml b/appserver/jdbc/jdbc-runtime/pom.xml index ae07141dd00..85879e5f2f9 100644 --- a/appserver/jdbc/jdbc-runtime/pom.xml +++ b/appserver/jdbc/jdbc-runtime/pom.xml @@ -49,8 +49,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/appserver/orb/orb-connector/pom.xml b/appserver/orb/orb-connector/pom.xml index 1a33ff35910..1f7e7669f29 100755 --- a/appserver/orb/orb-connector/pom.xml +++ b/appserver/orb/orb-connector/pom.xml @@ -151,8 +151,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/appserver/pom.xml b/appserver/pom.xml index c1aea33d327..529ff9fac4e 100644 --- a/appserver/pom.xml +++ b/appserver/pom.xml @@ -157,7 +157,7 @@ 4.0.0.Beta3 - 5.0.0.Alpha2 + 5.0.0.Beta1 1.2.5.Final @@ -373,11 +373,11 @@ ${hibernate-validator.version} - + - org.glassfish - jakarta.el - ${jakarta.el.version} + org.glassfish.expressly + expressly + ${expressly.version} @@ -937,15 +937,15 @@ - org.glassfish - jakarta.el - ${jakarta.el.version} + org.glassfish.expressly + expressly + ${expressly.version} impl - 3.0 - 3.0.0 + 5.0 + 5.0.0 jakarta.el - com.sun.el + org.glassfish.expressly diff --git a/appserver/resources/mail/mail-connector/pom.xml b/appserver/resources/mail/mail-connector/pom.xml index 761221048e0..98396ac66bc 100644 --- a/appserver/resources/mail/mail-connector/pom.xml +++ b/appserver/resources/mail/mail-connector/pom.xml @@ -86,8 +86,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/appserver/resources/resources-connector/pom.xml b/appserver/resources/resources-connector/pom.xml index 07acd825cbb..237ffb75cf1 100755 --- a/appserver/resources/resources-connector/pom.xml +++ b/appserver/resources/resources-connector/pom.xml @@ -94,8 +94,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml index 9e417d4221f..233a34f81ec 100644 --- a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml +++ b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml @@ -37,7 +37,7 @@ @@ -46,7 +46,7 @@ - + diff --git a/appserver/tests/tck/faces/pom.xml b/appserver/tests/tck/faces/pom.xml index 3f74ef18eac..39806a2f2cb 100644 --- a/appserver/tests/tck/faces/pom.xml +++ b/appserver/tests/tck/faces/pom.xml @@ -192,7 +192,7 @@ - + diff --git a/appserver/web/war-util/pom.xml b/appserver/web/war-util/pom.xml index a7b474cec11..051195c3c95 100755 --- a/appserver/web/war-util/pom.xml +++ b/appserver/web/war-util/pom.xml @@ -64,8 +64,8 @@ jakarta.el-api - org.glassfish - jakarta.el + org.glassfish.expressly + expressly jakarta.servlet diff --git a/appserver/web/web-glue/pom.xml b/appserver/web/web-glue/pom.xml index 647ce125599..48605e74ead 100755 --- a/appserver/web/web-glue/pom.xml +++ b/appserver/web/web-glue/pom.xml @@ -132,8 +132,8 @@ jakarta.el-api - org.glassfish - jakarta.el + org.glassfish.expressly + expressly org.glassfish.main.admin diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java index 683f89543e1..d34e72aa5c4 100644 --- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java +++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ProxyServicesImpl.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 2010, 2018-2021 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2022 Contributors to the Eclipse Foundation + * Copyright (c) 2010, 2018-2021 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -17,16 +17,14 @@ package org.glassfish.weld.services; -import com.sun.ejb.codegen.ClassGenerator; - -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.security.PrivilegedExceptionAction; import java.security.ProtectionDomain; + import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.internal.api.ClassLoaderHierarchy; import org.jboss.weld.serialization.spi.ProxyServices; +import com.sun.ejb.codegen.ClassGenerator; + /** * An implementation of the {@link ProxyServices}. *

@@ -52,42 +50,6 @@ public ProxyServicesImpl(final ServiceLocator services) { classLoaderHierarchy = services.getService(ClassLoaderHierarchy.class); } - - @Deprecated - @Override - public boolean supportsClassDefining() { - // true is mandatory since Weld 4.0.1.SP1, because default method impl returns false - // and cdi_all tests then fail - return true; - } - - - @Deprecated - @Override - public ClassLoader getClassLoader(final Class proxiedBeanType) { - if (System.getSecurityManager() == null) { - return getClassLoaderforBean(proxiedBeanType); - } - final PrivilegedAction action = () -> getClassLoaderforBean(proxiedBeanType); - return AccessController.doPrivileged(action); - } - - - @Deprecated - @Override - public Class loadBeanClass(final String className) { - try { - if (System.getSecurityManager() == null) { - return loadClassByThreadCL(className); - } - final PrivilegedExceptionAction> action = () -> loadClassByThreadCL(className); - return AccessController.doPrivileged(action); - } catch (final Exception ex) { - throw new WeldProxyException("Failed to load the bean class: " + className, ex); - } - } - - @Override public Class defineClass(final Class originalClass, final String className, final byte[] classBytes, final int off, final int len) throws ClassFormatError { diff --git a/nucleus/admin/config-api/pom.xml b/nucleus/admin/config-api/pom.xml index ca21181128d..3ce47d910ef 100644 --- a/nucleus/admin/config-api/pom.xml +++ b/nucleus/admin/config-api/pom.xml @@ -90,8 +90,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/nucleus/admin/rest/rest-service/pom.xml b/nucleus/admin/rest/rest-service/pom.xml index d6a94627c09..70acd958eee 100644 --- a/nucleus/admin/rest/rest-service/pom.xml +++ b/nucleus/admin/rest/rest-service/pom.xml @@ -137,8 +137,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml index 2f272c75a0a..54a5248f967 100755 --- a/nucleus/core/kernel/pom.xml +++ b/nucleus/core/kernel/pom.xml @@ -180,8 +180,8 @@ - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc index 374f78f92ee..03368129cba 100644 --- a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc +++ b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc @@ -18,7 +18,7 @@ AS_INSTALL=`dirname $0`/.. AS_INSTALL_LIB=$AS_INSTALL/modules JSP_IMPL=$AS_INSTALL_LIB/wasp.jar -EL_IMPL=$AS_INSTALL_LIB/jakarta.el.jar:$AS_INSTALL_LIB/jakarta.el-api.jar +EL_IMPL=$AS_INSTALL_LIB/expressly:$AS_INSTALL_LIB/jakarta.el-api.jar JSTL_IMPL=$AS_INSTALL_LIB/jakarta.servlet.jsp.jstl.jar AS_LIB=$AS_INSTALL/lib JAVAEE_API=$AS_LIB/javaee.jar diff --git a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat index 1db1b2d23bb..1da8773ed32 100644 --- a/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat +++ b/nucleus/distributions/nucleus-common/src/main/resources/bin/jspc.bat @@ -19,7 +19,7 @@ REM set AS_INSTALL_LIB=%~dp0..\modules set JSP_IMPL=%AS_INSTALL_LIB%\wasp.jar -set EL_IMPL=%AS_INSTALL_LIB%\jakarta.el.jar;%AS_INSTALL_LIB%\jakarta.el-api.jar +set EL_IMPL=%AS_INSTALL_LIB%\expressly;%AS_INSTALL_LIB%\jakarta.el-api.jar set JSTL_IMPL=%AS_INSTALL_LIB%\jakarta.servlet.jsp.jstl.jar set AS_LIB=%~dp0..\lib set JAVAEE_API=%AS_LIB%\javaee.jar diff --git a/nucleus/featuresets/atomic/pom.xml b/nucleus/featuresets/atomic/pom.xml index ea3c5072157..5529b728bc2 100644 --- a/nucleus/featuresets/atomic/pom.xml +++ b/nucleus/featuresets/atomic/pom.xml @@ -380,8 +380,8 @@ - org.glassfish - jakarta.el + org.glassfish.expressly + expressly * diff --git a/nucleus/hk2/hk2-config/pom.xml b/nucleus/hk2/hk2-config/pom.xml index 80a2ef3ebc5..25062c649ab 100644 --- a/nucleus/hk2/hk2-config/pom.xml +++ b/nucleus/hk2/hk2-config/pom.xml @@ -54,8 +54,8 @@ test - org.glassfish - jakarta.el + org.glassfish.expressly + expressly test diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml index 78047fc6326..8d3a22193d5 100644 --- a/nucleus/parent/pom.xml +++ b/nucleus/parent/pom.xml @@ -84,7 +84,7 @@ 5.0.0 - 5.0.0-M1 + 5.0.0-SNAPSHOT 6.0.0 @@ -343,9 +343,9 @@ ${jakarta.annotation-api.version} - org.glassfish - jakarta.el - ${jakarta.el.version} + org.glassfish.expressly + expressly + ${expressly.version} com.fasterxml.jackson.core diff --git a/snapshots/expressly/pom.xml b/snapshots/expressly/pom.xml new file mode 100644 index 00000000000..b2d46c093e3 --- /dev/null +++ b/snapshots/expressly/pom.xml @@ -0,0 +1,49 @@ + + + + 4.0.0 + + org.glassfish.main.snapshots + snapshotsmodule + 0.0.0-SNAPSHOT + + + expressly-snapshot + pom + + + https://github.com/eclipse-ee4j/expressly/archive/refs/heads/master.zip + ${project.build.directory}/expressly-master + + + + + + com.googlecode.maven-download-plugin + download-maven-plugin + + + maven-invoker-plugin + + + + diff --git a/snapshots/pom.xml b/snapshots/pom.xml index 6e5ff0a8eb4..f688a3a4275 100644 --- a/snapshots/pom.xml +++ b/snapshots/pom.xml @@ -34,6 +34,7 @@ jbatch + expressly hibernate-validator