From e65d9bdfe6f843478007034ea624a8030cfe0460 Mon Sep 17 00:00:00 2001
From: Roland Praml <roland.praml@foconis.de>
Date: Tue, 12 Apr 2022 09:34:18 +0200
Subject: [PATCH] Fix Eclipse tests

---
 ebean-ddl-generator/src/main/java/module-info.java     | 10 +++++++++-
 ebean-test/src/main/java/module-info.java              |  4 ++--
 .../xtest/base}/ServerStartTest.java                   |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
 rename ebean-test/src/test/java/io/{ebeaninternal/dbmigration => ebean/xtest/base}/ServerStartTest.java (88%)

diff --git a/ebean-ddl-generator/src/main/java/module-info.java b/ebean-ddl-generator/src/main/java/module-info.java
index 5a7869793..e22d066a0 100644
--- a/ebean-ddl-generator/src/main/java/module-info.java
+++ b/ebean-ddl-generator/src/main/java/module-info.java
@@ -1,8 +1,15 @@
 module io.ebean.ddl.generator {
 
+
+  uses io.ebean.dbmigration.DbMigration;
+  uses io.ebean.plugin.Plugin;
+  uses io.ebean.config.dbplatform.DatabasePlatformProvider;
+  
+  
   exports io.ebean.dbmigration;
 
   provides io.ebean.plugin.Plugin with io.ebeaninternal.dbmigration.DbMigrationPlugin,io.ebeaninternal.dbmigration.DdlPlugin;
+  provides io.ebean.dbmigration.DbMigration with io.ebeaninternal.dbmigration.DefaultDbMigration;
 
   requires transitive io.ebean.ddl.runner;
   requires transitive io.ebean.core;
@@ -10,8 +17,9 @@ module io.ebean.ddl.generator {
   requires io.ebean.core.type;
   requires io.ebean.migration;
 
-  uses io.ebean.dbmigration.DbMigration;
 
   // support existing tests
   exports io.ebeaninternal.extraddl.model to io.ebean.test;
+  opens io.ebeaninternal.extraddl.model to java.xml.bind;
+  opens io.ebeaninternal.dbmigration.migration to java.xml.bind;
 }
diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java
index 10ed1c0a4..dbaa250cf 100644
--- a/ebean-test/src/main/java/module-info.java
+++ b/ebean-test/src/main/java/module-info.java
@@ -1,5 +1,5 @@
-
-module io.ebean.test {
+// module must be open, so tests will pass
+open module io.ebean.test {
 
   exports io.ebean.test;
   exports io.ebean.test.config;
diff --git a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/ServerStartTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/ServerStartTest.java
similarity index 88%
rename from ebean-test/src/test/java/io/ebeaninternal/dbmigration/ServerStartTest.java
rename to ebean-test/src/test/java/io/ebean/xtest/base/ServerStartTest.java
index 39da070e7..b0dfe787b 100644
--- a/ebean-test/src/test/java/io/ebeaninternal/dbmigration/ServerStartTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/ServerStartTest.java
@@ -1,4 +1,4 @@
-package io.ebeaninternal.dbmigration;
+package io.ebean.xtest.base;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;