#32 - Repackage from io.ebean.dbmigration to io.ebean.migration (in p…

…reparation for java 9 modules)

pom.xml

@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>io.ebean</groupId>
-  <artifactId>ebean-dbmigration</artifactId>
-  <version>10.1.12-SNAPSHOT</version>
+  <artifactId>ebean-migration</artifactId>
+  <version>10.2.1-SNAPSHOT</version>
 
   <parent>
     <groupId>org.avaje</groupId>
@@ -74,4 +74,19 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.5</version>
+        <configuration>
+          <archive>
+            <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

src/main/java/io/ebean/dbmigration/DbNameUtil.java → 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;

src/main/java/io/ebean/dbmigration/DbPlatformNames.java → src/main/java/io/ebean/migration/DbPlatformNames.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration;
+package io.ebean.migration;
 
 /**
  * Known database platform names.

src/main/java/io/ebean/dbmigration/MigrationConfig.java → 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;

src/main/java/io/ebean/dbmigration/MigrationException.java → 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 {
 

src/main/java/io/ebean/dbmigration/MigrationRunner.java → 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;
 

src/main/java/io/ebean/dbmigration/MigrationVersion.java → src/main/java/io/ebean/migration/MigrationVersion.java

@@ -1,4 +1,4 @@
-package io.ebean.dbmigration;
+package io.ebean.migration;
 
 import java.util.Arrays;
 

src/main/java/io/ebean/dbmigration/ddl/DdlParser.java → 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;

src/main/java/io/ebean/dbmigration/ddl/DdlRunner.java → 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;

src/main/java/io/ebean/dbmigration/ddl/DdlRunnerException.java → 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 {
 

src/main/java/io/ebean/dbmigration/runner/Checksum.java → 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;

src/main/java/io/ebean/dbmigration/runner/LocalMigrationResource.java → 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;
 
 /**

src/main/java/io/ebean/dbmigration/runner/LocalMigrationResources.java → 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;

src/main/java/io/ebean/dbmigration/runner/MigrationMetaRow.java → 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;

src/main/java/io/ebean/dbmigration/runner/MigrationSchema.java → 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;
 

src/main/java/io/ebean/dbmigration/runner/MigrationScriptRunner.java → 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;

src/main/java/io/ebean/dbmigration/runner/MigrationTable.java → 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;
 

src/main/java/io/ebean/dbmigration/runner/PlaceholderBuilder.java → 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;

src/main/java/io/ebean/dbmigration/runner/ScriptTransform.java → 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;

src/main/java/io/ebean/dbmigration/util/IOUtils.java → 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;

src/main/java/io/ebean/dbmigration/util/JdbcClose.java → 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;

src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Automatic-Module-Name: io.ebean.migration

src/test/java/io/ebean/dbmigration/MigrationConfigTest.java → 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;
 

src/test/java/io/ebean/dbmigration/MigrationRunnerTest.java → 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;

src/test/java/io/ebean/dbmigration/MigrationRunner_platform_Test.java → 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;
 

src/test/java/io/ebean/dbmigration/MigrationVersionTest.java → 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;
 

src/test/java/io/ebean/dbmigration/ddl/DdlParserTest.java → 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;

src/test/java/io/ebean/dbmigration/runner/ChecksumTest.java → 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;
 

src/test/java/io/ebean/dbmigration/runner/MigrationMetaRowTest.java → 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;
 

src/test/java/io/ebean/dbmigration/runner/MigrationSchemaTest.java → 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;

src/test/java/io/ebean/dbmigration/runner/MigrationTableTest.java → 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;

src/test/java/io/ebean/dbmigration/runner/PlaceholderBuilderTest.java → 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;

src/test/java/io/ebean/dbmigration/runner/ScriptTransformTest.java → 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;