Now have to start servlet change
Signed-off-by: smillidge <steve.millidge@payara.fish>
diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java
index f0bb021..bc80c71 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/api/ServerSentEventContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 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
@@ -20,7 +20,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.util.Nonbinding;
+import jakarta.enterprise.util.Nonbinding;
import javax.inject.Qualifier;
/**
diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
index c84d806..25e1c2b 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventApplication.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 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
@@ -18,9 +18,9 @@
import org.glassfish.sse.api.ServerSentEventHandler;
-import javax.enterprise.context.spi.CreationalContext;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.http.HttpServletRequest;
+import jakarta.enterprise.context.spi.CreationalContext;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventCdiExtension.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventCdiExtension.java
index ae4ae4d..97d26e6 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventCdiExtension.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventCdiExtension.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 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
@@ -18,11 +18,11 @@
import org.glassfish.sse.api.*;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.*;
-import javax.enterprise.util.AnnotationLiteral;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.spi.*;
+import jakarta.enterprise.util.AnnotationLiteral;
import java.lang.annotation.Annotation;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventConnectionImpl.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventConnectionImpl.java
index 5c7e336..65c6413 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventConnectionImpl.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventConnectionImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 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
@@ -16,13 +16,13 @@
package org.glassfish.sse.impl;
-import javax.enterprise.context.spi.CreationalContext;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.AsyncEvent;
import jakarta.servlet.AsyncListener;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import jakarta.enterprise.context.spi.CreationalContext;
import org.glassfish.sse.api.*;
diff --git a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java
index 4278bf6..5ea1283 100644
--- a/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java
+++ b/appserver/web/web-sse/src/main/java/org/glassfish/sse/impl/ServerSentEventServlet.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2020 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
@@ -18,9 +18,9 @@
import org.glassfish.sse.api.ServerSentEventHandler;
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
import javax.inject.Inject;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.ServletException;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIEventHelperImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIEventHelperImpl.java
index c0eb363..c7a906f 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIEventHelperImpl.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedCDIEventHelperImpl.java
@@ -20,7 +20,7 @@
import jakarta.enterprise.context.Initialized;
import jakarta.enterprise.event.Event;
import javax.inject.Inject;
-import javax.transaction.TransactionScoped;
+import jakarta.transaction.TransactionScoped;
/**
* @author <a href="mailto:arjav.desai@oracle.com">Arjav Desai</a>
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedContextImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedContextImpl.java
index a4481ee..a49ebfb 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedContextImpl.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionScopedContextImpl.java
@@ -23,9 +23,9 @@
import jakarta.enterprise.inject.spi.PassivationCapable;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.transaction.Status;
-import javax.transaction.TransactionScoped;
-import javax.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.Status;
+import jakarta.transaction.TransactionScoped;
+import jakarta.transaction.TransactionSynchronizationRegistry;
import java.lang.annotation.Annotation;
import java.util.Set;
import java.util.HashSet;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
index 495beae..aea00e3 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorBase.java
@@ -33,9 +33,9 @@
import javax.naming.InitialContext;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
-import javax.transaction.SystemException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
import java.io.Serializable;
import java.util.logging.Logger;
@@ -182,8 +182,8 @@
}
public Object proceed(InvocationContext ctx) throws Exception {
- javax.transaction.Transactional transactionalAnnotation =
- ctx.getMethod().getAnnotation(javax.transaction.Transactional.class);
+ jakarta.transaction.Transactional transactionalAnnotation =
+ ctx.getMethod().getAnnotation(jakarta.transaction.Transactional.class);
Class[] rollbackOn = null;
Class[] dontRollbackOn = null;
if (transactionalAnnotation != null) { //if at method level
@@ -191,7 +191,7 @@
dontRollbackOn = transactionalAnnotation.dontRollbackOn();
} else { //if not, at class level
Class<?> targetClass = ctx.getTarget().getClass();
- transactionalAnnotation = targetClass.getAnnotation(javax.transaction.Transactional.class);
+ transactionalAnnotation = targetClass.getAnnotation(jakarta.transaction.Transactional.class);
if (transactionalAnnotation != null) {
rollbackOn = transactionalAnnotation.rollbackOn();
dontRollbackOn = transactionalAnnotation.dontRollbackOn();
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorMandatory.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorMandatory.java
index 4e9323d..58eb707 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorMandatory.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorMandatory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 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
@@ -16,13 +16,12 @@
package org.glassfish.cdi.transaction;
-import org.glassfish.logging.annotation.LoggerInfo;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import javax.transaction.TransactionRequiredException;
-import javax.transaction.TransactionalException;
+import jakarta.transaction.TransactionRequiredException;
+import jakarta.transaction.TransactionalException;
import java.util.logging.Logger;
/**
@@ -36,7 +35,7 @@
*/
@jakarta.annotation.Priority(Interceptor.Priority.PLATFORM_BEFORE + 200)
@Interceptor()
-@javax.transaction.Transactional(javax.transaction.Transactional.TxType.MANDATORY)
+@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.MANDATORY)
public class TransactionalInterceptorMandatory extends TransactionalInterceptorBase {
private static final Logger _logger = Logger.getLogger(CDI_JTA_LOGGER_SUBSYSTEM_NAME, SHARED_LOGMESSAGE_RESOURCE);
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNever.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNever.java
index 03984f0..5f70b0a 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNever.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNever.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 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
@@ -16,13 +16,12 @@
package org.glassfish.cdi.transaction;
-import org.glassfish.logging.annotation.LoggerInfo;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import javax.transaction.InvalidTransactionException;
-import javax.transaction.TransactionalException;
+import jakarta.transaction.InvalidTransactionException;
+import jakarta.transaction.TransactionalException;
import java.util.logging.Logger;
/**
@@ -36,7 +35,7 @@
*/
@jakarta.annotation.Priority(Interceptor.Priority.PLATFORM_BEFORE + 200)
@Interceptor
-@javax.transaction.Transactional(javax.transaction.Transactional.TxType.NEVER)
+@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.NEVER)
public class TransactionalInterceptorNever extends TransactionalInterceptorBase {
private static final Logger _logger = Logger.getLogger(CDI_JTA_LOGGER_SUBSYSTEM_NAME, SHARED_LOGMESSAGE_RESOURCE);
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNotSupported.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNotSupported.java
index f1b1563..e0ad0d8 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNotSupported.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorNotSupported.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 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
@@ -16,13 +16,12 @@
package org.glassfish.cdi.transaction;
-import org.glassfish.logging.annotation.LoggerInfo;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionalException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionalException;
import java.util.logging.Logger;
/**
@@ -38,7 +37,7 @@
*/
@jakarta.annotation.Priority(Interceptor.Priority.PLATFORM_BEFORE + 200)
@Interceptor
-@javax.transaction.Transactional(javax.transaction.Transactional.TxType.NOT_SUPPORTED)
+@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.NOT_SUPPORTED)
public class TransactionalInterceptorNotSupported extends TransactionalInterceptorBase {
private static final Logger _logger = Logger.getLogger(CDI_JTA_LOGGER_SUBSYSTEM_NAME, SHARED_LOGMESSAGE_RESOURCE);
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java
index d73517e..c0177d7 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequired.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 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
@@ -16,13 +16,12 @@
package org.glassfish.cdi.transaction;
-import org.glassfish.logging.annotation.LoggerInfo;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import javax.transaction.Status;
-import javax.transaction.TransactionalException;
+import jakarta.transaction.Status;
+import jakarta.transaction.TransactionalException;
import java.util.logging.Logger;
/**
@@ -38,7 +37,7 @@
*/
@jakarta.annotation.Priority(Interceptor.Priority.PLATFORM_BEFORE + 200)
@Interceptor
-@javax.transaction.Transactional(javax.transaction.Transactional.TxType.REQUIRED)
+@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.REQUIRED)
public class TransactionalInterceptorRequired extends TransactionalInterceptorBase {
private static final Logger _logger = Logger.getLogger(CDI_JTA_LOGGER_SUBSYSTEM_NAME, SHARED_LOGMESSAGE_RESOURCE);
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java
index 5bcf094..d8b4dbf 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorRequiresNew.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 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
@@ -16,14 +16,13 @@
package org.glassfish.cdi.transaction;
-import org.glassfish.logging.annotation.LoggerInfo;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import javax.transaction.Status;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionalException;
+import jakarta.transaction.Status;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionalException;
import java.util.logging.Logger;
/**
@@ -41,7 +40,7 @@
*/
@jakarta.annotation.Priority(Interceptor.Priority.PLATFORM_BEFORE + 200)
@Interceptor
-@javax.transaction.Transactional(javax.transaction.Transactional.TxType.REQUIRES_NEW)
+@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.REQUIRES_NEW)
public class TransactionalInterceptorRequiresNew extends TransactionalInterceptorBase {
private static final Logger _logger = Logger.getLogger(CDI_JTA_LOGGER_SUBSYSTEM_NAME, SHARED_LOGMESSAGE_RESOURCE);
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorSupports.java b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorSupports.java
index 2362196..07bf2d6 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorSupports.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/cdi/transaction/TransactionalInterceptorSupports.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 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
@@ -16,7 +16,6 @@
package org.glassfish.cdi.transaction;
-import org.glassfish.logging.annotation.LoggerInfo;
import javax.interceptor.AroundInvoke;
//import javax.interceptor.Interceptor;
@@ -37,7 +36,7 @@
*/
@jakarta.annotation.Priority(Interceptor.Priority.PLATFORM_BEFORE + 200)
@Interceptor
-@javax.transaction.Transactional(javax.transaction.Transactional.TxType.SUPPORTS)
+@jakarta.transaction.Transactional(jakarta.transaction.Transactional.TxType.SUPPORTS)
public class TransactionalInterceptorSupports extends TransactionalInterceptorBase {
private static final Logger _logger = Logger.getLogger(CDI_JTA_LOGGER_SUBSYSTEM_NAME, SHARED_LOGMESSAGE_RESOURCE);
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
index 65cb98b..5525631 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/WeldDeployer.java
@@ -51,7 +51,6 @@
import org.jboss.weld.bootstrap.api.Environments;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.weld.bootstrap.spi.BeanDiscoveryMode;
-import org.jboss.weld.bootstrap.spi.BootstrapConfiguration;
import org.jboss.weld.bootstrap.spi.EEModuleDescriptor;
import org.jboss.weld.bootstrap.spi.helpers.EEModuleDescriptorImpl;
import org.jboss.weld.ejb.spi.EjbServices;
@@ -301,9 +300,9 @@
}
}
private String getDeploymentErrorMsgPrefix( Throwable t ) {
- if ( t instanceof javax.enterprise.inject.spi.DefinitionException ) {
+ if ( t instanceof jakarta.enterprise.inject.spi.DefinitionException ) {
return "CDI definition failure:";
- } else if ( t instanceof javax.enterprise.inject.spi.DeploymentException ) {
+ } else if ( t instanceof jakarta.enterprise.inject.spi.DeploymentException ) {
return "CDI deployment failure:";
} else {
Throwable cause = t.getCause();
@@ -463,8 +462,6 @@
ProxyServices proxyServices = new ProxyServicesImpl(services);
deploymentImpl.getServices().add(ProxyServices.class, proxyServices);
- BootstrapConfigurationImpl bootstrapConfiguration = new BootstrapConfigurationImpl();
- deploymentImpl.getServices().add(BootstrapConfiguration.class, bootstrapConfiguration);
addWeldListenerToAllWars(context);
} else {
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/jsf/WeldApplication.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/jsf/WeldApplication.java
index 693c7e0..58c2824 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/jsf/WeldApplication.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/jsf/WeldApplication.java
@@ -16,8 +16,8 @@
package org.glassfish.weld.jsf;
-import javax.el.ELContextListener;
-import javax.el.ExpressionFactory;
+import jakarta.el.ELContextListener;
+import jakarta.el.ExpressionFactory;
import jakarta.enterprise.inject.spi.BeanManager;
import javax.faces.application.Application;
import javax.faces.application.ApplicationWrapper;
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/BootstrapConfigurationImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/BootstrapConfigurationImpl.java
deleted file mode 100644
index a3b3c86..0000000
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/BootstrapConfigurationImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2014, 2018 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.weld.services;
-
-import org.jboss.weld.bootstrap.spi.BootstrapConfiguration;
-
-/**
- * @author <a href="mailto:j.j.snyder@oracle.com">JJ Snyder</a>
- */
-public class BootstrapConfigurationImpl implements BootstrapConfiguration {
- @Override
- public boolean isConcurrentDeploymentEnabled() {
- // GlassFish was failing several tck tests when this is true. Those tests include:
- // org.jboss.cdi.tck.tests.deployment.packaging.ear.MultiWebModuleWithExtensionTest
- // org.jboss.cdi.tck.tests.deployment.packaging.ear.SingleWebModuleWithExtensionTest
-
- return false;
- }
-
- @Override
- public int getPreloaderThreadPoolSize() {
- return 0;
- }
-
- @Override
- public void cleanup() {
- }
-
-
- @Override
- public boolean isNonPortableModeEnabled() {
- return false;
- }
-}
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/NonModuleInjectionServices.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/NonModuleInjectionServices.java
index e1c8299..c05477a 100644
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/NonModuleInjectionServices.java
+++ b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/NonModuleInjectionServices.java
@@ -67,7 +67,7 @@
}
}
- public <T> void registerInjectionTarget(javax.enterprise.inject.spi.InjectionTarget<T> injectionTarget, AnnotatedType<T> annotatedType) {
+ public <T> void registerInjectionTarget(jakarta.enterprise.inject.spi.InjectionTarget<T> injectionTarget, AnnotatedType<T> annotatedType) {
}
public void cleanup() {
diff --git a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ValidationServicesImpl.java b/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ValidationServicesImpl.java
deleted file mode 100644
index 5929efa..0000000
--- a/appserver/web/weld-integration/src/main/java/org/glassfish/weld/services/ValidationServicesImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2009, 2020 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
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package org.glassfish.weld.services;
-
-import jakarta.validation.Validation;
-import jakarta.validation.ValidatorFactory;
-
-import org.jboss.weld.validation.spi.ValidationServices;
-
-public class ValidationServicesImpl /* implements ValidationServices TMP */ {
-
- private final ValidatorFactory validatorFactory;
-
- public ValidationServicesImpl() {
- this.validatorFactory = Validation.buildDefaultValidatorFactory();
- }
-
- public ValidatorFactory getDefaultValidatorFactory() {
- return validatorFactory;
- }
-
- public void cleanup() {}
-
-}
-
diff --git a/nucleus/parent/pom.xml b/nucleus/parent/pom.xml
index d021ca4..97c15ff 100644
--- a/nucleus/parent/pom.xml
+++ b/nucleus/parent/pom.xml
@@ -91,7 +91,7 @@
<jakarta.validation.version>3.0.0-M1</jakarta.validation.version>
<hibernate-validator.version>7.0.0.Alpha1</hibernate-validator.version>
<javassist.version>3.26.0-GA</javassist.version>
- <jakarta.el.version>3.0.3</jakarta.el.version>
+ <jakarta.el.version>4.0.0-RC1</jakarta.el.version>
<jakarta.el-api.version>3.0.2</jakarta.el-api.version>
<hk2.version>2.6.1</hk2.version>
<hk2.plugin.version>2.5.0</hk2.plugin.version>
