From 7dca282eb63457e1821767e3fe96c789c73023f6 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 31 Mar 2022 14:04:54 +1300 Subject: [PATCH] Bump to 13.0.0-SNAPSHOT --- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 6 ++-- ebean-bom/pom.xml | 30 +++++++++---------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 14 ++++----- ebean-core/src/main/java/module-info.java | 26 ++++++++-------- ebean-ddl-generator/pom.xml | 8 ++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++---- .../src/main/java/module-info.java | 1 + ebean-kotlin/pom.xml | 6 ++-- ebean-postgis/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++---- ebean-redis/pom.xml | 14 ++++----- ebean-test/pom.xml | 10 +++---- kotlin-querybean-generator/pom.xml | 8 ++--- platforms/all/pom.xml | 10 +++---- platforms/db2/pom.xml | 4 +-- platforms/h2/pom.xml | 4 +-- platforms/hana/pom.xml | 4 +-- platforms/hsqldb/pom.xml | 4 +-- platforms/nuodb/pom.xml | 4 +-- platforms/pom.xml | 2 +- pom.xml | 2 +- querybean-generator/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 4 +-- 28 files changed, 105 insertions(+), 102 deletions(-) diff --git a/composites/pom.xml b/composites/pom.xml index ee53a6196..d500f07eb 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -6,7 +6,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index b3758c4f2..16167a226 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 9bff33b73..915d471dc 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided @@ -55,7 +55,7 @@ io.ebean ebean-platform-h2 - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 4aa6e1a1d..cf793ad42 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-core-type - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-ddl-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-externalmapping-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-autotune - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-querybean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean querybean-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided io.ebean ebean-test - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean ebean-postgis - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-redis - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 5521a5f6c..adf32ed66 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index c771a285e..1ddd1d64e 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean-core @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-core-type - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-externalmapping-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT @@ -144,21 +144,21 @@ io.ebean ebean-platform-h2 - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean ebean-platform-postgres - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean ebean-platform-sqlserver - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java index e26bc2ff2..1a502b0d3 100644 --- a/ebean-core/src/main/java/module-info.java +++ b/ebean-core/src/main/java/module-info.java @@ -43,33 +43,35 @@ 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.ebeanservice.docstore.api; + exports io.ebeanservice.docstore.api.support to io.ebean.elastic, io.ebean.test; + exports io.ebeanservice.docstore.api.mapping to io.ebean.elastic; + + exports io.ebeaninternal.api to io.ebean.ddl.generator, io.ebean.querybean, io.ebean.autotune, io.ebean.postgis, io.ebean.test, io.ebean.elastic, io.ebean.spring.txn; 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.core to io.ebean.test; + exports io.ebeaninternal.server.core to io.ebean.test, io.ebean.elastic; 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.cluster to io.ebean.test, io.ebean.k8scache; + exports io.ebeaninternal.server.deploy to io.ebean.autotune, io.ebean.ddl.generator, io.ebean.test, io.ebean.elastic; 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.meta to io.ebean.ddl.generator, io.ebean.test, io.ebean.elastic; 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 to io.ebean.querybean, io.ebean.test, io.ebean.elastic; 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.persist to io.ebean.test, io.ebean.elastic; 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.querydefn to io.ebean.autotune, io.ebean.querybean, io.ebean.test, io.ebean.elastic; exports io.ebeaninternal.server.rawsql to io.ebean.test; - exports io.ebeaninternal.server.text.json to io.ebean.test; + exports io.ebeaninternal.server.text.json to io.ebean.test, io.ebean.elastic; 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.transaction to io.ebean.test, io.ebean.elastic, io.ebean.spring.txn, io.ebean.k8scache; exports io.ebeaninternal.server.util 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; diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index ec12d41e0..b2c4e52b0 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided @@ -58,7 +58,7 @@ io.ebean ebean-platform-all - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index ada1d53da..5fb842bc6 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 92e750655..59bd74e38 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT @@ -28,7 +28,7 @@ io.ebean ebean-externalmapping-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT @@ -61,21 +61,21 @@ io.ebean ebean-platform-h2 - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean ebean-ddl-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/ebean-externalmapping-xml/src/main/java/module-info.java b/ebean-externalmapping-xml/src/main/java/module-info.java index 420f85c53..de792b2df 100644 --- a/ebean-externalmapping-xml/src/main/java/module-info.java +++ b/ebean-externalmapping-xml/src/main/java/module-info.java @@ -14,6 +14,7 @@ module io.ebean.xmapping.xml { requires transitive java.xml.bind; requires io.avaje.classpath.scanner.api; requires io.avaje.classpath.scanner; + requires static org.slf4j; requires static java.sql; // for testing uses ClassPathScannerFactory; diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 85020f0da..46d72e5ab 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 35fe194a1..f796c5be5 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided @@ -73,7 +73,7 @@ io.ebean ebean-test - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index e587b3d27..660a5fc28 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean querybean-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean ebean-test - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index ab804b8ca..9f1345585 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean-redis @@ -16,41 +16,41 @@ redis.clients jedis - 4.1.1 + 4.2.0 io.ebean ebean-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided io.ebean ebean-querybean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean querybean-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test io.ebean ebean-test - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index f3c178a13..9d9740b30 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean test @@ -29,20 +29,20 @@ io.ebean ebean-platform-h2 - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT @@ -106,7 +106,7 @@ io.ebean ebean-platform-all - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index c1a8c1c14..9b5988df2 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 3bc41a5b0..e6983eef2 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -6,7 +6,7 @@ platforms io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean-platform-all @@ -16,22 +16,22 @@ io.ebean ebean-platform-h2 - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-platform-clickhouse - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-platform-db2 - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean ebean-platform-hana - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT io.ebean diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 8f3d13268..7fb53994b 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -6,7 +6,7 @@ platforms io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean-platform-db2 @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index a3817f6a9..32c882548 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -6,7 +6,7 @@ platforms io.ebean - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT ebean-platform-h2 @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.16.2-SNAPSHOT + 13.0.0-SNAPSHOT