github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

#2374 - Bump to Java 11 and module-path

Browse Source
This commit is contained in:
Rob Bygrave
2022-03-31 08:42:14 +13:00
parent 79be375f54
commit 24d8f38b1d
71 changed files with 149 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
composites/ebean-clickhouse/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-clickhouse/src/main/java9/module-info.java → composites/ebean-clickhouse/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.clickhouse {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.clickhouse;
composites/ebean-cockroach/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-cockroach/src/main/java9/module-info.java → composites/ebean-cockroach/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.cockroach {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.postgres;
composites/ebean-db2/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-db2/src/main/java9/module-info.java → composites/ebean-db2/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.db2 {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.db2;
composites/ebean-h2/pom.xml
+2 -16
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>composites</artifactId>
@@ -46,19 +47,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-h2/src/main/java9/module-info.java → composites/ebean-h2/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.h2 {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.h2;
composites/ebean-hana/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-hana/src/main/java9/module-info.java → composites/ebean-hana/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.hana {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.hana;
composites/ebean-mariadb/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-mariadb/src/main/java9/module-info.java → composites/ebean-mariadb/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.mariadb {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.mariadb;
composites/ebean-mysql/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-mysql/src/main/java9/module-info.java → composites/ebean-mysql/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.mysql {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.mysql;
composites/ebean-nuodb/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-nuodb/src/main/java9/module-info.java → composites/ebean-nuodb/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.nuodb {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.nuodb;
composites/ebean-oracle/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-oracle/src/main/java9/module-info.java → composites/ebean-oracle/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.oracle {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.oracle;
composites/ebean-postgres/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-postgres/src/main/java9/module-info.java → composites/ebean-postgres/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.postgres {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.postgres;
composites/ebean-sqlite/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-sqlite/src/main/java9/module-info.java → composites/ebean-sqlite/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.sqlite {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.sqlite;
composites/ebean-sqlserver/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-sqlserver/src/main/java9/module-info.java → composites/ebean-sqlserver/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.sqlserver {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.sqlserver;
composites/ebean-yugabyte/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean-yugabyte/src/main/java9/module-info.java → composites/ebean-yugabyte/src/main/java/module-info.java
+1
View File
@@ -2,6 +2,7 @@ module io.ebean.yugabyte {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.postgres;
composites/ebean/pom.xml
-15
View File
@@ -46,19 +46,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
composites/ebean/src/main/java9/module-info.java → composites/ebean/src/main/java/module-info.java
+2 -1
View File
@@ -2,6 +2,7 @@ module io.ebean {
requires transitive io.ebean.api;
requires transitive io.ebean.core;
requires transitive io.ebean.datasource;
requires transitive io.ebean.querybean;
requires transitive io.ebean.platform.all;
}
ebean-api/pom.xml
-15
View File
@@ -103,19 +103,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
ebean-api/src/main/java9/module-info.java → ebean-api/src/main/java/module-info.java
-16
View File
@@ -20,7 +20,6 @@ module io.ebean.api {
requires static io.ebean.types;
requires static com.fasterxml.jackson.core;
requires static javax.servlet.api;
requires static com.h2database;
exports io.ebean;
exports io.ebean.bean;
@@ -28,21 +27,6 @@ module io.ebean.api {
exports io.ebean.meta;
exports io.ebean.config;
exports io.ebean.config.dbplatform;
exports io.ebean.config.dbplatform.clickhouse;
exports io.ebean.config.dbplatform.h2;
exports io.ebean.config.dbplatform.db2;
exports io.ebean.config.dbplatform.cockroach;
exports io.ebean.config.dbplatform.hana;
exports io.ebean.config.dbplatform.hsqldb;
exports io.ebean.config.dbplatform.mariadb;
exports io.ebean.config.dbplatform.mysql;
exports io.ebean.config.dbplatform.nuodb;
exports io.ebean.config.dbplatform.oracle;
exports io.ebean.config.dbplatform.postgres;
exports io.ebean.config.dbplatform.sqlanywhere;
exports io.ebean.config.dbplatform.sqlite;
exports io.ebean.config.dbplatform.sqlserver;
exports io.ebean.config.dbplatform.yugabyte;
exports io.ebean.event;
exports io.ebean.event.readaudit;
exports io.ebean.event.changelog;
ebean-autotune/pom.xml
-1
View File
@@ -71,7 +71,6 @@
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:12.15.0</tile>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
ebean-autotune/src/main/java9/module-info.java → ebean-autotune/src/main/java/module-info.java
View File
ebean-core-type/pom.xml
-15
View File
@@ -28,19 +28,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
ebean-core-type/src/main/java9/module-info.java → ebean-core-type/src/main/java/module-info.java
View File
ebean-core/pom.xml
-12
View File
@@ -248,18 +248,6 @@
</executions>
</plugin>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java
+13
View File
@@ -23,6 +23,7 @@ import io.ebeaninternal.server.executor.DefaultBackgroundExecutor;
import org.slf4j.Logger;
import javax.persistence.PersistenceException;
import java.net.URL;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@@ -136,9 +137,21 @@ public final class DefaultContainer implements SpiContainer {
}
if (config.isAutoLoadModuleInfo()) {
// auto register entity classes
boolean found = false;
for (ModuleInfoLoader loader : ServiceLoader.load(ModuleInfoLoader.class)) {
config.addAll(loader.classesFor(config.getName(), config.isDefaultServer()));
found = true;
}
if (!found) {
checkMissingModulePathProvides();
}
}
}
private void checkMissingModulePathProvides() {
URL servicesFile = ClassLoader.getSystemResource("META-INF/services/io.ebean.config.ModuleInfoLoader");
if (servicesFile != null) {
log.error("module-info.java is probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause. ModuleInfoLoader exists but was not service loaded.");
}
}
ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java
+23 -1
View File
@@ -562,7 +562,29 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy
@SuppressWarnings("unchecked")
public <T> BeanManager<T> beanManager(Class<T> entityType) {
return (BeanManager<T>) beanManager(entityType.getName());
BeanManager<T> mgr = (BeanManager<T>) beanManager(entityType.getName());
if (mgr == null) {
errorBeanNotRegistered(entityType);
}
return mgr;
}
private <T> void errorBeanNotRegistered(Class<T> entityType) {
if (beanManagerMap.isEmpty()) {
throw new PersistenceException(errNothingRegistered());
} else {
throw new PersistenceException(errNotRegistered(entityType));
}
}
private <T> String errNothingRegistered() {
return "There are no registered entities. If using query beans, that generates _Ebean$ModuleInfo.java into " +
"generated sources and is service loaded. If using module-info.java, then probably missing 'provides io.ebean.config.ModuleInfoLoader with _Ebean$ModuleInfo' clause.";
}
private String errNotRegistered(Class<?> beanClass) {
return "The type [" + beanClass + "] is not a registered entity?"
+ " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
}
private BeanManager<?> beanManager(String beanClassName) {
ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java
+1 -10
View File
@@ -1196,11 +1196,6 @@ public final class DefaultPersister implements Persister {
return request;
}
private String errNotRegistered(Class<?> beanClass) {
return "The type [" + beanClass + "] is not a registered entity?"
+ " If you don't explicitly list the entity classes to use Ebean will search for them in the classpath.";
}
/**
* Return the BeanDescriptor for a bean that is being persisted.
* <p>
@@ -1210,10 +1205,6 @@ public final class DefaultPersister implements Persister {
*/
@SuppressWarnings("unchecked")
private <T> BeanManager<T> beanManager(Class<?> cls) {
BeanManager<T> mgr = (BeanManager<T>) beanDescriptorManager.beanManager(cls);
if (mgr == null) {
throw new PersistenceException(errNotRegistered(cls));
}
return mgr;
return (BeanManager<T>) beanDescriptorManager.beanManager(cls);
}
}
ebean-core/src/main/java9/module-info.java → ebean-core/src/main/java/module-info.java
+26 -10
View File
@@ -6,6 +6,7 @@ module io.ebean.core {
uses io.ebean.config.DatabaseConfigProvider;
uses io.ebean.config.ServerConfigProvider;
uses io.ebean.config.ModuleInfoLoader;
uses io.ebean.config.dbplatform.DatabasePlatformProvider;
uses io.ebean.datasource.DataSourceAlertFactory;
uses io.ebean.core.type.ExtraTypeFactory;
uses io.ebeanservice.docstore.api.DocStoreFactory;
@@ -23,7 +24,7 @@ module io.ebean.core {
requires transitive io.ebean.xmapping.api;
requires transitive io.ebean.core.type;
requires transitive io.ebean.ddl.runner;
requires transitive org.antlr.antlr4.runtime;
requires org.antlr.antlr4.runtime;
requires io.avaje.classpath.scanner;
requires io.ebean.types;
requires org.slf4j;
@@ -41,17 +42,32 @@ module io.ebean.core {
exports io.ebeaninternal.server.cache;
exports io.ebeaninternal.api to io.ebean.ddl.generator, io.ebean.querybean, io.ebean.autotune, io.ebean.postgis, io.ebean.test;
exports io.ebeaninternal.server.deploy to io.ebean.autotune, io.ebean.ddl.generator;
exports io.ebeaninternal.server.deploy.id to io.ebean.ddl.generator;
exports io.ebeaninternal.server.deploy.meta to io.ebean.ddl.generator;
exports io.ebeaninternal.server.deploy.visitor to io.ebean.ddl.generator;
exports io.ebeaninternal.server.el to io.ebean.autotune;
exports io.ebeaninternal.api.json to io.ebean.test;
exports io.ebeaninternal.json to io.ebean.test;
exports io.ebeaninternal.server.autotune to io.ebean.autotune;
exports io.ebeaninternal.server.querydefn to io.ebean.autotune, io.ebean.querybean;
exports io.ebeaninternal.server.type to io.ebean.postgis;
exports io.ebeaninternal.server.core to io.ebean.test;
exports io.ebeaninternal.server.core.bootup to io.ebean.test;
exports io.ebeaninternal.server.core.timezone to io.ebean.test;
exports io.ebeaninternal.server.cluster to io.ebean.test;
exports io.ebeaninternal.server.deploy to io.ebean.autotune, io.ebean.ddl.generator, io.ebean.test;
exports io.ebeaninternal.server.deploy.id to io.ebean.ddl.generator;
exports io.ebeaninternal.server.deploy.meta to io.ebean.ddl.generator, io.ebean.test;
exports io.ebeaninternal.server.deploy.visitor to io.ebean.ddl.generator;
exports io.ebeaninternal.server.el to io.ebean.autotune, io.ebean.test;
exports io.ebeaninternal.server.expression to io.ebean.querybean, io.ebean.test;
exports io.ebeaninternal.server.expression.platform to io.ebean.test;
exports io.ebeaninternal.server.grammer to io.ebean.test;
exports io.ebeaninternal.server.idgen to io.ebean.test;
exports io.ebeaninternal.server.persist to io.ebean.test;
exports io.ebeaninternal.server.query to io.ebean.test;
exports io.ebeaninternal.server.querydefn to io.ebean.autotune, io.ebean.querybean, io.ebean.test;
exports io.ebeaninternal.server.rawsql to io.ebean.test;
exports io.ebeaninternal.server.text.json to io.ebean.test;
exports io.ebeaninternal.server.type to io.ebean.postgis, io.ebean.test;
exports io.ebeaninternal.server.transaction to io.ebean.test;
exports io.ebeaninternal.server.util to io.ebean.querybean;
exports io.ebeaninternal.server.expression to io.ebean.querybean;
exports io.ebeanservice.docstore.api to io.ebean.test;
exports io.ebeanservice.docstore.api.support to io.ebean.test;
provides io.ebean.metric.MetricFactory with io.ebeaninternal.server.profile.DMetricFactory;
provides io.ebean.service.SpiContainerFactory with io.ebeaninternal.server.DContainerFactory;
ebean-ddl-generator/pom.xml
-11
View File
@@ -97,17 +97,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
ebean-ddl-generator/src/main/java9/module-info.java → ebean-ddl-generator/src/main/java/module-info.java
+4 -1
View File
@@ -1,4 +1,4 @@
open module io.ebean.ddl.generator {
module io.ebean.ddl.generator {
exports io.ebean.dbmigration;
@@ -12,4 +12,7 @@ open module io.ebean.ddl.generator {
requires io.ebean.migration;
uses io.ebean.dbmigration.DbMigration;
// support existing tests
exports io.ebeaninternal.extraddl.model to io.ebean.test;
}
ebean-externalmapping-api/pom.xml
-16
View File
@@ -11,20 +11,4 @@
<description>API for mapping external named queries</description>
<artifactId>ebean-externalmapping-api</artifactId>
<build>
<plugins>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
</project>
ebean-externalmapping-api/src/main/java9/module-info.java → ebean-externalmapping-api/src/main/java/module-info.java
View File
ebean-externalmapping-xml/pom.xml
+7 -1
View File
@@ -37,6 +37,13 @@
<version>2.3.6</version>
</dependency>
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.avaje</groupId>
<artifactId>classpath-scanner</artifactId>
@@ -92,7 +99,6 @@
<tiles>
<!-- other tiles ... -->
<tile>io.ebean.tile:enhancement:12.15.0</tile>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
ebean-externalmapping-xml/src/main/java9/module-info.java → ebean-externalmapping-xml/src/main/java/module-info.java
+1
View File
@@ -13,6 +13,7 @@ module io.ebean.xmapping.xml {
requires transitive java.xml;
requires transitive java.xml.bind;
requires io.avaje.classpath.scanner;
requires static java.sql; // for testing
uses ClassPathScannerFactory;
ebean-postgis/pom.xml
-1
View File
@@ -105,7 +105,6 @@
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:12.15.0</tile>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
ebean-querybean/pom.xml
+7 -1
View File
@@ -21,6 +21,13 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jsr305-x</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<!--
Class retention Nonnull and Nullable annotations
to assist with IDE auto-completion with Ebean API
@@ -101,7 +108,6 @@
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:12.15.0</tile>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
ebean-querybean/src/main/java9/module-info.java → ebean-querybean/src/main/java/module-info.java
View File
ebean-redis/pom.xml
-1
View File
@@ -81,7 +81,6 @@
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:12.15.0</tile>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
ebean-redis/src/main/java9/module-info.java → ebean-redis/src/main/java/module-info.java
View File
ebean-test/pom.xml
+16 -14
View File
@@ -78,6 +78,14 @@
<version>2.3.6</version>
</dependency>
<!-- Needed for module path compile, jaxb foo bar needs review -->
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>1.2.1</version>
<scope>provided</scope>
</dependency>
<!-- Not strictly required but bring in H2 Driver because we use it so much -->
<dependency>
<groupId>com.h2database</groupId>
@@ -85,6 +93,14 @@
<version>${h2database.version}</version>
</dependency>
<!-- provided for module path compile for tests with @PostConstruct -->
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jsr305-x</artifactId>
<version>1.1</version>
<scope>provided</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
@@ -94,13 +110,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.avaje</groupId>
<artifactId>avaje-jsr305</artifactId>
<version>1.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-migration</artifactId>
@@ -144,12 +153,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -263,7 +266,6 @@
<configuration>
<tiles>
<tile>io.ebean.tile:enhancement:12.15.0</tile>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
ebean-test/src/main/java9/module-info.java → ebean-test/src/main/java/module-info.java
+4 -1
View File
@@ -1,5 +1,5 @@
open module io.ebean.test {
module io.ebean.test {
exports io.ebean.test;
exports io.ebean.test.config;
@@ -22,4 +22,7 @@ open module io.ebean.test {
requires transitive java.xml.bind;
requires transitive com.h2database;
// support testing
requires static jdk.management;
requires static io.avaje.jsr305x;
}
ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationTest.java
+5 -5
View File
@@ -4,7 +4,7 @@ import io.ebean.*;
import io.ebean.annotation.Platform;
import io.ebean.config.DatabaseConfig;
import io.ebean.config.dbplatform.DbHistorySupport;
import io.ebean.datasource.pool.ConnectionPool;
import io.ebean.datasource.DataSourcePool;
import io.ebean.xtest.BaseTestCase;
import io.ebean.xtest.IgnorePlatform;
import misc.migration.v1_0.ETable;
@@ -51,8 +51,8 @@ public class DbMigrationTest extends BaseTestCase {
@Test
public void testRunMigration() throws IOException, SQLException {
// Shutdown and reconnect - this prevents postgres from lock up
((ConnectionPool)server().dataSource()).offline();
((ConnectionPool)server().dataSource()).online();
((DataSourcePool)server().dataSource()).offline();
((DataSourcePool)server().dataSource()).online();
cleanup("migtest_ckey_assoc",
"migtest_ckey_detail",
"migtest_ckey_parent",
@@ -86,8 +86,8 @@ public class DbMigrationTest extends BaseTestCase {
"table",
"\"table\"",
"`table`");
((ConnectionPool)server().dataSource()).offline();
((ConnectionPool)server().dataSource()).online();
((DataSourcePool)server().dataSource()).offline();
((DataSourcePool)server().dataSource()).online();
if (isSqlServer() || isMariaDB() || isMySql() || isHana()) {
runScript("I__create_procs.sql");
platforms/all/src/main/java/module-info.java
+17
View File
@@ -0,0 +1,17 @@
module io.ebean.platform.all {
requires transitive io.ebean.platform.h2;
requires transitive io.ebean.platform.clickhouse;
requires transitive io.ebean.platform.db2;
requires transitive io.ebean.platform.hana;
requires transitive io.ebean.platform.hsqldb;
requires transitive io.ebean.platform.mysql;
requires transitive io.ebean.platform.mariadb;
requires transitive io.ebean.platform.nuodb;
requires transitive io.ebean.platform.oracle;
requires transitive io.ebean.platform.postgres;
requires transitive io.ebean.platform.sqlanywhere;
requires transitive io.ebean.platform.sqlite;
requires transitive io.ebean.platform.sqlserver;
}
platforms/all/src/main/java9/module-info.java
-7
View File
@@ -1,7 +0,0 @@
module io.ebean.platform.all {
requires transitive io.ebean.platform.h2;
requires transitive io.ebean.platform.postgres;
//TODO complete the list of platforms here ...
}
platforms/clickhouse/src/main/java9/module-info.java → platforms/clickhouse/src/main/java/module-info.java
View File
platforms/db2/src/main/java9/module-info.java → platforms/db2/src/main/java/module-info.java
View File
platforms/h2/src/main/java9/module-info.java → platforms/h2/src/main/java/module-info.java
+1
View File
@@ -3,6 +3,7 @@ module io.ebean.platform.h2 {
exports io.ebean.platform.h2;
requires transitive io.ebean.api;
requires static com.h2database;
provides io.ebean.config.dbplatform.DatabasePlatformProvider with io.ebean.platform.h2.H2PlatformProvider;
}
platforms/hana/src/main/java9/module-info.java → platforms/hana/src/main/java/module-info.java
View File
platforms/hsqldb/src/main/java9/module-info.java → platforms/hsqldb/src/main/java/module-info.java
+1
View File
@@ -3,6 +3,7 @@ module io.ebean.platform.hsqldb {
exports io.ebean.platform.hsqldb;
requires transitive io.ebean.api;
requires transitive io.ebean.platform.h2;
provides io.ebean.config.dbplatform.DatabasePlatformProvider with io.ebean.platform.hsqldb.HSqlDbPlatformProvider;
}
platforms/mariadb/src/main/java9/module-info.java → platforms/mariadb/src/main/java/module-info.java
+1
View File
@@ -3,6 +3,7 @@ module io.ebean.platform.mariadb {
exports io.ebean.platform.mariadb;
requires transitive io.ebean.api;
requires transitive io.ebean.platform.mysql;
provides io.ebean.config.dbplatform.DatabasePlatformProvider with io.ebean.platform.mariadb.MariaDbPlatformProvider;
}
platforms/mysql/src/main/java9/module-info.java → platforms/mysql/src/main/java/module-info.java
+1 -1
View File
@@ -4,5 +4,5 @@ module io.ebean.platform.mysql {
requires transitive io.ebean.api;
provides io.ebean.config.dbplatform.DatabasePlatformProvider with io.ebean.platform.mysql.MysqlPlatformProvider;
provides io.ebean.config.dbplatform.DatabasePlatformProvider with io.ebean.platform.mysql.MySqlPlatformProvider;
}
platforms/nuodb/src/main/java9/module-info.java → platforms/nuodb/src/main/java/module-info.java
View File
platforms/oracle/src/main/java9/module-info.java → platforms/oracle/src/main/java/module-info.java
View File
platforms/postgres/src/main/java9/module-info.java → platforms/postgres/src/main/java/module-info.java
View File
platforms/sqlanywhere/src/main/java9/module-info.java → platforms/sqlanywhere/src/main/java/module-info.java
View File
platforms/sqlite/src/main/java9/module-info.java → platforms/sqlite/src/main/java/module-info.java
View File
platforms/sqlserver/src/main/java9/module-info.java → platforms/sqlserver/src/main/java/module-info.java
View File
pom.xml
+2 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.avaje</groupId>
<artifactId>java8-oss</artifactId>
<artifactId>java11-oss</artifactId>
<version>3.6</version>
</parent>
@@ -48,6 +48,7 @@
<ebean-datasource.version>7.5</ebean-datasource.version>
<ebean-agent.version>12.16.1</ebean-agent.version>
<ebean-maven-plugin.version>12.16.1</ebean-maven-plugin.version>
<surefire.useModulePath>false</surefire.useModulePath>
</properties>
<dependencies>
querybean-generator/pom.xml
+2 -13
View File
@@ -29,23 +29,12 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>11</source>
<target>11</target>
<!-- Turn off annotation processing for building -->
<compilerArgument>-proc:none</compilerArgument>
</configuration>
</plugin>
<plugin>
<groupId>io.repaint.maven</groupId>
<artifactId>tiles-maven-plugin</artifactId>
<version>2.24</version>
<extensions>true</extensions>
<configuration>
<tiles>
<tile>io.avaje.tile:moditech-module:1.0</tile>
</tiles>
</configuration>
</plugin>
</plugins>
</build>
querybean-generator/src/main/java9/module-info.java → querybean-generator/src/main/java/module-info.java
View File