From a6f9120905825476d7f1c99071f175a5b46ad614 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Thu, 1 Nov 2018 13:31:08 +1300 Subject: [PATCH] #1525 - Check for presence of JAXB in classpath in CurrentModel (to support Java 11 without xml) --- .../io/ebeaninternal/dbmigration/model/CurrentModel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java index 1b83beb4c..b3f783a0b 100644 --- a/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java +++ b/src/main/java/io/ebeaninternal/dbmigration/model/CurrentModel.java @@ -29,6 +29,8 @@ public class CurrentModel { private final boolean platformTypes; + private final boolean jaxbPresent; + private ModelContainer model; private ChangeSet changeSet; @@ -58,6 +60,7 @@ public class CurrentModel { this.constraintNaming = constraintNaming; this.maxLength = maxLength(server, constraintNaming); this.platformTypes = platformTypes; + this.jaxbPresent = server.getServerConfig().getClassLoadConfig().isJavaxJAXBPresent(); } /** @@ -130,7 +133,9 @@ public class CurrentModel { ddl.append(header).append('\n'); } - addExtraDdl(ddl, ExtraDdlXmlReader.readBuiltin(), "-- init script "); + if (jaxbPresent) { + addExtraDdl(ddl, ExtraDdlXmlReader.readBuiltin(), "-- init script "); + } ddl.append(write.apply().getBuffer()); ddl.append(write.applyForeignKeys().getBuffer());