diff --git a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpSessionManager.java b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpSessionManager.java
index 1d87822a7..1f88dc716 100644
--- a/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpSessionManager.java
+++ b/core/impl/src/main/java/cloud/piranha/core/impl/DefaultHttpSessionManager.java
@@ -288,6 +288,7 @@ public String encodeURL(HttpServletResponse response, String url) {
     }
 
     @Override
+    @SuppressWarnings("removal")
     public String getComment() {
         return comment;
     }
diff --git a/extension/eclipselink/src/main/java/cloud/piranha/extension/eclipselink/EntityManagerFactoryCreator.java b/extension/eclipselink/src/main/java/cloud/piranha/extension/eclipselink/EntityManagerFactoryCreator.java
index e5e666af7..e265f10e6 100644
--- a/extension/eclipselink/src/main/java/cloud/piranha/extension/eclipselink/EntityManagerFactoryCreator.java
+++ b/extension/eclipselink/src/main/java/cloud/piranha/extension/eclipselink/EntityManagerFactoryCreator.java
@@ -27,8 +27,6 @@
  */
 package cloud.piranha.extension.eclipselink;
 
-import static jakarta.persistence.spi.PersistenceUnitTransactionType.JTA;
-
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -103,6 +101,7 @@ public EntityManagerFactory get(String unitName) {
         return entityManagerFactories.computeIfAbsent(unitName, this::create);
     }
 
+    @SuppressWarnings("removal")
     private EntityManagerFactory create(String unitName) {
         Map<Object, Object> properties = new HashMap<>();
 
@@ -122,7 +121,7 @@ private EntityManagerFactory create(String unitName) {
             throw new IllegalStateException("No persistence unit found for [" + unitName + "]");
         }
 
-        persistenceUnitInfo.setTransactionType(JTA);
+        persistenceUnitInfo.setTransactionType(jakarta.persistence.spi.PersistenceUnitTransactionType.JTA);
 
         if (persistenceUnitInfo.getJtaDataSource() != null && persistenceUnitInfo.getJtaDataSource().getClass().getName().equals("org.eclipse.persistence.internal.jpa.jdbc.DataSourceImpl")) {
             for (Method method : persistenceUnitInfo.getJtaDataSource().getClass().getDeclaredMethods()) {