diff --git a/pom.xml b/pom.xml
index 82432dcc5..350d11878 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>io.ebean</groupId>
       <artifactId>ebean-migration</artifactId>
-      <version>12.1.1</version>
+      <version>12.1.2</version>
     </dependency>
 
     <dependency>
diff --git a/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
index 9074eba55..11dc2da47 100644
--- a/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
+++ b/src/main/java/io/ebeaninternal/server/core/ClassPathScanners.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.core;
 
+import io.avaje.classpath.scanner.ClassPathScanner;
+import io.avaje.classpath.scanner.ClassPathScannerFactory;
 import io.ebean.config.ServerConfig;
-import org.avaje.classpath.scanner.ClassPathScanner;
-import org.avaje.classpath.scanner.ClassPathScannerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java b/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
index 6bec6dc65..0716f1812 100644
--- a/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
+++ b/src/main/java/io/ebeaninternal/server/core/InternalConfigXmlRead.java
@@ -1,13 +1,13 @@
 package io.ebeaninternal.server.core;
 
+import io.avaje.classpath.scanner.ClassPathScanner;
+import io.avaje.classpath.scanner.Resource;
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.server.dto.DtoNamedQueries;
 import io.ebeaninternal.xmlmapping.XmlMappingReader;
 import io.ebeaninternal.xmlmapping.model.XmDto;
 import io.ebeaninternal.xmlmapping.model.XmEbean;
 import io.ebeaninternal.xmlmapping.model.XmRawSql;
-import org.avaje.classpath.scanner.ClassPathScanner;
-import org.avaje.classpath.scanner.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java b/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
index 1731b8a8c..cc750c410 100644
--- a/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
+++ b/src/main/java/io/ebeaninternal/server/core/bootup/BootupClassPathSearch.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.server.core.bootup;
 
+import io.avaje.classpath.scanner.ClassPathScanner;
 import io.ebean.config.ServerConfig;
 import io.ebeaninternal.server.core.ClassPathScanners;
-import org.avaje.classpath.scanner.ClassPathScanner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
index dbb127786..875b5572a 100644
--- a/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
+++ b/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java
@@ -1,5 +1,6 @@
 package io.ebeaninternal.server.core.bootup;
 
+import io.avaje.classpath.scanner.ClassFilter;
 import io.ebean.annotation.DocStore;
 import io.ebean.config.IdGenerator;
 import io.ebean.config.ScalarTypeConverter;
@@ -18,7 +19,6 @@ import io.ebean.event.readaudit.ReadAuditLogger;
 import io.ebean.event.readaudit.ReadAuditPrepare;
 import io.ebean.util.AnnotationUtil;
 import io.ebeaninternal.server.type.ScalarType;
-import org.avaje.classpath.scanner.ClassFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
index 8e0c355b3..eb8c27f66 100644
--- a/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
+++ b/src/main/java/io/ebeaninternal/xmlmapping/XmlMappingReader.java
@@ -1,8 +1,8 @@
 package io.ebeaninternal.xmlmapping;
 
+import io.avaje.classpath.scanner.Resource;
 import io.ebeaninternal.util.UrlHelper;
 import io.ebeaninternal.xmlmapping.model.XmEbean;
-import org.avaje.classpath.scanner.Resource;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -36,7 +36,7 @@ public class XmlMappingReader {
   /**
    * Read the deployment XML for the given resource name.
    */
-  public static List<XmEbean> readByResourceName(ClassLoader classLoader, String resourceName){
+  public static List<XmEbean> readByResourceName(ClassLoader classLoader, String resourceName) {
     try {
       Enumeration<URL> resources = classLoader.getResources(resourceName);
       List<XmEbean> mappings = new ArrayList<>();
@@ -55,7 +55,7 @@ public class XmlMappingReader {
   /**
    * Read the deployment XML for the given resources.
    */
-  public static List<XmEbean> readByResourceList(List<Resource> resourceList){
+  public static List<XmEbean> readByResourceList(List<Resource> resourceList) {
     try {
       List<XmEbean> mappings = new ArrayList<>();
       for (Resource xmlMappingRes : resourceList) {