From e7cbf29c117c1464453767483dee7621ca62e5a5 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Sat, 9 Sep 2017 01:23:09 +1200 Subject: [PATCH] #32 - Repackage from io.ebean.dbmigration to io.ebean.migration (in preparation for java 9 modules) --- pom.xml | 19 +++++++++++++++++-- .../DbNameUtil.java | 2 +- .../DbPlatformNames.java | 2 +- .../MigrationConfig.java | 2 +- .../MigrationException.java | 2 +- .../MigrationRunner.java | 12 ++++++------ .../MigrationVersion.java | 2 +- .../ddl/DdlParser.java | 2 +- .../ddl/DdlRunner.java | 2 +- .../ddl/DdlRunnerException.java | 2 +- .../runner/Checksum.java | 2 +- .../runner/LocalMigrationResource.java | 4 ++-- .../runner/LocalMigrationResources.java | 6 +++--- .../runner/MigrationMetaRow.java | 6 +++--- .../runner/MigrationSchema.java | 6 +++--- .../runner/MigrationScriptRunner.java | 4 ++-- .../runner/MigrationTable.java | 10 +++++----- .../runner/PlaceholderBuilder.java | 2 +- .../runner/ScriptTransform.java | 2 +- .../util/IOUtils.java | 2 +- .../util/JdbcClose.java | 3 +-- src/main/resources/META-INF/MANIFEST.MF | 2 ++ .../MigrationConfigTest.java | 2 +- .../MigrationRunnerTest.java | 4 ++-- .../MigrationRunner_platform_Test.java | 2 +- .../MigrationVersionTest.java | 2 +- .../ddl/DdlParserTest.java | 2 +- .../runner/ChecksumTest.java | 2 +- .../runner/MigrationMetaRowTest.java | 2 +- .../runner/MigrationSchemaTest.java | 4 ++-- .../runner/MigrationTableTest.java | 6 +++--- .../runner/PlaceholderBuilderTest.java | 2 +- .../runner/ScriptTransformTest.java | 2 +- 33 files changed, 71 insertions(+), 55 deletions(-) rename src/main/java/io/ebean/{dbmigration => migration}/DbNameUtil.java (97%) rename src/main/java/io/ebean/{dbmigration => migration}/DbPlatformNames.java (91%) rename src/main/java/io/ebean/{dbmigration => migration}/MigrationConfig.java (99%) rename src/main/java/io/ebean/{dbmigration => migration}/MigrationException.java (87%) rename src/main/java/io/ebean/{dbmigration => migration}/MigrationRunner.java (94%) rename src/main/java/io/ebean/{dbmigration => migration}/MigrationVersion.java (99%) rename src/main/java/io/ebean/{dbmigration => migration}/ddl/DdlParser.java (98%) rename src/main/java/io/ebean/{dbmigration => migration}/ddl/DdlRunner.java (98%) rename src/main/java/io/ebean/{dbmigration => migration}/ddl/DdlRunnerException.java (78%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/Checksum.java (94%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/LocalMigrationResource.java (96%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/LocalMigrationResources.java (95%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/MigrationMetaRow.java (97%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/MigrationSchema.java (93%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/MigrationScriptRunner.java (88%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/MigrationTable.java (97%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/PlaceholderBuilder.java (96%) rename src/main/java/io/ebean/{dbmigration => migration}/runner/ScriptTransform.java (96%) rename src/main/java/io/ebean/{dbmigration => migration}/util/IOUtils.java (98%) rename src/main/java/io/ebean/{dbmigration => migration}/util/JdbcClose.java (94%) create mode 100644 src/main/resources/META-INF/MANIFEST.MF rename src/test/java/io/ebean/{dbmigration => migration}/MigrationConfigTest.java (98%) rename src/test/java/io/ebean/{dbmigration => migration}/MigrationRunnerTest.java (96%) rename src/test/java/io/ebean/{dbmigration => migration}/MigrationRunner_platform_Test.java (96%) rename src/test/java/io/ebean/{dbmigration => migration}/MigrationVersionTest.java (99%) rename src/test/java/io/ebean/{dbmigration => migration}/ddl/DdlParserTest.java (98%) rename src/test/java/io/ebean/{dbmigration => migration}/runner/ChecksumTest.java (91%) rename src/test/java/io/ebean/{dbmigration => migration}/runner/MigrationMetaRowTest.java (95%) rename src/test/java/io/ebean/{dbmigration => migration}/runner/MigrationSchemaTest.java (92%) rename src/test/java/io/ebean/{dbmigration => migration}/runner/MigrationTableTest.java (95%) rename src/test/java/io/ebean/{dbmigration => migration}/runner/PlaceholderBuilderTest.java (98%) rename src/test/java/io/ebean/{dbmigration => migration}/runner/ScriptTransformTest.java (96%) diff --git a/pom.xml b/pom.xml index f7de46e..dfd843b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,8 +3,8 @@ 4.0.0 io.ebean - ebean-dbmigration - 10.1.12-SNAPSHOT + ebean-migration + 10.2.1-SNAPSHOT org.avaje @@ -74,4 +74,19 @@ + + + + org.apache.maven.plugins + maven-jar-plugin + 2.5 + + + src/main/resources/META-INF/MANIFEST.MF + + + + + + \ No newline at end of file diff --git a/src/main/java/io/ebean/dbmigration/DbNameUtil.java b/src/main/java/io/ebean/migration/DbNameUtil.java similarity index 97% rename from src/main/java/io/ebean/dbmigration/DbNameUtil.java rename to src/main/java/io/ebean/migration/DbNameUtil.java index 3cbf77d..d596bde 100644 --- a/src/main/java/io/ebean/dbmigration/DbNameUtil.java +++ b/src/main/java/io/ebean/migration/DbNameUtil.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration; +package io.ebean.migration; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/io/ebean/dbmigration/DbPlatformNames.java b/src/main/java/io/ebean/migration/DbPlatformNames.java similarity index 91% rename from src/main/java/io/ebean/dbmigration/DbPlatformNames.java rename to src/main/java/io/ebean/migration/DbPlatformNames.java index b04c3c6..fe88cc5 100644 --- a/src/main/java/io/ebean/dbmigration/DbPlatformNames.java +++ b/src/main/java/io/ebean/migration/DbPlatformNames.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration; +package io.ebean.migration; /** * Known database platform names. diff --git a/src/main/java/io/ebean/dbmigration/MigrationConfig.java b/src/main/java/io/ebean/migration/MigrationConfig.java similarity index 99% rename from src/main/java/io/ebean/dbmigration/MigrationConfig.java rename to src/main/java/io/ebean/migration/MigrationConfig.java index b7b2c6e..5306da4 100644 --- a/src/main/java/io/ebean/dbmigration/MigrationConfig.java +++ b/src/main/java/io/ebean/migration/MigrationConfig.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration; +package io.ebean.migration; import java.sql.Connection; import java.sql.DriverManager; diff --git a/src/main/java/io/ebean/dbmigration/MigrationException.java b/src/main/java/io/ebean/migration/MigrationException.java similarity index 87% rename from src/main/java/io/ebean/dbmigration/MigrationException.java rename to src/main/java/io/ebean/migration/MigrationException.java index fc1b2a8..18368f4 100644 --- a/src/main/java/io/ebean/dbmigration/MigrationException.java +++ b/src/main/java/io/ebean/migration/MigrationException.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration; +package io.ebean.migration; public class MigrationException extends RuntimeException { diff --git a/src/main/java/io/ebean/dbmigration/MigrationRunner.java b/src/main/java/io/ebean/migration/MigrationRunner.java similarity index 94% rename from src/main/java/io/ebean/dbmigration/MigrationRunner.java rename to src/main/java/io/ebean/migration/MigrationRunner.java index 1886d11..27df163 100644 --- a/src/main/java/io/ebean/dbmigration/MigrationRunner.java +++ b/src/main/java/io/ebean/migration/MigrationRunner.java @@ -1,10 +1,10 @@ -package io.ebean.dbmigration; +package io.ebean.migration; -import io.ebean.dbmigration.runner.LocalMigrationResource; -import io.ebean.dbmigration.runner.LocalMigrationResources; -import io.ebean.dbmigration.runner.MigrationTable; -import io.ebean.dbmigration.runner.MigrationSchema; -import io.ebean.dbmigration.util.JdbcClose; +import io.ebean.migration.runner.LocalMigrationResource; +import io.ebean.migration.runner.LocalMigrationResources; +import io.ebean.migration.runner.MigrationTable; +import io.ebean.migration.runner.MigrationSchema; +import io.ebean.migration.util.JdbcClose; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebean/dbmigration/MigrationVersion.java b/src/main/java/io/ebean/migration/MigrationVersion.java similarity index 99% rename from src/main/java/io/ebean/dbmigration/MigrationVersion.java rename to src/main/java/io/ebean/migration/MigrationVersion.java index d3f7f3e..684abaa 100644 --- a/src/main/java/io/ebean/dbmigration/MigrationVersion.java +++ b/src/main/java/io/ebean/migration/MigrationVersion.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration; +package io.ebean.migration; import java.util.Arrays; diff --git a/src/main/java/io/ebean/dbmigration/ddl/DdlParser.java b/src/main/java/io/ebean/migration/ddl/DdlParser.java similarity index 98% rename from src/main/java/io/ebean/dbmigration/ddl/DdlParser.java rename to src/main/java/io/ebean/migration/ddl/DdlParser.java index 7eca808..d471d6b 100644 --- a/src/main/java/io/ebean/dbmigration/ddl/DdlParser.java +++ b/src/main/java/io/ebean/migration/ddl/DdlParser.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.ddl; +package io.ebean.migration.ddl; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/io/ebean/dbmigration/ddl/DdlRunner.java b/src/main/java/io/ebean/migration/ddl/DdlRunner.java similarity index 98% rename from src/main/java/io/ebean/dbmigration/ddl/DdlRunner.java rename to src/main/java/io/ebean/migration/ddl/DdlRunner.java index 8a7299a..35a096b 100644 --- a/src/main/java/io/ebean/dbmigration/ddl/DdlRunner.java +++ b/src/main/java/io/ebean/migration/ddl/DdlRunner.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.ddl; +package io.ebean.migration.ddl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebean/dbmigration/ddl/DdlRunnerException.java b/src/main/java/io/ebean/migration/ddl/DdlRunnerException.java similarity index 78% rename from src/main/java/io/ebean/dbmigration/ddl/DdlRunnerException.java rename to src/main/java/io/ebean/migration/ddl/DdlRunnerException.java index c9e49e1..3e76104 100644 --- a/src/main/java/io/ebean/dbmigration/ddl/DdlRunnerException.java +++ b/src/main/java/io/ebean/migration/ddl/DdlRunnerException.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.ddl; +package io.ebean.migration.ddl; public class DdlRunnerException extends RuntimeException { diff --git a/src/main/java/io/ebean/dbmigration/runner/Checksum.java b/src/main/java/io/ebean/migration/runner/Checksum.java similarity index 94% rename from src/main/java/io/ebean/dbmigration/runner/Checksum.java rename to src/main/java/io/ebean/migration/runner/Checksum.java index caef8c6..6c5504a 100644 --- a/src/main/java/io/ebean/dbmigration/runner/Checksum.java +++ b/src/main/java/io/ebean/migration/runner/Checksum.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/io/ebean/dbmigration/runner/LocalMigrationResource.java b/src/main/java/io/ebean/migration/runner/LocalMigrationResource.java similarity index 96% rename from src/main/java/io/ebean/dbmigration/runner/LocalMigrationResource.java rename to src/main/java/io/ebean/migration/runner/LocalMigrationResource.java index 733a190..9f9e5ad 100644 --- a/src/main/java/io/ebean/dbmigration/runner/LocalMigrationResource.java +++ b/src/main/java/io/ebean/migration/runner/LocalMigrationResource.java @@ -1,6 +1,6 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; -import io.ebean.dbmigration.MigrationVersion; +import io.ebean.migration.MigrationVersion; import org.avaje.classpath.scanner.Resource; /** diff --git a/src/main/java/io/ebean/dbmigration/runner/LocalMigrationResources.java b/src/main/java/io/ebean/migration/runner/LocalMigrationResources.java similarity index 95% rename from src/main/java/io/ebean/dbmigration/runner/LocalMigrationResources.java rename to src/main/java/io/ebean/migration/runner/LocalMigrationResources.java index 147dbda..d51d03a 100644 --- a/src/main/java/io/ebean/dbmigration/runner/LocalMigrationResources.java +++ b/src/main/java/io/ebean/migration/runner/LocalMigrationResources.java @@ -1,7 +1,7 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; -import io.ebean.dbmigration.MigrationConfig; -import io.ebean.dbmigration.MigrationVersion; +import io.ebean.migration.MigrationConfig; +import io.ebean.migration.MigrationVersion; import org.avaje.classpath.scanner.Resource; import org.avaje.classpath.scanner.ResourceFilter; import org.avaje.classpath.scanner.Scanner; diff --git a/src/main/java/io/ebean/dbmigration/runner/MigrationMetaRow.java b/src/main/java/io/ebean/migration/runner/MigrationMetaRow.java similarity index 97% rename from src/main/java/io/ebean/dbmigration/runner/MigrationMetaRow.java rename to src/main/java/io/ebean/migration/runner/MigrationMetaRow.java index c8d0e6f..4f6fc61 100644 --- a/src/main/java/io/ebean/dbmigration/runner/MigrationMetaRow.java +++ b/src/main/java/io/ebean/migration/runner/MigrationMetaRow.java @@ -1,7 +1,7 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; -import io.ebean.dbmigration.DbPlatformNames; -import io.ebean.dbmigration.util.JdbcClose; +import io.ebean.migration.DbPlatformNames; +import io.ebean.migration.util.JdbcClose; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/src/main/java/io/ebean/dbmigration/runner/MigrationSchema.java b/src/main/java/io/ebean/migration/runner/MigrationSchema.java similarity index 93% rename from src/main/java/io/ebean/dbmigration/runner/MigrationSchema.java rename to src/main/java/io/ebean/migration/runner/MigrationSchema.java index 6f8c973..d13ba75 100644 --- a/src/main/java/io/ebean/dbmigration/runner/MigrationSchema.java +++ b/src/main/java/io/ebean/migration/runner/MigrationSchema.java @@ -1,7 +1,7 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; -import io.ebean.dbmigration.MigrationConfig; -import io.ebean.dbmigration.util.JdbcClose; +import io.ebean.migration.MigrationConfig; +import io.ebean.migration.util.JdbcClose; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebean/dbmigration/runner/MigrationScriptRunner.java b/src/main/java/io/ebean/migration/runner/MigrationScriptRunner.java similarity index 88% rename from src/main/java/io/ebean/dbmigration/runner/MigrationScriptRunner.java rename to src/main/java/io/ebean/migration/runner/MigrationScriptRunner.java index 23ee2c1..6571bdf 100644 --- a/src/main/java/io/ebean/dbmigration/runner/MigrationScriptRunner.java +++ b/src/main/java/io/ebean/migration/runner/MigrationScriptRunner.java @@ -1,6 +1,6 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; -import io.ebean.dbmigration.ddl.DdlRunner; +import io.ebean.migration.ddl.DdlRunner; import java.sql.Connection; import java.sql.SQLException; diff --git a/src/main/java/io/ebean/dbmigration/runner/MigrationTable.java b/src/main/java/io/ebean/migration/runner/MigrationTable.java similarity index 97% rename from src/main/java/io/ebean/dbmigration/runner/MigrationTable.java rename to src/main/java/io/ebean/migration/runner/MigrationTable.java index fe5f3f4..75f585c 100644 --- a/src/main/java/io/ebean/dbmigration/runner/MigrationTable.java +++ b/src/main/java/io/ebean/migration/runner/MigrationTable.java @@ -1,9 +1,9 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; -import io.ebean.dbmigration.MigrationConfig; -import io.ebean.dbmigration.MigrationException; -import io.ebean.dbmigration.util.IOUtils; -import io.ebean.dbmigration.util.JdbcClose; +import io.ebean.migration.MigrationConfig; +import io.ebean.migration.MigrationException; +import io.ebean.migration.util.IOUtils; +import io.ebean.migration.util.JdbcClose; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/io/ebean/dbmigration/runner/PlaceholderBuilder.java b/src/main/java/io/ebean/migration/runner/PlaceholderBuilder.java similarity index 96% rename from src/main/java/io/ebean/dbmigration/runner/PlaceholderBuilder.java rename to src/main/java/io/ebean/migration/runner/PlaceholderBuilder.java index 291f483..dc326ee 100644 --- a/src/main/java/io/ebean/dbmigration/runner/PlaceholderBuilder.java +++ b/src/main/java/io/ebean/migration/runner/PlaceholderBuilder.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/io/ebean/dbmigration/runner/ScriptTransform.java b/src/main/java/io/ebean/migration/runner/ScriptTransform.java similarity index 96% rename from src/main/java/io/ebean/dbmigration/runner/ScriptTransform.java rename to src/main/java/io/ebean/migration/runner/ScriptTransform.java index 1953ca6..6e64cf6 100644 --- a/src/main/java/io/ebean/dbmigration/runner/ScriptTransform.java +++ b/src/main/java/io/ebean/migration/runner/ScriptTransform.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/io/ebean/dbmigration/util/IOUtils.java b/src/main/java/io/ebean/migration/util/IOUtils.java similarity index 98% rename from src/main/java/io/ebean/dbmigration/util/IOUtils.java rename to src/main/java/io/ebean/migration/util/IOUtils.java index 6674690..d8ad6fe 100644 --- a/src/main/java/io/ebean/dbmigration/util/IOUtils.java +++ b/src/main/java/io/ebean/migration/util/IOUtils.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.util; +package io.ebean.migration.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/main/java/io/ebean/dbmigration/util/JdbcClose.java b/src/main/java/io/ebean/migration/util/JdbcClose.java similarity index 94% rename from src/main/java/io/ebean/dbmigration/util/JdbcClose.java rename to src/main/java/io/ebean/migration/util/JdbcClose.java index 4c1a4b3..ee246c0 100644 --- a/src/main/java/io/ebean/dbmigration/util/JdbcClose.java +++ b/src/main/java/io/ebean/migration/util/JdbcClose.java @@ -1,10 +1,9 @@ -package io.ebean.dbmigration.util; +package io.ebean.migration.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.sql.Connection; -import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..8ad70ad --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Automatic-Module-Name: io.ebean.migration diff --git a/src/test/java/io/ebean/dbmigration/MigrationConfigTest.java b/src/test/java/io/ebean/migration/MigrationConfigTest.java similarity index 98% rename from src/test/java/io/ebean/dbmigration/MigrationConfigTest.java rename to src/test/java/io/ebean/migration/MigrationConfigTest.java index c695d79..c033fc1 100644 --- a/src/test/java/io/ebean/dbmigration/MigrationConfigTest.java +++ b/src/test/java/io/ebean/migration/MigrationConfigTest.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration; +package io.ebean.migration; import org.testng.annotations.Test; diff --git a/src/test/java/io/ebean/dbmigration/MigrationRunnerTest.java b/src/test/java/io/ebean/migration/MigrationRunnerTest.java similarity index 96% rename from src/test/java/io/ebean/dbmigration/MigrationRunnerTest.java rename to src/test/java/io/ebean/migration/MigrationRunnerTest.java index b2932f8..2789910 100644 --- a/src/test/java/io/ebean/dbmigration/MigrationRunnerTest.java +++ b/src/test/java/io/ebean/migration/MigrationRunnerTest.java @@ -1,6 +1,6 @@ -package io.ebean.dbmigration; +package io.ebean.migration; -import io.ebean.dbmigration.runner.LocalMigrationResource; +import io.ebean.migration.runner.LocalMigrationResource; import org.avaje.datasource.DataSourceConfig; import org.avaje.datasource.DataSourcePool; import org.avaje.datasource.Factory; diff --git a/src/test/java/io/ebean/dbmigration/MigrationRunner_platform_Test.java b/src/test/java/io/ebean/migration/MigrationRunner_platform_Test.java similarity index 96% rename from src/test/java/io/ebean/dbmigration/MigrationRunner_platform_Test.java rename to src/test/java/io/ebean/migration/MigrationRunner_platform_Test.java index b1b245f..b2517c0 100644 --- a/src/test/java/io/ebean/dbmigration/MigrationRunner_platform_Test.java +++ b/src/test/java/io/ebean/migration/MigrationRunner_platform_Test.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration; +package io.ebean.migration; import org.testng.annotations.Test; diff --git a/src/test/java/io/ebean/dbmigration/MigrationVersionTest.java b/src/test/java/io/ebean/migration/MigrationVersionTest.java similarity index 99% rename from src/test/java/io/ebean/dbmigration/MigrationVersionTest.java rename to src/test/java/io/ebean/migration/MigrationVersionTest.java index 6306bca..9d4f0bd 100644 --- a/src/test/java/io/ebean/dbmigration/MigrationVersionTest.java +++ b/src/test/java/io/ebean/migration/MigrationVersionTest.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration; +package io.ebean.migration; import org.testng.annotations.Test; diff --git a/src/test/java/io/ebean/dbmigration/ddl/DdlParserTest.java b/src/test/java/io/ebean/migration/ddl/DdlParserTest.java similarity index 98% rename from src/test/java/io/ebean/dbmigration/ddl/DdlParserTest.java rename to src/test/java/io/ebean/migration/ddl/DdlParserTest.java index 417632e..6b7d4de 100644 --- a/src/test/java/io/ebean/dbmigration/ddl/DdlParserTest.java +++ b/src/test/java/io/ebean/migration/ddl/DdlParserTest.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.ddl; +package io.ebean.migration.ddl; import java.io.StringReader; import java.util.List; diff --git a/src/test/java/io/ebean/dbmigration/runner/ChecksumTest.java b/src/test/java/io/ebean/migration/runner/ChecksumTest.java similarity index 91% rename from src/test/java/io/ebean/dbmigration/runner/ChecksumTest.java rename to src/test/java/io/ebean/migration/runner/ChecksumTest.java index 74ae409..68821aa 100644 --- a/src/test/java/io/ebean/dbmigration/runner/ChecksumTest.java +++ b/src/test/java/io/ebean/migration/runner/ChecksumTest.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; import org.testng.annotations.Test; diff --git a/src/test/java/io/ebean/dbmigration/runner/MigrationMetaRowTest.java b/src/test/java/io/ebean/migration/runner/MigrationMetaRowTest.java similarity index 95% rename from src/test/java/io/ebean/dbmigration/runner/MigrationMetaRowTest.java rename to src/test/java/io/ebean/migration/runner/MigrationMetaRowTest.java index 0551632..761b30d 100644 --- a/src/test/java/io/ebean/dbmigration/runner/MigrationMetaRowTest.java +++ b/src/test/java/io/ebean/migration/runner/MigrationMetaRowTest.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; import org.testng.annotations.Test; diff --git a/src/test/java/io/ebean/dbmigration/runner/MigrationSchemaTest.java b/src/test/java/io/ebean/migration/runner/MigrationSchemaTest.java similarity index 92% rename from src/test/java/io/ebean/dbmigration/runner/MigrationSchemaTest.java rename to src/test/java/io/ebean/migration/runner/MigrationSchemaTest.java index 116d79c..7dfaf36 100644 --- a/src/test/java/io/ebean/dbmigration/runner/MigrationSchemaTest.java +++ b/src/test/java/io/ebean/migration/runner/MigrationSchemaTest.java @@ -1,6 +1,6 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; -import io.ebean.dbmigration.MigrationConfig; +import io.ebean.migration.MigrationConfig; import org.testng.annotations.Test; import java.sql.Connection; diff --git a/src/test/java/io/ebean/dbmigration/runner/MigrationTableTest.java b/src/test/java/io/ebean/migration/runner/MigrationTableTest.java similarity index 95% rename from src/test/java/io/ebean/dbmigration/runner/MigrationTableTest.java rename to src/test/java/io/ebean/migration/runner/MigrationTableTest.java index 8d7ad52..c58015f 100644 --- a/src/test/java/io/ebean/dbmigration/runner/MigrationTableTest.java +++ b/src/test/java/io/ebean/migration/runner/MigrationTableTest.java @@ -1,7 +1,7 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; -import io.ebean.dbmigration.MigrationConfig; -import io.ebean.dbmigration.MigrationVersion; +import io.ebean.migration.MigrationConfig; +import io.ebean.migration.MigrationVersion; import org.testng.annotations.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/src/test/java/io/ebean/dbmigration/runner/PlaceholderBuilderTest.java b/src/test/java/io/ebean/migration/runner/PlaceholderBuilderTest.java similarity index 98% rename from src/test/java/io/ebean/dbmigration/runner/PlaceholderBuilderTest.java rename to src/test/java/io/ebean/migration/runner/PlaceholderBuilderTest.java index e2f1e0f..ef8e847 100644 --- a/src/test/java/io/ebean/dbmigration/runner/PlaceholderBuilderTest.java +++ b/src/test/java/io/ebean/migration/runner/PlaceholderBuilderTest.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; import org.assertj.core.data.MapEntry; import org.testng.annotations.Test; diff --git a/src/test/java/io/ebean/dbmigration/runner/ScriptTransformTest.java b/src/test/java/io/ebean/migration/runner/ScriptTransformTest.java similarity index 96% rename from src/test/java/io/ebean/dbmigration/runner/ScriptTransformTest.java rename to src/test/java/io/ebean/migration/runner/ScriptTransformTest.java index 4e36c7f..138a25f 100644 --- a/src/test/java/io/ebean/dbmigration/runner/ScriptTransformTest.java +++ b/src/test/java/io/ebean/migration/runner/ScriptTransformTest.java @@ -1,4 +1,4 @@ -package io.ebean.dbmigration.runner; +package io.ebean.migration.runner; import org.testng.annotations.Test;