diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
index 1d7f9e562..1f233092a 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
@@ -8,7 +8,6 @@ import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-import java.util.StringJoiner;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,7 +15,6 @@ import org.slf4j.LoggerFactory;
 import io.ebean.DB;
 import io.ebean.Database;
 import io.ebean.annotation.Platform;
-import io.ebean.config.ClassLoadConfig;
 import io.ebean.config.DatabaseConfig;
 import io.ebean.config.DbConstraintNaming;
 import io.ebean.config.PlatformConfig;
@@ -46,7 +44,6 @@ import io.ebean.config.dbplatform.sqlserver.SqlServer17Platform;
 import io.ebean.config.dbplatform.yugabyte.YugabytePlaform;
 import io.ebean.dbmigration.DbMigration;
 import io.ebean.util.IOUtils;
-import io.ebean.util.StringHelper;
 import io.ebeaninternal.api.DbOffline;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions;
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
index c8b29872a..ed8d65987 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/UnknownResourcePathException.java
@@ -7,6 +7,8 @@ package io.ebeaninternal.dbmigration;
  */
 public class UnknownResourcePathException extends RuntimeException {
 
+  private static final long serialVersionUID = 8533769929372106003L;
+
   public UnknownResourcePathException(String msg) {
     super(msg);
   }
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
index 78e0632b6..674c07063 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseDdlBuffer.java
@@ -1,7 +1,6 @@
 package io.ebeaninternal.dbmigration.ddlgeneration.platform;
 
 import io.ebeaninternal.dbmigration.ddlgeneration.DdlBuffer;
-import io.ebeaninternal.dbmigration.model.MConfiguration;
 
 
 /**
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
index ca155653c..b522b6b7a 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/SqlServerDdl.java
@@ -239,6 +239,7 @@ public class SqlServerDdl extends PlatformDdl {
         .append("_tvp') drop type ebean_").append(name).append("_tvp").endOfStatement();
   }
 
+  @SuppressWarnings("unused")
   private void createTVP(DdlBuffer ddl, String name, String definition) {
     ddl.append("if not exists (select name  from sys.types where name = 'ebean_").append(name)
     .append("_tvp') create type ebean_").append(name).append("_tvp as table (c1 ").append(definition).append(")")
diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
index f226ebaec..aea2425d8 100644
--- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
+++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/model/MTableIdentity.java
@@ -89,8 +89,9 @@ public class MTableIdentity {
         return IdentityType.EXTERNAL;
       case GENERATOR:
         return IdentityType.GENERATOR;
+    default:
+        return null;
     }
-    return null;
   }
 
   private static int toInt(BigInteger firstVal, BigInteger secVal) {
diff --git a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
index c8cd4d400..06390a20e 100644
--- a/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/BaseTestCase.java
@@ -5,14 +5,11 @@ import io.ebean.Database;
 import io.ebean.annotation.PersistBatch;
 import io.ebean.annotation.Platform;
 import io.ebeaninternal.api.SpiEbeanServer;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.sql.Types;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 public abstract class BaseTestCase {
 
   protected static Logger logger = LoggerFactory.getLogger(BaseTestCase.class);
diff --git a/ebean-ddl-generator/src/test/java/io/localtest/DbMigrationSqlServerTest.java b/ebean-ddl-generator/src/test/java/io/localtest/DbMigrationSqlServerTest.java
index 3e63179ec..fbe23d7b3 100644
--- a/ebean-ddl-generator/src/test/java/io/localtest/DbMigrationSqlServerTest.java
+++ b/ebean-ddl-generator/src/test/java/io/localtest/DbMigrationSqlServerTest.java
@@ -3,7 +3,6 @@ package io.localtest;
 import io.ebean.annotation.Platform;
 import io.ebean.dbmigration.DbMigration;
 import io.ebeaninternal.api.DbOffline;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;