diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 24476b201..a118e9451 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -15,6 +15,7 @@
       <groupId>io.ebean</groupId>
       <artifactId>ebean-core</artifactId>
       <version>12.5.2-SNAPSHOT</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- needed for java 11+ -->
@@ -39,7 +40,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.18</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml
index 0fd1258a1..8c2d6395f 100644
--- a/ebean-core/pom.xml
+++ b/ebean-core/pom.xml
@@ -91,12 +91,6 @@
       <scope>provided</scope>
     </dependency>
 
-<!--    <dependency>-->
-<!--      <groupId>io.ebean</groupId>-->
-<!--      <artifactId>ebean-migration</artifactId>-->
-<!--      <version>12.1.4</version>-->
-<!--    </dependency>-->
-
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>jta</artifactId>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index 1a89166cc..da3812c88 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -65,7 +65,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.18</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml
index 63a0858e1..095517538 100644
--- a/ebean-querybean/pom.xml
+++ b/ebean-querybean/pom.xml
@@ -82,7 +82,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.18</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index e857d3bb2..ddccd74e6 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -128,7 +128,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.18</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>