diff --git a/pom.xml b/pom.xml index 9d57b6e2d..b47f20c13 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ org.antlr antlr4-runtime - 4.5.3 + 4.6 @@ -112,21 +112,21 @@ javax.validation validation-api - 1.0.0.GA + 1.1.0.Final provided javax.servlet - servlet-api - 2.4 + javax.servlet-api + 3.1.0 provided joda-time joda-time - 1.6 + 2.9.7 provided @@ -134,7 +134,7 @@ org.postgresql postgresql - 9.4-1202-jdbc41 + 9.4.1212.jre7 provided @@ -157,7 +157,7 @@ org.avaje avaje-agentloader - 2.1.1 + 2.1.2 test @@ -173,28 +173,28 @@ com.h2database h2 - 1.4.192 + 1.4.193 provided org.xerial sqlite-jdbc - 3.8.11.2 + 3.15.1 test org.hsqldb hsqldb - 2.0.0 + 2.3.4 test mysql mysql-connector-java - 5.1.36 + 6.0.5 test @@ -209,14 +209,14 @@ commons-io commons-io - 2.4 + 2.5 test org.avaje.moduuid avaje-moduuid - 1.2 + 2.1 test diff --git a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java index 20b59882d..a3ca1e1a7 100644 --- a/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java +++ b/src/main/java/io/ebean/config/dbplatform/sqlserver/SqlServerPlatform.java @@ -8,6 +8,8 @@ import io.ebean.config.dbplatform.DbType; import io.ebean.config.dbplatform.IdType; import io.ebean.dbmigration.ddlgeneration.platform.SqlServerDdl; +import java.sql.Types; + /** * Microsoft SQL Server platform. */ @@ -32,6 +34,7 @@ public class SqlServerPlatform extends DatabasePlatform { this.openQuote = "["; this.closeQuote = "]"; + booleanDbType = Types.INTEGER; dbTypeMap.put(DbType.BOOLEAN, new DbPlatformType("bit default 0")); dbTypeMap.put(DbType.INTEGER, new DbPlatformType("integer", false)); diff --git a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java index 2aa8cbf29..67071d3cd 100644 --- a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java +++ b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java @@ -22,7 +22,7 @@ public class MigrationXmlWriter { } /** - * Write a Migration to a file as an xml document to the file. + * Write a Migration as a standalone XML document to a file. */ public void write(Migration migration, File file) { @@ -30,6 +30,7 @@ public class MigrationXmlWriter { FileWriter writer = new FileWriter(file); writer.write("\n"); + writer.write("\n"); if (comment != null) { writer.write("