Bump ebean-agent

#3209 MetricsAsJson escape the SQL string content

.github/workflows/multi-jdk-build.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11, 17]
+        java_version: [11, 17, 21]
         os: [ubuntu-latest]
 
     steps:

ebean-api/pom.xml

@@ -39,12 +39,12 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-config</artifactId>
-      <version>3.4</version>
+      <version>3.8</version>
     </dependency>
 
     <dependency>
       <groupId>io.ebean</groupId>
-      <artifactId>persistence-api</artifactId>
+      <artifactId>jakarta-persistence-api</artifactId>
       <version>${ebean-persistence-api.version}</version>
     </dependency>
 
@@ -90,22 +90,22 @@
       <optional>true</optional>
     </dependency>
 
-    <!-- JAVAX-DEPENDENCY-START -->
+    <!-- JAVAX-DEPENDENCY-START ___
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <version>3.1.0</version>
       <optional>true</optional>
     </dependency>
-    <!-- JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START ___
+    ____ JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START -->
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
       <version>6.0.0</version>
       <optional>true</optional>
     </dependency>
-    ____ JAKARTA-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-END -->
 
     <dependency>
       <groupId>io.avaje</groupId>

ebean-api/src/main/java/io/ebean/AcquireLockException.java

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import javax.persistence.PessimisticLockException;
+import jakarta.persistence.PessimisticLockException;
 
 /**
  * Thrown when failing to acquire a pessimistic lock.

ebean-api/src/main/java/io/ebean/DB.java

@@ -7,8 +7,8 @@ import io.ebean.cache.ServerCacheManager;
 import io.ebean.plugin.Property;
 import io.ebean.text.json.JsonContext;
 
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;

ebean-api/src/main/java/io/ebean/DataIntegrityException.java

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 /**
  * Thrown when a foreign key constraint is enforced.

ebean-api/src/main/java/io/ebean/Database.java

@@ -11,8 +11,8 @@ import io.ebean.plugin.Property;
 import io.ebean.plugin.SpiServer;
 import io.ebean.text.json.JsonContext;
 
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.util.Collection;
 import java.util.List;

ebean-api/src/main/java/io/ebean/DatabaseFactory.java

@@ -5,7 +5,7 @@ import io.ebean.config.DatabaseConfig;
 import io.ebean.service.SpiContainer;
 import io.ebean.service.SpiContainerFactory;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.Iterator;
 import java.util.Properties;
 import java.util.ServiceLoader;

ebean-api/src/main/java/io/ebean/DbContext.java

@@ -3,7 +3,7 @@ package io.ebean;
 import io.ebean.config.BeanNotEnhancedException;
 import io.ebean.datasource.DataSourceConfigurationException;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantLock;

ebean-api/src/main/java/io/ebean/ExpressionList.java

@@ -4,7 +4,7 @@ import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
 import io.ebean.search.*;
 
-import javax.persistence.NonUniqueResultException;
+import jakarta.persistence.NonUniqueResultException;
 import java.sql.Connection;
 import java.sql.Timestamp;
 import java.util.*;

ebean-api/src/main/java/io/ebean/FutureList.java

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.List;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;

ebean-api/src/main/java/io/ebean/PersistenceIOException.java

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 /**
  * Captures and wraps IOException's occurring during ElasticSearch processing etc.

ebean-api/src/main/java/io/ebean/Query.java

@@ -3,7 +3,7 @@ package io.ebean;
 import io.avaje.lang.NonNullApi;
 import io.avaje.lang.Nullable;
 
-import javax.persistence.NonUniqueResultException;
+import jakarta.persistence.NonUniqueResultException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.Timestamp;

ebean-api/src/main/java/io/ebean/SerializableConflictException.java

@@ -1,6 +1,6 @@
 package io.ebean;
 
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
 
 /**
  * Thrown at SERIALIZABLE isolation level for non-recoverable concurrent conflict.

ebean-api/src/main/java/io/ebean/Transaction.java

@@ -5,7 +5,7 @@ import io.ebean.annotation.PersistBatch;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DocStoreConfig;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 
 /**

ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java

@@ -4,8 +4,8 @@ import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.ValuePair;
 
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.PersistenceException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java

@@ -3,9 +3,9 @@ package io.ebean.config;
 import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.AnnotationUtil;
 
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Inheritance;
-import javax.persistence.Table;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.Table;
 
 import static io.ebean.util.StringHelper.isNull;
 

ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java

@@ -19,7 +19,7 @@ import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.meta.MetricNamingMatch;
 import io.ebean.util.StringHelper;
 
-import javax.persistence.EnumType;
+import jakarta.persistence.EnumType;
 import javax.sql.DataSource;
 import java.time.Clock;
 import java.time.ZonedDateTime;

ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java

@@ -1,7 +1,7 @@
 package io.ebean.config;
 
 /**
- * Matches the functionality of javax.persistence.AttributeConverter
+ * Matches the functionality of jakarta.persistence.AttributeConverter
  * <p>
  * In general AttributeConverter should be used in preference to this
  * ScalarTypeConverter as it is JPA standard and offers the same functionality.

ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java

@@ -9,7 +9,7 @@ import io.ebean.config.CustomDbTypeMapping;
 import io.ebean.config.PlatformConfig;
 import io.ebean.util.JdbcClose;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.*;
 

ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java

@@ -5,7 +5,7 @@ import io.ebean.BackgroundExecutor;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;

ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java

@@ -3,7 +3,7 @@ package io.ebean.config.dbplatform;
 import io.ebean.Transaction;
 import io.ebean.util.JdbcClose;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.PreparedStatement;

ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java

@@ -5,7 +5,7 @@ import io.ebean.DataIntegrityException;
 import io.ebean.DuplicateKeyException;
 import io.ebean.SerializableConflictException;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.Map;

ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java

@@ -1,6 +1,6 @@
 package io.ebean.config.dbplatform;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 
 /**

ebean-api/src/main/java/io/ebean/event/ServletContextListener.java

@@ -1,6 +1,6 @@
 package io.ebean.event;
 
-import javax.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextEvent;
 
 /**
  * Listens for webserver server starting and stopping events.
@@ -15,7 +15,7 @@ import javax.servlet.ServletContextEvent;
  * hook that Ebean registers.
  * </p>
  */
-public class ServletContextListener implements javax.servlet.ServletContextListener {
+public class ServletContextListener implements jakarta.servlet.ServletContextListener {
 
   /**
    * The servlet container is stopping.

ebean-api/src/main/java/io/ebean/meta/MetricsAsJson.java

@@ -187,11 +187,22 @@ final class MetricsAsJson implements ServerMetricsAsJson {
     }
     if (isIncludeDetail(metric)) {
       append("loc", metric.location());
-      append("sql", metric.sql());
+      append("sql", escape(metric.sql()));
     }
     metricEnd();
   }
 
+  static String escape(String sql) {
+    return sql == null ? null : sql
+      .replace("\\", "\\\\")
+      .replace("\"", "\\\"")
+      .replace("\b", "\\b")
+      .replace("\f", "\\f")
+      .replace("\n", "\\n")
+      .replace("\r", "\\r")
+      .replace("\t", "\\t");
+  }
+
   private boolean isIncludeDetail(MetaTimedMetric metric) {
     return includeExtraAttributes == 2 || includeExtraAttributes == 1 && metric.initialCollection();
   }

ebean-api/src/main/java/module-info.java

@@ -12,7 +12,7 @@ module io.ebean.api {
   requires transitive java.sql;
   requires transitive io.avaje.config;
   requires transitive io.avaje.lang;
-  requires transitive persistence.api;
+  requires transitive jakarta.persistence.api;
   requires transitive io.ebean.annotation;
   requires transitive io.ebean.datasource.api;
   requires transitive io.avaje.applog;
@@ -21,7 +21,7 @@ module io.ebean.api {
   requires static io.ebean.types;
   requires static com.fasterxml.jackson.core;
   requires static com.fasterxml.jackson.databind;
-  requires static javax.servlet.api;
+  requires static jakarta.servlet;
 
   exports io.ebean;
   exports io.ebean.bean;

ebean-api/src/test/java/io/ebean/meta/MetricsAsJsonTest.java

@@ -0,0 +1,25 @@
+package io.ebean.meta;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class MetricsAsJsonTest {
+
+  @Test
+  void trimIt() {
+    assertThat(MetricsAsJson.escape(null)).isNull();
+    assertThat(MetricsAsJson.escape("abc")).isEqualTo("abc");
+  }
+
+  @Test
+  void escape() {
+    assertThat(MetricsAsJson.escape("a\"bc")).isEqualTo("a\\\"bc");
+    assertThat(MetricsAsJson.escape("a\tbc")).isEqualTo("a\\tbc");
+    assertThat(MetricsAsJson.escape("a\bbc")).isEqualTo("a\\bbc");
+    assertThat(MetricsAsJson.escape("a\bc")).isEqualTo("a\\bc");
+    assertThat(MetricsAsJson.escape("a\rbc")).isEqualTo("a\\rbc");
+    assertThat(MetricsAsJson.escape("a\nbc")).isEqualTo("a\\nbc");
+    assertThat(MetricsAsJson.escape("a\\bc")).isEqualTo("a\\\\bc");
+  }
+}

ebean-bom/pom.xml

@@ -20,7 +20,7 @@
 
       <dependency>
         <groupId>io.ebean</groupId>
-        <artifactId>persistence-api</artifactId>
+        <artifactId>jakarta-persistence-api</artifactId>
         <version>${ebean-persistence-api.version}</version>
       </dependency>
 

ebean-core/pom.xml

@@ -81,15 +81,15 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- JAVAX-DEPENDENCY-START -->
+    <!-- JAVAX-DEPENDENCY-START ___
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>javax.transaction-api</artifactId>
       <version>1.3</version>
       <optional>true</optional>
     </dependency>
-    <!-- JAVAX-DEPENDENCY-END -->
-    <!-- JAKARTA-DEPENDENCY-START ___
+    ____ JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START -->
     <dependency>
       <groupId>jakarta.transaction</groupId>
       <artifactId>jakarta.transaction-api</artifactId>
@@ -102,7 +102,7 @@
       <version>4.0.1</version>
       <scope>provided</scope>
     </dependency>
-    ____ JAKARTA-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-END -->
 
     <!-- validation annotations Size etc -->
     <dependency>

ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.api;
 import io.ebeaninternal.server.transaction.TransactionScopeManager;
 import io.ebeaninternal.server.util.ArrayStack;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 /**
  * Manage scoped (typically thread local) transactions.

ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.api;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 import io.ebean.CancelableQuery;
 

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java

@@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.SQLException;
 

ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java

@@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl;
 import io.ebeaninternal.server.transaction.ProfileStream;
 import io.ebeanservice.docstore.api.DocStoreTransaction;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.SQLException;
 

ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java

@@ -7,7 +7,7 @@ import io.ebean.util.IOUtils;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.util.UrlHelper;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.io.*;
 import java.net.URL;
 import java.nio.file.Path;

ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java

@@ -6,7 +6,7 @@ import io.ebean.config.dbplatform.DatabasePlatformProvider;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.DbOffline;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java

@@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor.EntityType;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 
-import javax.persistence.EntityNotFoundException;
+import jakarta.persistence.EntityNotFoundException;
 import java.util.List;
 
 import static java.lang.System.Logger.Level.DEBUG;

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java

@@ -13,7 +13,7 @@ import io.ebeaninternal.server.core.bootup.BootupClassPathSearch;
 import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.SQLException;

ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java

@@ -45,10 +45,10 @@ import io.ebeaninternal.util.ParamTypeHelper;
 import io.ebeaninternal.util.ParamTypeHelper.TypeInfo;
 import io.ebeanservice.docstore.api.DocStoreIntegration;
 
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.NonUniqueResultException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.NonUniqueResultException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;

ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java

@@ -7,7 +7,7 @@ import io.ebean.datasource.DataSourceConfig;
 import io.ebean.datasource.DataSourceFactory;
 import io.ebean.datasource.DataSourcePoolListener;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import javax.sql.DataSource;
 
 /**

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java

@@ -4,7 +4,7 @@ import io.ebean.QueryIterator;
 import io.ebean.Version;
 import io.ebean.bean.BeanCollection;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;

ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java

@@ -18,7 +18,7 @@ import io.ebeaninternal.server.loadcontext.DLoadContext;
 import io.ebeaninternal.server.query.CQueryPlan;
 import io.ebeaninternal.server.transaction.DefaultPersistenceContext;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.function.Consumer;

ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java

@@ -8,7 +8,7 @@ import io.ebeaninternal.server.persist.BatchPostExecute;
 import io.ebeaninternal.server.persist.BatchedSqlException;
 import io.ebeaninternal.server.persist.PersistExecute;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 
 /**

ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java

@@ -20,9 +20,9 @@ import io.ebeanservice.docstore.api.DocStoreUpdate;
 import io.ebeanservice.docstore.api.DocStoreUpdateContext;
 import io.ebeanservice.docstore.api.DocStoreUpdates;
 
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EntityNotFoundException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import java.io.IOException;
 import java.sql.Statement;
 import java.util.*;

ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java

@@ -14,10 +14,10 @@ import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.api.CoreLog;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import javax.persistence.CascadeType;
+import jakarta.persistence.CascadeType;
 
 /**
  * Persist info for determining if save or delete should be performed.

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java

@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy;
 
 import io.ebean.bean.BeanCollection;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.Map;
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -55,7 +55,7 @@ import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocumentMapping;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.lang.reflect.Modifier;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java

@@ -42,9 +42,9 @@ import io.ebeaninternal.xmapping.api.XmapRawSql;
 import io.ebeanservice.docstore.api.DocStoreBeanAdapter;
 import io.ebeanservice.docstore.api.DocStoreFactory;
 
-import javax.persistence.MappedSuperclass;
-import javax.persistence.PersistenceException;
-import javax.persistence.Transient;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.Transient;
 import javax.sql.DataSource;
 import java.io.Serializable;
 import java.lang.reflect.Field;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy;
 import io.ebean.config.BeanNotRegisteredException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
 import java.util.Map;
 
 /**

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java

@@ -10,14 +10,14 @@ import io.ebean.event.BeanPostLoad;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 
 import javax.annotation.PostConstruct;
-import javax.persistence.PersistenceException;
-import javax.persistence.PostLoad;
-import javax.persistence.PostPersist;
-import javax.persistence.PostRemove;
-import javax.persistence.PostUpdate;
-import javax.persistence.PrePersist;
-import javax.persistence.PreRemove;
-import javax.persistence.PreUpdate;
+import jakarta.persistence.PersistenceException;
+import jakarta.persistence.PostLoad;
+import jakarta.persistence.PostPersist;
+import jakarta.persistence.PostRemove;
+import jakarta.persistence.PostUpdate;
+import jakarta.persistence.PrePersist;
+import jakarta.persistence.PreRemove;
+import jakarta.persistence.PreUpdate;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java

@@ -41,7 +41,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.mapping.DocPropertyOptions;
 import io.ebeanservice.docstore.api.support.DocStructure;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java

@@ -28,7 +28,7 @@ import io.ebeanservice.docstore.api.mapping.DocMappingBuilder;
 import io.ebeanservice.docstore.api.mapping.DocPropertyMapping;
 import io.ebeanservice.docstore.api.support.DocStructure;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.ArrayList;
 import java.util.List;
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -23,7 +23,7 @@ import io.ebeaninternal.server.el.ElPropertyValue;
 import io.ebeaninternal.server.query.STreePropertyAssocMany;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.*;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -27,7 +27,7 @@ import io.ebeaninternal.server.query.STreePropertyAssocOne;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 import io.ebeaninternal.server.query.SqlJoinType;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java

@@ -5,7 +5,7 @@ import io.ebean.core.type.DataReader;
 import io.ebean.text.TextException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Map;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java

@@ -12,7 +12,7 @@ import io.ebean.text.TextException;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.util.Checksum;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Objects;
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java

@@ -4,7 +4,7 @@ import io.ebean.core.type.DataReader;
 import io.ebean.core.type.ScalarType;
 import io.ebeaninternal.server.query.SqlBeanLoad;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 /**
  * Dynamic property based on aggregation (max, min, avg, count).

ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java

@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.id.IdBinder;
 import io.ebeaninternal.server.deploy.parse.DeployInheritInfo;
 import io.ebeaninternal.server.query.SqlTreeProperties;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.lang.reflect.Modifier;
 import java.sql.SQLException;
 import java.util.ArrayList;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
 
 /**
  * Utility to find the root bean type.

ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java

@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy.generatedproperty;
 
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Types;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy.generatedproperty;
 import io.ebean.config.ClassLoadConfig;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy.generatedproperty;
 import io.ebean.config.ClassLoadConfig;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java

@@ -12,7 +12,7 @@ import io.ebeaninternal.server.deploy.IntersectionRow;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 
 /**

ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java

@@ -12,7 +12,7 @@ import io.ebeaninternal.server.deploy.IntersectionRow;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Comparator;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java

@@ -22,8 +22,8 @@ import io.ebeaninternal.server.idgen.UuidV1RndIdGenerator;
 import io.ebeaninternal.server.idgen.UuidV4IdGenerator;
 import io.ebeaninternal.server.rawsql.SpiRawSql;
 
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Entity;
+import jakarta.persistence.MappedSuperclass;
 import java.util.*;
 
 /**

ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy.meta;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
 import java.util.HashMap;
 import java.util.Map;
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java

@@ -18,10 +18,10 @@ import io.ebeaninternal.server.properties.BeanPropertySetter;
 import io.ebeaninternal.server.type.ScalarTypeWrapper;
 import io.ebeanservice.docstore.api.mapping.DocPropertyOptions;
 
-import javax.persistence.EmbeddedId;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.Version;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Version;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java

@@ -2,7 +2,7 @@ package io.ebeaninternal.server.deploy.meta;
 
 import io.ebeaninternal.server.query.SqlJoinType;
 
-import javax.persistence.CascadeType;
+import jakarta.persistence.CascadeType;
 
 /**
  * Property mapped to a joined bean.

ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.deploy.meta;
 
-import javax.persistence.OrderColumn;
+import jakarta.persistence.OrderColumn;
 
 public final class DeployOrderColumn {
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java

@@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.parse.DeployUtil;
 import io.ebeaninternal.server.query.SqlJoinType;
 
-import javax.persistence.JoinColumn;
+import jakarta.persistence.JoinColumn;
 import java.util.ArrayList;
 import java.util.Set;
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java

@@ -22,20 +22,20 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoin;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
 
-import javax.persistence.CascadeType;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.EnumType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.Lob;
-import javax.persistence.ManyToMany;
-import javax.persistence.MapKey;
-import javax.persistence.MapKeyColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.OrderColumn;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.MapKey;
+import jakarta.persistence.MapKeyColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.OrderColumn;
 import java.util.Set;
 
 /**

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java

@@ -14,7 +14,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn;
 import io.ebeaninternal.server.query.SqlJoinType;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import static java.lang.System.Logger.Level.INFO;
 

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java

@@ -9,11 +9,11 @@ import io.ebean.config.dbplatform.DatabasePlatform;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.NamedQueries;
+import jakarta.persistence.NamedQuery;
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.Set;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java

@@ -11,7 +11,7 @@ import io.ebeaninternal.server.deploy.PartitionMeta;
 import io.ebeaninternal.server.deploy.TablespaceMeta;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import static io.ebean.util.AnnotationUtil.typeGet;
 import static java.lang.System.Logger.Level.ERROR;
@@ -129,7 +129,7 @@ final class AnnotationClass extends AnnotationParser {
       for (UniqueConstraint c : uniqueConstraints) {
         descriptor.addIndex(new IndexDefinition(c.name(), convertColumnNames(c.columnNames())));
       }
-      for (javax.persistence.Index index : table.indexes()) {
+      for (jakarta.persistence.Index index : table.indexes()) {
         final String[] cols = index.columnList().split(",");
         descriptor.addIndex(new IndexDefinition(index.name(), convertColumnNames(cols), index.unique()));
       }

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java

@@ -20,7 +20,7 @@ import io.ebeaninternal.server.type.ScalarTypeBytesBase;
 import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted;
 import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.sql.Types;
 import java.util.Set;
 import java.util.UUID;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java

@@ -4,10 +4,10 @@ import io.ebean.annotation.DbMigration;
 import io.ebean.annotation.Index;
 import io.ebean.annotation.Indices;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinColumns;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.AttributeOverrides;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
 import java.lang.reflect.Field;
 import java.util.Collections;
 import java.util.LinkedHashSet;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java

@@ -6,9 +6,9 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java

@@ -9,7 +9,7 @@ import io.ebeaninternal.server.deploy.ManyType;
 import io.ebeaninternal.server.deploy.meta.*;
 import io.ebeaninternal.server.type.TypeManager;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.lang.reflect.*;
 
 import static java.lang.System.Logger.Level.*;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java

@@ -5,10 +5,10 @@ import io.ebeaninternal.server.core.bootup.BootupClasses;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor;
 
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
-import javax.persistence.DiscriminatorValue;
-import javax.persistence.Inheritance;
+import jakarta.persistence.DiscriminatorColumn;
+import jakarta.persistence.DiscriminatorType;
+import jakarta.persistence.DiscriminatorValue;
+import jakarta.persistence.Inheritance;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.deploy.parse;
 import io.ebeaninternal.server.deploy.InheritInfo;
 
 import java.lang.reflect.Modifier;
-import javax.persistence.DiscriminatorType;
+import jakarta.persistence.DiscriminatorType;
 import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java

@@ -18,9 +18,9 @@ import io.ebeaninternal.server.type.ScalarTypeWrapper;
 import io.ebeaninternal.server.type.SimpleAesEncryptor;
 import io.ebeaninternal.server.type.TypeManager;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.PersistenceException;
 import java.sql.Types;
 
 /**

ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java

@@ -8,7 +8,7 @@ import io.ebean.config.DatabaseConfig;
 import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory;
 import io.ebeaninternal.server.deploy.meta.DeployBeanProperty;
 
-import javax.persistence.Column;
+import jakarta.persistence.Column;
 import java.util.HashSet;
 import java.util.Set;
 

ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java

@@ -6,7 +6,7 @@ import io.ebean.*;
 import io.ebeaninternal.api.SpiExpressionList;
 import io.ebeaninternal.api.SpiQuery;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.*;
 
 @NonNullApi

ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java

@@ -1,6 +1,6 @@
 package io.ebeaninternal.server.persist;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Collection;

ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java

@@ -2,7 +2,7 @@ package io.ebeaninternal.server.persist;
 
 import io.ebeaninternal.server.core.PersistRequestBean;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 /**
  * Defines bean insert update and delete implementation.

ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java

@@ -13,7 +13,7 @@ import io.ebeaninternal.server.expression.platform.DbExpressionHandler;
 import io.ebeaninternal.server.persist.platform.MultiValueBind;
 import io.ebeaninternal.server.type.*;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.math.BigDecimal;
 import java.sql.*;
 import java.util.Collection;

ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java

@@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequestOrmUpdate;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 import io.ebeaninternal.server.util.BindParamsParser;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 

ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java

@@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequestUpdateSql;
 import io.ebeaninternal.server.core.PersistRequestUpdateSql.SqlType;
 import io.ebeaninternal.server.util.BindParamsParser;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;

ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java

@@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssoc;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocMany;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;

ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java

@@ -8,7 +8,7 @@ import io.ebeaninternal.api.SpiSqlUpdate;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.*;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Map;

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.persist.dml;
 import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestBean;
 
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java

@@ -9,7 +9,7 @@ import io.ebeaninternal.server.persist.BatchedPstmtHolder;
 import io.ebeaninternal.server.persist.dmlbind.BindableRequest;
 import io.ebeaninternal.server.bind.DataBind;
 
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java

@@ -3,7 +3,7 @@ package io.ebeaninternal.server.persist.dml;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.persist.BeanPersister;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 
 /**
  * Document store based BeanPersister.

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java

@@ -6,8 +6,8 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanDescriptor;
 
-import javax.persistence.OptimisticLockException;
-import javax.persistence.PersistenceException;
+import jakarta.persistence.OptimisticLockException;
+import jakarta.persistence.PersistenceException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;

ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java

@@ -4,7 +4,7 @@ import io.ebeaninternal.api.SpiTransaction;
 import io.ebeaninternal.api.SpiUpdatePlan;
 import io.ebeaninternal.server.core.PersistRequestBean;
 
-import javax.persistence.OptimisticLockException;
+import jakarta.persistence.OptimisticLockException;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 

ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java

@@ -5,7 +5,7 @@ import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.InheritInfo;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.List;
 

ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java

@@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;

ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java

@@ -5,7 +5,7 @@ import io.ebeaninternal.server.core.PersistRequestBean;
 import io.ebeaninternal.server.deploy.BeanProperty;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.List;
 

ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java

@@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne;
 import io.ebeaninternal.server.deploy.id.ImportedId;
 import io.ebeaninternal.server.persist.dml.GenerateDmlRequest;
 
-import javax.persistence.PersistenceException;
+import jakarta.persistence.PersistenceException;
 import java.sql.SQLException;
 import java.util.List;
 

ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/MatchedImportedFactory.java

@@ -41,7 +41,7 @@ final class MatchedImportedFactory {
     }
     // match on property name
     for (BeanProperty beanProperty : desc.propertiesBaseScalar()) {
-      if (prop.name().equals(beanProperty.name())) {
+      if (!beanProperty.isFormula() && prop.name().equals(beanProperty.name())) {
         return new MatchedImportedScalar(prop, beanProperty);
       }
     }