From c9a04e698399f4c0d6fa5999aa7ffdc423d33cef Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 16:31:55 +1200 Subject: [PATCH 01/41] #2627 - ebean-agent - bump to ASM 9.3, support Java 19 bytecode --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e10b5351d..1827e931f 100644 --- a/pom.xml +++ b/pom.xml @@ -46,8 +46,8 @@ 13.0.0 4.5 7.5 - 13.0.0 - 13.0.0 + 13.0.1-RC2 + 13.0.1-RC2 false From 36c3319a24de19dd4cb2ba8846cad25ef697c333 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 17:24:11 +1200 Subject: [PATCH 02/41] Tidy API making some classes final --- ebean-api/src/main/java/io/ebean/DatabaseFactory.java | 2 +- ebean-api/src/main/java/io/ebean/DbPrimary.java | 2 +- ebean-api/src/main/java/io/ebean/EbeanVersion.java | 2 +- ebean-api/src/main/java/io/ebean/Expr.java | 2 +- ebean-api/src/main/java/io/ebean/FetchConfig.java | 2 +- ebean-api/src/main/java/io/ebean/XServiceProvider.java | 2 +- .../src/main/java/io/ebean/meta/ServerMetricsAsJson.java | 7 ++++--- ebean-api/src/main/java/io/ebean/meta/SortMetric.java | 2 +- .../main/java/io/ebean/metric/MetricServiceProvider.java | 2 +- ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java | 2 +- ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java | 2 +- ebean-api/src/main/java/io/ebean/util/IOUtils.java | 2 +- ebean-api/src/main/java/io/ebean/util/JdbcClose.java | 2 +- ebean-api/src/main/java/io/ebean/util/SplitName.java | 2 +- ebean-api/src/main/java/io/ebean/util/StringHelper.java | 2 +- 15 files changed, 18 insertions(+), 17 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java index 588f48c24..9696954f7 100644 --- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java +++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java @@ -26,7 +26,7 @@ import java.util.concurrent.locks.ReentrantLock; * methods on the DB singleton such as {@link DB#find(Class)} are just a * convenient way of using the 'default/primary' Database. */ -public class DatabaseFactory { +public final class DatabaseFactory { private static final ReentrantLock lock = new ReentrantLock(); private static SpiContainer container; diff --git a/ebean-api/src/main/java/io/ebean/DbPrimary.java b/ebean-api/src/main/java/io/ebean/DbPrimary.java index ffec8b114..156038f8e 100644 --- a/ebean-api/src/main/java/io/ebean/DbPrimary.java +++ b/ebean-api/src/main/java/io/ebean/DbPrimary.java @@ -10,7 +10,7 @@ import java.util.concurrent.locks.ReentrantLock; *

* Intended for internal use as part of bootup, construction, registration of the default database. */ -class DbPrimary { +final class DbPrimary { private static final ReentrantLock lock = new ReentrantLock(); private static String defaultServerName; diff --git a/ebean-api/src/main/java/io/ebean/EbeanVersion.java b/ebean-api/src/main/java/io/ebean/EbeanVersion.java index 6a764d911..c4e63efff 100644 --- a/ebean-api/src/main/java/io/ebean/EbeanVersion.java +++ b/ebean-api/src/main/java/io/ebean/EbeanVersion.java @@ -12,7 +12,7 @@ import java.util.Properties; * * @author Roland Praml, FOCONIS AG */ -public class EbeanVersion { +public final class EbeanVersion { private static final Logger log = LoggerFactory.getLogger("io.ebean"); diff --git a/ebean-api/src/main/java/io/ebean/Expr.java b/ebean-api/src/main/java/io/ebean/Expr.java index 1316f9873..525bc3272 100644 --- a/ebean-api/src/main/java/io/ebean/Expr.java +++ b/ebean-api/src/main/java/io/ebean/Expr.java @@ -25,7 +25,7 @@ import java.util.Map; * * @see Query#where() */ -public class Expr { +public final class Expr { private Expr() { } diff --git a/ebean-api/src/main/java/io/ebean/FetchConfig.java b/ebean-api/src/main/java/io/ebean/FetchConfig.java index e2d4fbe35..cfb14a235 100644 --- a/ebean-api/src/main/java/io/ebean/FetchConfig.java +++ b/ebean-api/src/main/java/io/ebean/FetchConfig.java @@ -31,7 +31,7 @@ import java.io.Serializable; * @author mario * @author rbygrave */ -public class FetchConfig implements Serializable { +public final class FetchConfig implements Serializable { private static final long serialVersionUID = 1L; diff --git a/ebean-api/src/main/java/io/ebean/XServiceProvider.java b/ebean-api/src/main/java/io/ebean/XServiceProvider.java index 7f7ce9cc6..9d362571c 100644 --- a/ebean-api/src/main/java/io/ebean/XServiceProvider.java +++ b/ebean-api/src/main/java/io/ebean/XServiceProvider.java @@ -11,7 +11,7 @@ import java.util.ServiceLoader; /** * Lookup internal services. */ -class XServiceProvider { +final class XServiceProvider { private static SpiRawSqlService rawSqlService = initRawSql(); diff --git a/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java b/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java index 7e42302c8..b2d43f470 100644 --- a/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java +++ b/ebean-api/src/main/java/io/ebean/meta/ServerMetricsAsJson.java @@ -19,6 +19,7 @@ public interface ServerMetricsAsJson { /** * Set the sort property - see SortMetric + * * @see SortMetric */ ServerMetricsAsJson withSort(Comparator sortBy); @@ -35,9 +36,9 @@ public interface ServerMetricsAsJson { */ ServerMetricsAsJson withHeader(boolean withHeader); - /** - * Collect and write metrics as JSON to the given buffer. - */ + /** + * Collect and write metrics as JSON to the given buffer. + */ void write(Appendable buffer); /** diff --git a/ebean-api/src/main/java/io/ebean/meta/SortMetric.java b/ebean-api/src/main/java/io/ebean/meta/SortMetric.java index 30104f1ff..5a20ee7c9 100644 --- a/ebean-api/src/main/java/io/ebean/meta/SortMetric.java +++ b/ebean-api/src/main/java/io/ebean/meta/SortMetric.java @@ -5,7 +5,7 @@ import java.util.Comparator; /** * Comparator for timed metrics sorted by name and then count. */ -public class SortMetric { +public final class SortMetric { public static final Comparator COUNT_NAME = new CountName(); diff --git a/ebean-api/src/main/java/io/ebean/metric/MetricServiceProvider.java b/ebean-api/src/main/java/io/ebean/metric/MetricServiceProvider.java index 89603ee56..25ab9716e 100644 --- a/ebean-api/src/main/java/io/ebean/metric/MetricServiceProvider.java +++ b/ebean-api/src/main/java/io/ebean/metric/MetricServiceProvider.java @@ -6,7 +6,7 @@ import java.util.ServiceLoader; /** * Lookup MetricFactory service. */ -class MetricServiceProvider { +final class MetricServiceProvider { private static final MetricFactory metricFactory = init(); diff --git a/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java b/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java index 709019158..580a00b9e 100644 --- a/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java +++ b/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java @@ -10,7 +10,7 @@ import java.util.Set; /** * Annotation utility methods to find annotations. */ -public class AnnotationUtil { +public final class AnnotationUtil { /** * Determine if the supplied {@link Annotation} is defined in the core JDK {@code java.lang.annotation} package. diff --git a/ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java b/ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java index c58c78200..f32cddf8b 100644 --- a/ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java +++ b/ebean-api/src/main/java/io/ebean/util/CamelCaseHelper.java @@ -1,6 +1,6 @@ package io.ebean.util; -public class CamelCaseHelper { +public final class CamelCaseHelper { /** * To underscore from camel case using digits compressed true and force upper case false. diff --git a/ebean-api/src/main/java/io/ebean/util/IOUtils.java b/ebean-api/src/main/java/io/ebean/util/IOUtils.java index e4f437e10..2dd54e73a 100644 --- a/ebean-api/src/main/java/io/ebean/util/IOUtils.java +++ b/ebean-api/src/main/java/io/ebean/util/IOUtils.java @@ -16,7 +16,7 @@ import java.nio.charset.StandardCharsets; * Utilities for IO. It uses UTF-8 as encoding when reading/writing and uses * buffered IO for better performance. */ -public class IOUtils { +public final class IOUtils { /** * Read from stream as UTF-8. diff --git a/ebean-api/src/main/java/io/ebean/util/JdbcClose.java b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java index e78be2376..a1d04536e 100644 --- a/ebean-api/src/main/java/io/ebean/util/JdbcClose.java +++ b/ebean-api/src/main/java/io/ebean/util/JdbcClose.java @@ -11,7 +11,7 @@ import java.sql.Statement; /** * Utility for closing raw Jdbc resources. */ -public class JdbcClose { +public final class JdbcClose { private static final Logger log = LoggerFactory.getLogger("io.ebean"); diff --git a/ebean-api/src/main/java/io/ebean/util/SplitName.java b/ebean-api/src/main/java/io/ebean/util/SplitName.java index 3e1e9951e..3a6cd4f2f 100644 --- a/ebean-api/src/main/java/io/ebean/util/SplitName.java +++ b/ebean-api/src/main/java/io/ebean/util/SplitName.java @@ -3,7 +3,7 @@ package io.ebean.util; /** * Helper for dot notation property paths. */ -public class SplitName { +public final class SplitName { private static final char PERIOD = '.'; diff --git a/ebean-api/src/main/java/io/ebean/util/StringHelper.java b/ebean-api/src/main/java/io/ebean/util/StringHelper.java index b35deb36e..4268288f6 100644 --- a/ebean-api/src/main/java/io/ebean/util/StringHelper.java +++ b/ebean-api/src/main/java/io/ebean/util/StringHelper.java @@ -7,7 +7,7 @@ import java.util.regex.Pattern; /** * Utility String class that supports String manipulation functions. */ -public class StringHelper { +public final class StringHelper { private static final Pattern SPLIT_NAMES = Pattern.compile("[\\s,;]+"); From a87897dd4683b4f1429dfd99f879f4017423723a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 18:01:47 +1200 Subject: [PATCH 03/41] Update README add EA build badge for ebean-agent --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c00cb73e5..694c73f96 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ [![datasource EA](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-datasource/actions/workflows/jdk-ea.yml) [![migration EA](https://github.com/ebean-orm/ebean-migration/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-migration/actions/workflows/jdk-ea.yml) [![test-docker EA](https://github.com/ebean-orm/ebean-test-docker/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-test-docker/actions/workflows/jdk-ea.yml) +[![ebean-agent EA](https://github.com/ebean-orm/ebean-agent/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean-agent/actions/workflows/jdk-ea.yml) # Sponsors From 48d7e79b16b3675f2d61d7e63a9b34063d27e55a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 18:17:25 +1200 Subject: [PATCH 04/41] Remove deprecated findLargeStream(), migrate to findStream() findLargeStream() became no longer become needed due to improvements in the persistence context. Migrate to just use findStream() instead. --- .../main/java/io/ebean/ExtendedServer.java | 13 ----------- ebean-api/src/main/java/io/ebean/Query.java | 23 ------------------- .../server/core/DefaultServer.java | 5 ---- .../server/query/DefaultFetchGroupQuery.java | 5 ---- .../server/querydefn/DefaultOrmQuery.java | 5 ---- .../java/io/ebean/typequery/TQRootBean.java | 8 ------- .../java/org/querytest/QCustomerTest.java | 18 --------------- .../xtest/internal/api/TDSpiEbeanServer.java | 5 ---- .../org/tests/query/TestQueryFindStream.java | 21 ----------------- 9 files changed, 103 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/ExtendedServer.java b/ebean-api/src/main/java/io/ebean/ExtendedServer.java index 1bb21a721..0088e9c2b 100644 --- a/ebean-api/src/main/java/io/ebean/ExtendedServer.java +++ b/ebean-api/src/main/java/io/ebean/ExtendedServer.java @@ -112,19 +112,6 @@ public interface ExtendedServer { */ Stream findStream(Query query, Transaction transaction); - /** - * Deprecated - migrate to findStream(). - *

- * Execute the query returning the result as a Stream. - *

- * Note that this can support very large queries iterating any number of results. - * To do so internally it can use multiple persistence contexts. - *

- * Note that the stream needs to be closed so use with try with resources. - */ - @Deprecated - Stream findLargeStream(Query query, Transaction transaction); - /** * Execute the query visiting the each bean one at a time. *

diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index 4ddfc9af5..0bc8939f3 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -750,29 +750,6 @@ public interface Query extends CancelableQuery { */ Stream findStream(); - /** - * Deprecated - migrate to findStream. - *

- * Execute the query returning the result as a Stream. - *

- * Note that this uses multiple persistence contexts such that we can use - * it with a large number of results. - *

- *
{@code
-   *
-   *  // use try with resources to ensure Stream is closed
-   *
-   *  try (Stream stream = query.findLargeStream()) {
-   *    stream
-   *    .map(...)
-   *    .collect(...);
-   *  }
-   *
-   * }
- */ - @Deprecated - Stream findLargeStream(); - /** * Execute the query processing the beans one at a time. *

diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 2f51eeffd..bbc7725a2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -1376,11 +1376,6 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } - @Override - public Stream findLargeStream(Query query, Transaction transaction) { - return findStream(query, transaction); - } - @Override public Stream findStream(Query query, Transaction transaction) { return toStream(findIterate(query, transaction)); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java index 8011cc1b5..da8caf0b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultFetchGroupQuery.java @@ -251,11 +251,6 @@ final class DefaultFetchGroupQuery implements SpiFetchGroupQuery, SpiQuery throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); } - @Override - public Stream findLargeStream() { - throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); - } - @Override public void findEach(Consumer consumer) { throw new RuntimeException("EB102: Only select() and fetch() clause is allowed on FetchGroup"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java index 307b2713c..6aa0f9a6a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java @@ -1456,11 +1456,6 @@ public final class DefaultOrmQuery extends AbstractQuery implements SpiQuery< return server.findStream(this, transaction); } - @Override - public Stream findLargeStream() { - return server.findLargeStream(this, transaction); - } - @Override public List> findVersions() { this.temporalMode = TemporalMode.VERSIONS; diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java index ed3c35350..566ce3f27 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -1646,14 +1646,6 @@ public abstract class TQRootBean { return query.findStream(); } - /** - * Deprecated - migrate to findStream(). - */ - @Deprecated - public Stream findLargeStream() { - return query.findLargeStream(); - } - /** * Execute the query returning the set of objects. *

diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index 00922b438..2b2ed7567 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -387,24 +387,6 @@ public class QCustomerTest { assertThat(sb.toString()).isEqualTo("stream1|stream2"); } - @Test - public void testFindLargeStream() { - insertCustomer("largeStream1"); - insertCustomer("largeStream2"); - insertCustomer("largeStream3"); - - StringJoiner sb = new StringJoiner("|"); - try (Stream stream = new QCustomer() - .name.startsWith("largeStream") - .id.asc() - .findLargeStream()) { - - stream.forEach(it -> sb.add(it.getName())); - } - - assertThat(sb.toString()).isEqualTo("largeStream1|largeStream2|largeStream3"); - } - @Test public void testFilterMany() { diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java index de0e61945..b7d58fe84 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiEbeanServer.java @@ -653,11 +653,6 @@ public class TDSpiEbeanServer extends TDSpiServer implements SpiEbeanServer { return null; } - @Override - public Stream findLargeStream(Query query, Transaction transaction) { - return null; - } - @Override public void findEach(Query query, Consumer consumer, Transaction transaction) { } diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java index b53276d40..894141654 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindStream.java @@ -37,27 +37,6 @@ public class TestQueryFindStream extends BaseTestCase { } } - @Test - public void findLargeStream_basic() { - ResetBasicData.reset(); - try (Stream stream = DB.find(Customer.class) - .findLargeStream()) { - - // bad example, don't use a stream like this when we can - // use findSingleAttributeList() instead - final List namesStream = stream - .map(Customer::getName) - .collect(toList()); - - final List namesQuery = DB.find(Customer.class) - .select("name") - .findSingleAttributeList(); - - assertThat(namesStream).hasSize(namesQuery.size()); - assertThat(namesStream).containsAll(namesQuery); - } - } - @Test public void manualTest_findSteam_when_closeWithResources() { // confirm manually the stream is closed via try with resources block From e7dd5570a59ade34d85df8e898da22790a42b69c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 18:32:52 +1200 Subject: [PATCH 05/41] Remove deprecated methods in ebean-api - meta, metric, plugin. Migrate getFoo() -> foo() These methods are deprecated getters, migrate to the associated accessor method. --- .../java/io/ebean/meta/MetaCountMetric.java | 7 --- .../main/java/io/ebean/meta/MetaMetric.java | 7 --- .../java/io/ebean/meta/MetaQueryMetric.java | 24 ---------- .../java/io/ebean/meta/MetaTimedMetric.java | 41 ---------------- .../java/io/ebean/meta/ServerMetrics.java | 23 --------- .../java/io/ebean/metric/QueryPlanMetric.java | 8 ---- .../java/io/ebean/plugin/BeanDocType.java | 30 ++---------- .../java/io/ebean/plugin/ExpressionPath.java | 47 ------------------- .../main/java/io/ebean/plugin/Property.java | 24 ---------- .../docstore/api/DocStoreBeanAdapter.java | 5 +- .../api/support/DocStoreBeanBaseAdapter.java | 17 ++----- 11 files changed, 8 insertions(+), 225 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java index cdaa2d7fa..da6a5dacc 100644 --- a/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java +++ b/ebean-api/src/main/java/io/ebean/meta/MetaCountMetric.java @@ -10,11 +10,4 @@ public interface MetaCountMetric extends MetaMetric { */ long count(); - /** - * Migrate to count() - */ - @Deprecated - default long getCount() { - return count(); - } } diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java index 671dc05c1..14a6566bb 100644 --- a/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java +++ b/ebean-api/src/main/java/io/ebean/meta/MetaMetric.java @@ -10,11 +10,4 @@ public interface MetaMetric { */ String name(); - /** - * Migrate to name(). - */ - @Deprecated - default String getName() { - return name(); - } } diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java index 1c9b5fe12..6d8cd8a07 100644 --- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java +++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryMetric.java @@ -10,40 +10,16 @@ public interface MetaQueryMetric extends MetaTimedMetric { */ Class type(); - /** - * Migrate to type(). - */ - @Deprecated - default Class getType() { - return type(); - } - /** * The label for the query (can be null). */ String label(); - /** - * Migrate to label(). - */ - @Deprecated - default String getLabel() { - return label(); - } - /** * The actual SQL of the query. */ String sql(); - /** - * Migrate to sql(). - */ - @Deprecated - default String getSql() { - return sql(); - } - /** * Return the hash of the plan. */ diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java index f95f3248d..4d5d91ec6 100644 --- a/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java +++ b/ebean-api/src/main/java/io/ebean/meta/MetaTimedMetric.java @@ -11,67 +11,26 @@ public interface MetaTimedMetric extends MetaMetric { */ String location(); - /** - * Migrate to location() - */ - @Deprecated - default String getLocation() { - return location(); - } - /** * Return the total count. */ long count(); - /** - * Migrate to count() - */ - @Deprecated - default long getCount() { - return count(); - } - /** * Return the total execution time in micros. */ long total(); - /** - * Migrate to total() - */ - @Deprecated - default long getTotal() { - return total(); - } - /** * Return the max execution time in micros. */ long max(); - /** - * Migrate to max() - */ - @Deprecated - default long getMax() { - return max(); - } - /** * Return the mean execution time in micros. */ long mean(); - - /** - * Migrate to mean() - */ - @Deprecated - default long getMean() { - return mean(); - } - /** * Return true if this is the first metrics collection for this query. *

diff --git a/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java b/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java index b8a50d85d..f9ca58c33 100644 --- a/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java +++ b/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java @@ -12,37 +12,14 @@ public interface ServerMetrics { */ List timedMetrics(); - /** - * Migrate to timedMetrics(). - */ - @Deprecated - default List getTimedMetrics() { - return timedMetrics(); - } - /** * Return the query metrics. */ List queryMetrics(); - /** - * Migrate to queryMetrics(). - */ - @Deprecated - default List getQueryMetrics() { - return queryMetrics(); - } - /** * Return the Counter metrics. */ List countMetrics(); - /** - * Migrate to countMetrics(). - */ - @Deprecated - default List getCountMetrics() { - return countMetrics(); - } } diff --git a/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java b/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java index 07a9ca6d2..24999ce0e 100644 --- a/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java +++ b/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java @@ -12,14 +12,6 @@ public interface QueryPlanMetric { */ TimedMetric metric(); - /** - * Deprecated migrate to metric(). - */ - @Deprecated - default TimedMetric getMetric() { - return metric(); - } - /** * Visit the underlying metric. */ diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java index 77a8f72d9..331b70cad 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java @@ -16,28 +16,12 @@ public interface BeanDocType { /** * Return the doc store index type for this bean type. */ - default String indexType() { - return getIndexType(); - } - - /** - * Deprecated migrate to indexType(). - */ - @Deprecated - String getIndexType(); + String indexType(); /** * Return the doc store index name for this bean type. */ - default String indexName() { - return getIndexName(); - } - - /** - * Deprecated migrate to indexName(). - */ - @Deprecated - String getIndexName(); + String indexName(); /** * Apply the appropriate fetch path to the query such that the query returns beans matching @@ -62,15 +46,7 @@ public interface BeanDocType { * For embedded 'many' properties we need a FetchPath relative to the root which is used to * build and replace the embedded list. */ - default FetchPath embeddedManyRoot(String path) { - return getEmbeddedManyRoot(path); - } - - /** - * Deprecated migrate to embeddedManyRoot(). - */ - @Deprecated - FetchPath getEmbeddedManyRoot(String path); + FetchPath embeddedManyRoot(String path); /** * Return a 'raw' property mapped for the given property. diff --git a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java index b7675f87b..29a5abdab 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java +++ b/ebean-api/src/main/java/io/ebean/plugin/ExpressionPath.java @@ -39,14 +39,6 @@ public interface ExpressionPath { */ StringParser stringParser(); - /** - * Deprecated migrate to stringParser(). - */ - @Deprecated - default StringParser getStringParser() { - return stringParser(); - } - /** * For DateTime capable scalar types convert the long systemTimeMillis into * an appropriate java time (Date,Timestamp,Time,Calendar, JODA type etc). @@ -64,14 +56,6 @@ public interface ExpressionPath { */ int jdbcType(); - /** - * Deprecated migrate to jdbcType(). - */ - @Deprecated - default int getJdbcType() { - return jdbcType(); - } - /** * Return true if this is an ManyToOne or OneToOne associated bean property. */ @@ -85,50 +69,19 @@ public interface ExpressionPath { */ String assocIdExpression(String propName, String bindOperator); - /** - * Deprecated migrate to assocIdExpression(). - */ - @Deprecated - default String getAssocIdExpression(String propName, String bindOperator) { - return assocIdExpression(propName, bindOperator); - } - /** * Return the Id values for the given bean value. */ Object[] assocIdValues(EntityBean bean); - /** - * Deprecated migrate to assocIdValues(). - */ - @Deprecated - default Object[] getAssocIdValues(EntityBean bean) { - return assocIdValues(bean); - } - /** * Return the underlying bean property. */ Property property(); - /** - * Deprecated migrate to property(). - */ - @Deprecated - default Property getProperty() { - return property(); - } - /** * The ElPrefix plus name. */ String elName(); - /** - * Deprecated migrate to elName(). - */ - @Deprecated - default String getElName() { - return elName(); - } } diff --git a/ebean-api/src/main/java/io/ebean/plugin/Property.java b/ebean-api/src/main/java/io/ebean/plugin/Property.java index d37fa2959..81a1fc115 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/Property.java +++ b/ebean-api/src/main/java/io/ebean/plugin/Property.java @@ -10,40 +10,16 @@ public interface Property { */ String name(); - /** - * Deprecated migrate to name(). - */ - @Deprecated - default String getName() { - return name(); - } - /** * Return the type of the property. */ Class type(); - /** - * Deprecated migrate to type(). - */ - @Deprecated - default Class getPropertyType() { - return type(); - } - /** * Return the value of the property on the given bean. */ Object value(Object bean); - /** - * Deprecated migrate to value(). - */ - @Deprecated - default Object getVal(Object bean) { - return value(bean); - } - /** * Return true if this is a OneToMany or ManyToMany property. */ diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java index 5c0dd02be..c3a8cd6e7 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/DocStoreBeanAdapter.java @@ -54,14 +54,13 @@ public interface DocStoreBeanAdapter extends BeanDocType { /** * Return the index type for this bean type. */ - @Override - String getIndexType(); + String indexType(); /** * Return the index name for this bean type. */ @Override - String getIndexName(); + String indexName(); /** * Process a delete by id of a given document. diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index 4cd2b692f..dead8c43c 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -102,7 +102,6 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< private boolean registerPaths; public DocStoreBeanBaseAdapter(BeanDescriptor desc, DeployBeanDescriptor deploy) { - this.desc = desc; this.server = desc.ebeanServer(); this.mapped = deploy.isDocStoreMapped(); @@ -123,7 +122,6 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< @Override public DocumentMapping createDocMapping() { - if (documentMapping != null) { return documentMapping; } @@ -143,12 +141,12 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< } @Override - public String getIndexType() { + public String indexType() { return indexType; } @Override - public String getIndexName() { + public String indexName() { return indexName; } @@ -159,7 +157,6 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< @Override public String rawProperty(String property) { - String rawProperty = sortableMap.get(property); return rawProperty == null ? property : rawProperty; } @@ -192,7 +189,6 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< */ @Override public void registerInvalidationPath(String queueId, String path, Set properties) { - if (!mapped) { if (update == DocStoreMode.IGNORE) { // bean type not mapped but is included as nested document @@ -207,7 +203,6 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< * Return the DsInvalidationListener based on the properties, path. */ protected DocStoreEmbeddedInvalidation getEmbeddedInvalidation(String queueId, String path, Set properties) { - if (properties.contains("*")) { return new DocStoreEmbeddedInvalidation(queueId, path); } else { @@ -245,19 +240,15 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< * This can add derived/embedded/nested parts to the document. */ protected DocStructure derivePathProperties(PathProperties pathProps) { - boolean includeByDefault = (pathProps == null); if (pathProps == null) { pathProps = new PathProperties(); } - return getDocStructure(pathProps, includeByDefault); } protected DocStructure getDocStructure(PathProperties pathProps, final boolean includeByDefault) { - final DocStructure docStructure = new DocStructure(pathProps); - BeanProperty[] properties = desc.propertiesNonTransient(); for (BeanProperty property : properties) { property.docStoreInclude(includeByDefault, docStructure); @@ -271,7 +262,6 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< } }); } - return docStructure; } @@ -281,7 +271,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< } @Override - public FetchPath getEmbeddedManyRoot(String path) { + public FetchPath embeddedManyRoot(String path) { return docStructure.getEmbeddedManyRoot(path); } @@ -297,7 +287,6 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< @Override public DocStoreMode getMode(PersistRequest.Type persistType, DocStoreMode txnMode) { - if (txnMode == null) { return getMode(persistType); } else if (txnMode == DocStoreMode.IGNORE) { From 495af7ae4acd8dc4ba1e38b8aab6b66678679d1b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 20:09:07 +1200 Subject: [PATCH 06/41] Remove deprecated methods in ebean-api - plugin BeanType. Migrate getFoo() -> foo() These methods are deprecated getters, migrate to the associated accessor method. --- .../java/io/ebean/plugin/BeanDocType.java | 10 +- .../main/java/io/ebean/plugin/BeanType.java | 182 ------------------ .../server/deploy/BeanDescriptor.java | 10 +- .../api/support/DocStoreBeanBaseAdapter.java | 2 +- 4 files changed, 7 insertions(+), 197 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java index 331b70cad..55e7c146b 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanDocType.java @@ -32,15 +32,7 @@ public interface BeanDocType { /** * Return the FetchPath for the embedded document. */ - default FetchPath embedded(String path) { - return getEmbedded(path); - } - - /** - * Deprecated migrate to embedded(). - */ - @Deprecated - FetchPath getEmbedded(String path); + FetchPath embedded(String path); /** * For embedded 'many' properties we need a FetchPath relative to the root which is used to diff --git a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java index e7f324a56..762f077f4 100644 --- a/ebean-api/src/main/java/io/ebean/plugin/BeanType.java +++ b/ebean-api/src/main/java/io/ebean/plugin/BeanType.java @@ -22,53 +22,21 @@ public interface BeanType { */ String name(); - /** - * Deprecated migrate to name(). - */ - @Deprecated - default String getName() { - return name(); - } - /** * Return the full name of the bean type. */ String fullName(); - /** - * Deprecated migrate to fullName(). - */ - @Deprecated - default String getFullName() { - return fullName(); - } - /** * Return the class type this BeanDescriptor describes. */ Class type(); - /** - * Deprecated migrate to type(). - */ - @Deprecated - default Class getBeanType() { - return type(); - } - /** * Return the type bean for an OneToMany or ManyToOne or ManyToMany property. */ BeanType beanTypeAtPath(String propertyName); - /** - * Deprecated migrate to beanTypeAtPath(). - */ - @Deprecated - default BeanType getBeanTypeAtPath(String propertyName) { - return beanTypeAtPath(propertyName); - } - /** * Return all the properties for this bean type. */ @@ -79,53 +47,21 @@ public interface BeanType { */ Property idProperty(); - /** - * Deprecated migrate to idProperty(). - */ - @Deprecated - default Property getIdProperty() { - return idProperty(); - } - /** * Return the when modified property if there is one defined. */ Property whenModifiedProperty(); - /** - * Deprecated migrate to idProperty(). - */ - @Deprecated - default Property getWhenModifiedProperty() { - return whenModifiedProperty(); - } - /** * Return the when created property if there is one defined. */ Property whenCreatedProperty(); - /** - * Deprecated migrate to idProperty(). - */ - @Deprecated - default Property getWhenCreatedProperty() { - return whenCreatedProperty(); - } - /** * Return the Property to read values from a bean. */ Property property(String propertyName); - /** - * Deprecated migrate to property(). - */ - @Deprecated - default Property getProperty(String propertyName) { - return property(propertyName); - } - /** * Return the ExpressionPath for a given property path. *

@@ -134,14 +70,6 @@ public interface BeanType { */ ExpressionPath expressionPath(String path); - /** - * Deprecated migrate to expressionPath(). - */ - @Deprecated - default ExpressionPath getExpressionPath(String path) { - return expressionPath(path); - } - /** * Return true if the property is a valid known property or path for the given bean type. */ @@ -177,14 +105,6 @@ public interface BeanType { */ String baseTable(); - /** - * Deprecated migrate to baseTable(). - */ - @Deprecated - default String getBaseTable() { - return baseTable(); - } - /** * Create a new instance of the bean. */ @@ -195,98 +115,36 @@ public interface BeanType { */ Object id(Object bean); - /** - * Deprecated migrate to id() - */ - @Deprecated - default Object beanId(Object bean) { - return id(bean); - } - - /** - * Deprecated migrate to id() - */ - @Deprecated - Object getBeanId(T bean); - /** * Set the id value to the bean. */ void setId(T bean, Object idValue); - /** - * Deprecated migrate to setId() - */ - @Deprecated - default void setBeanId(T bean, Object idValue) { - setId(bean, idValue); - } - /** * Return the bean persist controller. */ BeanPersistController persistController(); - /** - * Deprecated migrate to persistController() - */ - @Deprecated - default BeanPersistController getPersistController() { - return persistController(); - } - /** * Return the bean persist listener. */ BeanPersistListener persistListener(); - /** - * Deprecated migrate to persistListener() - */ - @Deprecated - default BeanPersistListener getPersistListener() { - return persistListener(); - } - /** * Return the beanFinder. Usually null unless overriding the finder. */ BeanFindController findController(); - /** - * Deprecated migrate to findController() - */ - @Deprecated - default BeanFindController getFindController() { - return findController(); - } - /** * Return the BeanQueryAdapter or null if none is defined. */ BeanQueryAdapter queryAdapter(); - /** - * Deprecated migrate to queryAdapter() - */ - @Deprecated - default BeanQueryAdapter getQueryAdapter() { - return queryAdapter(); - } - /** * Return the identity generation type. */ IdType idType(); - /** - * Deprecated migrate to idType() - */ - @Deprecated - default IdType getIdType() { - return idType(); - } - /** * Return true if this bean type has doc store backing. */ @@ -301,27 +159,11 @@ public interface BeanType { */ DocMapping docMapping(); - /** - * Deprecated migrate to docMapping() - */ - @Deprecated - default DocMapping getDocMapping() { - return docMapping(); - } - /** * Return the doc store queueId for this bean type. */ String docStoreQueueId(); - /** - * Deprecated migrate to docStoreQueueId() - */ - @Deprecated - default String getDocStoreQueueId() { - return docStoreQueueId(); - } - /** * Return the doc store support for this bean type.\ */ @@ -353,27 +195,11 @@ public interface BeanType { */ List> inheritanceChildren(); - /** - * Deprecated migrate to inheritanceChildren() - */ - @Deprecated - default List> getInheritanceChildren() { - return inheritanceChildren(); - } - /** * Returns the parent in inheritance hierarchy */ BeanType inheritanceParent(); - /** - * Deprecated migrate to inheritanceParent() - */ - @Deprecated - default BeanType getInheritanceParent() { - return inheritanceParent(); - } - /** * Visit all children recursively */ @@ -384,14 +210,6 @@ public interface BeanType { */ String discColumn(); - /** - * Deprecated migrate to discColumn() - */ - @Deprecated - default String getDiscColumn() { - return discColumn(); - } - /** * Create a bean given the discriminator value. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java index d7a5f5ff5..4974f221c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptor.java @@ -2106,10 +2106,10 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { return getId((EntityBean) bean); } - @Override - public Object getBeanId(T bean) { - return getId((EntityBean) bean); - } +// @Override +// public Object beanId(T bean) { +// return getId((EntityBean) bean); +// } /** * Return the Id value for the bean with embeddedId beans converted into maps. @@ -2673,7 +2673,7 @@ public class BeanDescriptor implements BeanType, STreeType, SpiBeanType { public PartitionMeta partitionMeta() { return partitionMeta; } - + /** * Return the tablespace details of the bean. */ diff --git a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java index dead8c43c..626daf1b4 100644 --- a/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java +++ b/ebean-core/src/main/java/io/ebeanservice/docstore/api/support/DocStoreBeanBaseAdapter.java @@ -266,7 +266,7 @@ public abstract class DocStoreBeanBaseAdapter implements DocStoreBeanAdapter< } @Override - public FetchPath getEmbedded(String path) { + public FetchPath embedded(String path) { return docStructure.getEmbedded(path); } From 07e62d95370eafd07675c0dd8deb33f7e74f44f6 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 20:17:42 +1200 Subject: [PATCH 07/41] Remove deprecated methods in ebean-api - QueryPlanCapture. Migrate getFoo() -> foo() These methods are deprecated getters, migrate to the associated accessor method. --- .../java/io/ebean/config/QueryPlanCapture.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java b/ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java index 13f0a1ed2..09cd6fa73 100644 --- a/ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java +++ b/ebean-api/src/main/java/io/ebean/config/QueryPlanCapture.java @@ -25,14 +25,6 @@ public class QueryPlanCapture { return database; } - /** - * Deprecated migrate to database(). - */ - @Deprecated - public Database getDatabase() { - return database; - } - /** * Return the captured query plans. */ @@ -40,11 +32,4 @@ public class QueryPlanCapture { return plans; } - /** - * Deprecated migrate to plans(). - */ - @Deprecated - public List getPlans() { - return plans; - } } From 75dc74eb5886a251c6a5c90dded513f7753055e4 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 20:32:50 +1200 Subject: [PATCH 08/41] Remove deprecated methods in ebean-api - ServerCacheManager ServerCacheRegion These methods are deprecated getters, migrate to the associated accessor method. --- .../io/ebean/cache/ServerCacheManager.java | 49 ------------------- .../io/ebean/cache/ServerCacheRegion.java | 8 --- 2 files changed, 57 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java index 67156a642..0168a4d58 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheManager.java @@ -23,14 +23,6 @@ public interface ServerCacheManager { */ boolean localL2Caching(); - /** - * Deprecated migrate to localL2Caching(). - */ - @Deprecated - default boolean isLocalL2Caching() { - return localL2Caching(); - } - /** * Return all the cache regions. */ @@ -46,77 +38,36 @@ public interface ServerCacheManager { */ void enabledRegions(String regions); - /** - * Deprecated migrate to enabledRegions(). - */ - @Deprecated - default void setEnabledRegions(String regions) { - enabledRegions(regions); - } - /** * Enable or disable all the cache regions. */ void allRegionsEnabled(boolean enabled); - /** - * Deprecated migrate to allRegionsEnabled(). - */ - @Deprecated - default void setAllRegionsEnabled(boolean enabled) { - allRegionsEnabled(enabled); - } - /** * Return the cache region by name. Typically, to enable or disable the region. */ ServerCacheRegion region(String name); - @Deprecated - default ServerCacheRegion getRegion(String name) { - return region(name); - } - /** * Return the cache for mapping natural keys to id values. */ ServerCache naturalKeyCache(Class beanType); - @Deprecated - default ServerCache getNaturalKeyCache(Class beanType) { - return naturalKeyCache(beanType); - } - /** * Return the cache for beans of a particular type. */ ServerCache beanCache(Class beanType); - @Deprecated - default ServerCache getBeanCache(Class beanType) { - return beanCache(beanType); - } - /** * Return the cache for associated many properties of a bean type. */ ServerCache collectionIdsCache(Class beanType, String propertyName); - @Deprecated - default ServerCache getCollectionIdsCache(Class beanType, String propertyName) { - return collectionIdsCache(beanType, propertyName); - } - /** * Return the cache for query results of a particular type of bean. */ ServerCache queryCache(Class beanType); - @Deprecated - default ServerCache getQueryCache(Class beanType) { - return queryCache(beanType); - } - /** * This clears both the bean and query cache for a given type. */ diff --git a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java index c798b5a35..5cfd3c595 100644 --- a/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java +++ b/ebean-api/src/main/java/io/ebean/cache/ServerCacheRegion.java @@ -10,14 +10,6 @@ public interface ServerCacheRegion { */ String name(); - /** - * Deprecated migrate to name(). - */ - @Deprecated - default String getName() { - return name(); - } - /** * Return true if the cache region is enabled. */ From 9bb307cce2996cf43f8f59e5917b56cf3dec1831 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 20:45:24 +1200 Subject: [PATCH 09/41] Remove deprecated methods in ebean-api - SqlQuery --- .../src/main/java/io/ebean/SqlQuery.java | 62 ------------------- .../querydefn/DefaultRelationalQuery.java | 45 +++----------- 2 files changed, 8 insertions(+), 99 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/SqlQuery.java b/ebean-api/src/main/java/io/ebean/SqlQuery.java index 5ab123743..797e41381 100644 --- a/ebean-api/src/main/java/io/ebean/SqlQuery.java +++ b/ebean-api/src/main/java/io/ebean/SqlQuery.java @@ -74,18 +74,6 @@ public interface SqlQuery extends Serializable, CancelableQuery { @Nullable SqlRow findOne(); - /** - * Deprecated migrate to use {@link #mapTo(RowMapper)} - */ - @Deprecated - T findOne(RowMapper mapper); - - /** - * Deprecated migrate to use {@link #mapTo(RowMapper)} - */ - @Deprecated - List findList(RowMapper mapper); - /** * Execute the query reading each row from ResultSet using the RowConsumer. *

@@ -121,50 +109,6 @@ public interface SqlQuery extends Serializable, CancelableQuery { */ Optional findOneOrEmpty(); - /** - * Deprecated - migrate to .mapToScalar(attributeType).findOne(). - *

{@code
-   *
-   *    .mapToScalar(BigDecimal.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-   T findSingleAttribute(Class attributeType);
-
-  /**
-   * Deprecated - migrate to .mapToScalar(BigDecimal.class).findOne().
-   * 
{@code
-   *
-   *    .mapToScalar(BigDecimal.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-  BigDecimal findSingleDecimal();
-
-  /**
-   * Deprecated - migrate to .mapToScalar(Long.class).findOne().
-   * 
{@code
-   *
-   *    .mapToScalar(Long.class)
-   *    .findOne();
-   * }
-   */
-  @Deprecated
-  Long findSingleLong();
-
-  /**
-   * Deprecated - migrate to .mapToScalar(Long.class).findList().
-   * 
{@code
-   *
-   *    .mapToScalar(Long.class)
-   *    .findList();
-   * }
-   */
-  @Deprecated
-   List findSingleAttributeList(Class attributeType);
-
   /**
    * Set one of more positioned parameters.
    * 

@@ -194,12 +138,6 @@ public interface SqlQuery extends Serializable, CancelableQuery { */ SqlQuery setParameters(Object... values); - /** - * Deprecated migrate to setParameters(Object... values) - */ - @Deprecated - SqlQuery setParams(Object... values); - /** * Set the next bind parameter by position. *

{@code
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
index cc2594b8d..a68bb5d2a 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultRelationalQuery.java
@@ -10,7 +10,6 @@ import io.ebeaninternal.api.BindParams;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.api.SpiSqlQuery;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
@@ -56,36 +55,6 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
     return server.findList(this, null);
   }
 
-  @Override
-  public BigDecimal findSingleDecimal() {
-    return server.findSingleAttribute(this, BigDecimal.class);
-  }
-
-  @Override
-  public Long findSingleLong() {
-    return server.findSingleAttribute(this, Long.class);
-  }
-
-  @Override
-  public  T findSingleAttribute(Class cls) {
-    return server.findSingleAttribute(this, cls);
-  }
-
-  @Override
-  public  List findSingleAttributeList(Class cls) {
-    return server.findSingleAttributeList(this, cls);
-  }
-
-  @Override
-  public  T findOne(RowMapper mapper) {
-    return server.findOneMapper(this, mapper);
-  }
-
-  @Override
-  public  List findList(RowMapper mapper) {
-    return server.findListMapper(this, mapper);
-  }
-
   @Override
   public void findEachRow(RowConsumer consumer) {
     server.findEachRow(this, consumer);
@@ -101,12 +70,6 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
     return Optional.ofNullable(findOne());
   }
 
-  @Override
-  @Deprecated
-  public DefaultRelationalQuery setParams(Object... values) {
-    return setParameters(values);
-  }
-
   @Override
   public DefaultRelationalQuery setParameters(Object... values) {
     bindParams.setNextParameters(values);
@@ -237,6 +200,14 @@ public final class DefaultRelationalQuery extends AbstractQuery implements SpiSq
     return new Mapper(mapper);
   }
 
+  private  T findSingleAttribute(Class cls) {
+    return server.findSingleAttribute(this, cls);
+  }
+
+  private  List findSingleAttributeList(Class cls) {
+    return server.findSingleAttributeList(this, cls);
+  }
+
   private class Scalar implements SqlQuery.TypeQuery {
 
     private final Class type;

From 8636888d6520f04833796542705f8c123977912e Mon Sep 17 00:00:00 2001
From: Rob Bygrave 
Date: Wed, 6 Apr 2022 20:49:23 +1200
Subject: [PATCH 10/41] Remove deprecated methods in ebean-api - SqlUpdate

migrate from -> to
setParams() -> setParameters()
setNextParameter() -> setParameter()
---
 ebean-api/src/main/java/io/ebean/SqlUpdate.java      | 12 ------------
 .../ebeaninternal/server/core/DefaultSqlUpdate.java  | 10 ----------
 2 files changed, 22 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/SqlUpdate.java b/ebean-api/src/main/java/io/ebean/SqlUpdate.java
index 9ce704922..33eedf3b2 100644
--- a/ebean-api/src/main/java/io/ebean/SqlUpdate.java
+++ b/ebean-api/src/main/java/io/ebean/SqlUpdate.java
@@ -287,12 +287,6 @@ public interface SqlUpdate {
    */
   SqlUpdate setParameters(Object... values);
 
-  /**
-   * Deprecated migrate to setParameters(Object... values).
-   */
-  @Deprecated
-  SqlUpdate setParams(Object... values);
-
   /**
    * Set the next bind parameter by position.
    *
@@ -300,12 +294,6 @@ public interface SqlUpdate {
    */
   SqlUpdate setParameter(Object value);
 
-  /**
-   * Deprecated migrate to setParameter(value).
-   */
-  @Deprecated
-  SqlUpdate setNextParameter(Object value);
-
   /**
    * Set a parameter via its index position.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
index 756c5665f..d9023b356 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultSqlUpdate.java
@@ -261,16 +261,6 @@ public final class DefaultSqlUpdate implements Serializable, SpiSqlUpdate {
     return this;
   }
 
-  @Override
-  public SqlUpdate setParams(Object... values) {
-    return setParameters(values);
-  }
-
-  @Override
-  public SqlUpdate setNextParameter(Object value) {
-    return setParameter(value);
-  }
-
   @Override
   public SqlUpdate setParameters(Object... values) {
     for (Object value : values) {

From 7f0dc07a6b55d2cb64cbc7fa04cca80cce14f52c Mon Sep 17 00:00:00 2001
From: Rob Bygrave 
Date: Wed, 6 Apr 2022 20:53:58 +1200
Subject: [PATCH 11/41] Remove deprecated methods in ebean-api - BeanState

---
 .../src/main/java/io/ebean/BeanState.java     | 39 -------------------
 1 file changed, 39 deletions(-)

diff --git a/ebean-api/src/main/java/io/ebean/BeanState.java b/ebean-api/src/main/java/io/ebean/BeanState.java
index 912d737fa..64c726a5b 100644
--- a/ebean-api/src/main/java/io/ebean/BeanState.java
+++ b/ebean-api/src/main/java/io/ebean/BeanState.java
@@ -74,40 +74,16 @@ public interface BeanState {
    */
   Set loadedProps();
 
-  /**
-   * Deprecated migrate to loadedProps().
-   */
-  @Deprecated
-  default Set getLoadedProps() {
-    return loadedProps();
-  }
-
   /**
    * Return the set of changed properties.
    */
   Set changedProps();
 
-  /**
-   * Deprecated migrate to changedProps().
-   */
-  @Deprecated
-  default Set getChangedProps() {
-    return changedProps();
-  }
-
   /**
    * Return a map of the updated properties and their new and old values.
    */
   Map dirtyValues();
 
-  /**
-   * Deprecated migrate to dirtyValues().
-   */
-  @Deprecated
-  default Map getDirtyValues() {
-    return dirtyValues();
-  }
-
   /**
    * Return true if the bean is readOnly.
    * 

@@ -139,24 +115,9 @@ public interface BeanState { */ Map loadErrors(); - /** - * Deprecated migrate to loadErrors(). - */ - @Deprecated - default Map getLoadErrors() { - return loadErrors(); - } - /** * Return the sort order value for an order column. */ int sortOrder(); - /** - * Deprecated migrate to sortOrder(). - */ - @Deprecated - default int getSortOrder() { - return sortOrder(); - } } From 22db5abdbe506b42bf43cea410dacaac9d6ec64e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 21:00:35 +1200 Subject: [PATCH 12/41] Remove deprecated methods in ebean-api - DB --- ebean-api/src/main/java/io/ebean/DB.java | 68 ------------------------ 1 file changed, 68 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index b5438eb08..44bd4fdb2 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -131,14 +131,6 @@ public final class DB { return getDefault().expressionFactory(); } - /** - * Deprecated migrate to expressionFactory(). - */ - @Deprecated - public static ExpressionFactory getExpressionFactory() { - return expressionFactory(); - } - /** * Return the next identity value for a given bean type. *

@@ -661,14 +653,6 @@ public final class DB { return getDefault().reference(beanType, id); } - /** - * Deprecated migrate to beanId(). - */ - @Deprecated - public static T getReference(Class beanType, Object id) { - return reference(beanType, id); - } - /** * Sort the list using the sortByClause which can contain a comma delimited * list of property names and keywords asc, desc, nullsHigh and nullsLow. @@ -775,16 +759,6 @@ public final class DB { return getDefault().sqlQuery(sql); } - /** - * Deprecated - migrate to sqlQuery(). - *

- * This is an alias for {@link #sqlQuery(String)}. - */ - @Deprecated - public static SqlQuery createSqlQuery(String sql) { - return sqlQuery(sql); - } - /** * Look to execute a native sql insert update or delete statement. *

@@ -802,16 +776,6 @@ public final class DB { return getDefault().sqlUpdate(sql); } - /** - * Deprecated - migrate to sqlUpdate(). - *

- * This is an alias for {@link #sqlUpdate(String)}. - */ - @Deprecated - public static SqlUpdate createSqlUpdate(String sql) { - return sqlUpdate(sql); - } - /** * Create a CallableSql to execute a given stored procedure. * @@ -1172,14 +1136,6 @@ public final class DB { return getDefault().beanState(bean); } - /** - * Deprecated migrate to beanState(). - */ - @Deprecated - public static BeanState getBeanState(Object bean) { - return beanState(bean); - } - /** * Return the value of the Id property for a given bean. */ @@ -1187,14 +1143,6 @@ public final class DB { return getDefault().beanId(bean); } - /** - * Deprecated migrate to beanId(). - */ - @Deprecated - public static Object getBeanId(Object bean) { - return beanId(bean); - } - /** * Load and lock the bean using {@code select for update}. *

@@ -1210,14 +1158,6 @@ public final class DB { getDefault().lock(bean); } - /** - * Deprecated migrate to cacheManager(). - */ - @Deprecated - public static ServerCacheManager getServerCacheManager() { - return getDefault().cacheManager(); - } - /** * Return the manager of the level 2 cache ("L2" cache). */ @@ -1233,14 +1173,6 @@ public final class DB { return getDefault().backgroundExecutor(); } - /** - * Deprecated migrate to backgroundExecutor(). - */ - @Deprecated - public static BackgroundExecutor getBackgroundExecutor() { - return backgroundExecutor(); - } - /** * Return the JsonContext for reading/writing JSON. */ From 370f50aebe429cce42d7d19d792a965207f52c7c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 21:05:57 +1200 Subject: [PATCH 13/41] Remove deprecated methods in ebean-api - Database --- .../src/main/java/io/ebean/Database.java | 128 ------------------ 1 file changed, 128 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 15446e999..c98f885e4 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -123,81 +123,33 @@ public interface Database { */ AutoTune autoTune(); - /** - * Deprecated migrate to autoTune(). - */ - @Deprecated - default AutoTune getAutoTune() { - return autoTune(); - } - /** * Return the associated DataSource for this Database instance. */ DataSource dataSource(); - /** - * Deprecated migrate to dataSource(). - */ - @Deprecated - default DataSource getDataSource() { - return dataSource(); - } - /** * Return the associated read only DataSource for this Database instance (can be null). */ DataSource readOnlyDataSource(); - /** - * Deprecated migrate to readOnlyDataSource(). - */ - @Deprecated - default DataSource getReadOnlyDataSource() { - return readOnlyDataSource(); - } - /** * Return the name. This is used with {@link DB#byName(String)} to get a * Database that was registered with the DB singleton. */ String name(); - /** - * Deprecated migrate to name(). - */ - @Deprecated - default String getName() { - return name(); - } - /** * Return the ExpressionFactory for this database. */ ExpressionFactory expressionFactory(); - /** - * Deprecated migrate to expressionFactory(). - */ - @Deprecated - default ExpressionFactory getExpressionFactory() { - return expressionFactory(); - } - /** * Return the MetaInfoManager which is used to get meta data from the Database * such as query execution statistics. */ MetaInfoManager metaInfo(); - /** - * Deprecated migrate to metaInfo(). - */ - @Deprecated - default MetaInfoManager getMetaInfoManager() { - return metaInfo(); - } - /** * Return the platform used for this database instance. *

@@ -217,27 +169,11 @@ public interface Database { */ Platform platform(); - /** - * Deprecated migrate to platform(). - */ - @Deprecated - default Platform getPlatform() { - return platform(); - } - /** * Return the extended API intended for use by plugins. */ SpiServer pluginApi(); - /** - * Deprecated migrate to pluginApi(). - */ - @Deprecated - default SpiServer getPluginApi() { - return pluginApi(); - } - /** * Return the BeanState for a given entity bean. *

@@ -246,27 +182,11 @@ public interface Database { */ BeanState beanState(Object bean); - /** - * Deprecated migrate to beanState(). - */ - @Deprecated - default BeanState getBeanState(Object bean) { - return beanState(bean); - } - /** * Return the value of the Id property for a given bean. */ Object beanId(Object bean); - /** - * Deprecated migrate to beanId(). - */ - @Deprecated - default Object getBeanId(Object bean) { - return beanId(bean); - } - /** * Set the Id value onto the bean converting the type of the id value if necessary. *

@@ -279,14 +199,6 @@ public interface Database { */ Object beanId(Object bean, Object id); - /** - * Deprecated migrate to beanId(). - */ - @Deprecated - default Object setBeanId(Object bean, Object id) { - return beanId(bean, id); - } - /** * Return a map of the differences between two objects of the same type. *

@@ -588,14 +500,6 @@ public interface Database { */ SqlQuery sqlQuery(String sql); - /** - * Deprecated - migrate to sqlQuery(). - *

- * This is an alias for {@link #sqlQuery(String)}. - */ - @Deprecated - SqlQuery createSqlQuery(String sql); - /** * Look to execute a native sql insert update or delete statement. *

@@ -611,14 +515,6 @@ public interface Database { */ SqlUpdate sqlUpdate(String sql); - /** - * Deprecated - migrate to sqlUpdate(). - *

- * This is an alias for {@link #sqlUpdate(String)}. - */ - @Deprecated - SqlUpdate createSqlUpdate(String sql); - /** * Create a CallableSql to execute a given stored procedure. */ @@ -952,14 +848,6 @@ public interface Database { */ T reference(Class beanType, Object id); - /** - * Deprecated migrate to reference(). - */ - @Deprecated - default T getReference(Class beanType, Object id) { - return reference(beanType, id); - } - /** * Return the extended API for Database. *

@@ -1528,28 +1416,12 @@ public interface Database { */ ServerCacheManager cacheManager(); - /** - * Deprecated migrate to cacheManager(). - */ - @Deprecated - default ServerCacheManager getServerCacheManager() { - return cacheManager(); - } - /** * Return the BackgroundExecutor service for asynchronous processing of * queries. */ BackgroundExecutor backgroundExecutor(); - /** - * Deprecated migrate to backgroundExecutor(). - */ - @Deprecated - default BackgroundExecutor getBackgroundExecutor() { - return backgroundExecutor(); - } - /** * Return the JsonContext for reading/writing JSON. *

From 8cbd98757e59857499d2cb5c02a3c3c7f17b7147 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 21:39:06 +1200 Subject: [PATCH 14/41] #2627 - ebean-agent - bump to ASM 9.3, support Java 19 bytecode --- ebean-autotune/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 2 +- ebean-kotlin/pom.xml | 2 +- ebean-postgis/pom.xml | 2 +- ebean-querybean/pom.xml | 2 +- ebean-redis/pom.xml | 2 +- ebean-test/pom.xml | 2 +- pom.xml | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 39690471b..fbba290e4 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -70,7 +70,7 @@ true - io.ebean.tile:enhancement:12.15.0 + io.ebean.tile:enhancement:13.1.0 diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 391fbbb65..d6191b65a 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -98,7 +98,7 @@ - io.ebean.tile:enhancement:12.15.0 + io.ebean.tile:enhancement:13.1.0 diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 5e5a5b79b..035369730 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -93,7 +93,7 @@ true - io.ebean.tile:enhancement:13.0.0 + io.ebean.tile:enhancement:13.1.0 diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 8cf5b9412..5d61cfe32 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -104,7 +104,7 @@ true - io.ebean.tile:enhancement:12.15.0 + io.ebean.tile:enhancement:13.1.0 diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index cee4c0d81..b6f397103 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -107,7 +107,7 @@ true - io.ebean.tile:enhancement:12.15.0 + io.ebean.tile:enhancement:13.1.0 diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 8cf719f18..cca7ba8b0 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -80,7 +80,7 @@ true - io.ebean.tile:enhancement:12.15.0 + io.ebean.tile:enhancement:13.1.0 diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 6a9a26b45..d7cc89dd7 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -266,7 +266,7 @@ true - io.ebean.tile:enhancement:12.15.0 + io.ebean.tile:enhancement:13.1.0 diff --git a/pom.xml b/pom.xml index 1827e931f..ac6930e01 100644 --- a/pom.xml +++ b/pom.xml @@ -46,8 +46,8 @@ 13.0.0 4.5 7.5 - 13.0.1-RC2 - 13.0.1-RC2 + 13.1.0 + 13.1.0 false From fe992125965f3e21bb9b0abcc641e272a16f2c8b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 6 Apr 2022 21:47:19 +1200 Subject: [PATCH 15/41] Bump to 13.1.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-ddl-generator/pom.xml | 8 ++++---- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++++----- ebean-kotlin/pom.xml | 6 +++--- ebean-postgis/pom.xml | 8 ++++---- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 10 +++++----- kotlin-querybean-generator/pom.xml | 8 ++++---- platforms/all/pom.xml | 24 ++++++++++++------------ platforms/db2/pom.xml | 4 ++-- platforms/h2/pom.xml | 4 ++-- platforms/hana/pom.xml | 4 ++-- platforms/hsqldb/pom.xml | 4 ++-- platforms/mysql/pom.xml | 4 ++-- platforms/nuodb/pom.xml | 4 ++-- platforms/oracle/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, 100 insertions(+), 100 deletions(-) diff --git a/composites/pom.xml b/composites/pom.xml index 96b149bf8..3b995d294 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index f005f26e3..fb97c3416 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index fbba290e4..ed834e190 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT @@ -26,7 +26,7 @@ io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided @@ -55,7 +55,7 @@ io.ebean ebean-platform-h2 - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 8399a76bb..b94728a58 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-core-type - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-ddl-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-externalmapping-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-externalmapping-xml - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-autotune - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-querybean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean querybean-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided io.ebean kotlin-querybean-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided io.ebean ebean-test - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean ebean-postgis - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-redis - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 5d5e93049..516dc41d5 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 081898f78..ac3c94665 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean-core @@ -41,19 +41,19 @@ io.ebean ebean-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-core-type - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-externalmapping-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT @@ -144,21 +144,21 @@ io.ebean ebean-platform-h2 - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean ebean-platform-postgres - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index d08a16c96..816a13fe5 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided @@ -58,7 +58,7 @@ io.ebean ebean-platform-all - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index abb0e5883..cedfe3181 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index d6191b65a..3cdde7400 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT @@ -28,7 +28,7 @@ io.ebean ebean-externalmapping-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT @@ -61,21 +61,21 @@ io.ebean ebean-platform-h2 - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean ebean-ddl-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 035369730..9f4147051 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 5d61cfe32..fc3721a16 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided @@ -73,7 +73,7 @@ io.ebean ebean-test - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index b6f397103..8d60d76d5 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean querybean-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean ebean-test - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index cca7ba8b0..75709db52 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided io.ebean ebean-querybean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean querybean-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test io.ebean ebean-test - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index d7cc89dd7..96b3617b9 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean test @@ -29,20 +29,20 @@ io.ebean ebean-platform-h2 - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT @@ -106,7 +106,7 @@ io.ebean ebean-platform-all - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 72895aa1f..ef34331a2 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index a912ee1db..6b21c6868 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean-platform-all @@ -14,57 +14,57 @@ io.ebean ebean-platform-h2 - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-db2 - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-hana - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-mysql - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-mariadb - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-nuodb - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-oracle - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-postgres - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT io.ebean diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index ff58d272f..98d482dee 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 0f88b983d..1e7cdcb89 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.0.1-SNAPSHOT + 13.1.0-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.1.0 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 provided @@ -55,7 +55,7 @@ io.ebean ebean-platform-h2 - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index b94728a58..af2421d29 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-api - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-core-type - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-ddl-generator - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-externalmapping-api - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-externalmapping-xml - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-autotune - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-querybean - 13.1.0-SNAPSHOT + 13.1.0 io.ebean querybean-generator - 13.1.0-SNAPSHOT + 13.1.0 provided io.ebean kotlin-querybean-generator - 13.1.0-SNAPSHOT + 13.1.0 provided io.ebean ebean-test - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean ebean-postgis - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-redis - 13.1.0-SNAPSHOT + 13.1.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 516dc41d5..889797188 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.1.0-SNAPSHOT + 13.1.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index ac3c94665..e4cd6bd1e 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.1.0 @@ -41,19 +41,19 @@ io.ebean ebean-api - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-core-type - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-externalmapping-api - 13.1.0-SNAPSHOT + 13.1.0 @@ -144,21 +144,21 @@ io.ebean ebean-platform-h2 - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean ebean-platform-postgres - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean ebean-platform-sqlserver - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 816a13fe5..48932c3e9 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.1.0-SNAPSHOT + 13.1.0 provided io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 provided @@ -58,7 +58,7 @@ io.ebean ebean-platform-all - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index cedfe3181..911128f22 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 3cdde7400..f360d683b 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,12 +4,12 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.1.0 ebean external mapping xml @@ -28,7 +28,7 @@ io.ebean ebean-externalmapping-api - 13.1.0-SNAPSHOT + 13.1.0 @@ -61,21 +61,21 @@ io.ebean ebean-platform-h2 - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean ebean-ddl-generator - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index fc3721a16..3358c4443 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 provided @@ -73,7 +73,7 @@ io.ebean ebean-test - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 8d60d76d5..c59e23b0a 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean querybean-generator - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean ebean-test - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 75709db52..f4df5124e 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.1.0-SNAPSHOT + 13.1.0 provided io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 provided io.ebean ebean-querybean - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean querybean-generator - 13.1.0-SNAPSHOT + 13.1.0 test io.ebean ebean-test - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 96b3617b9..b5c2df235 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean test @@ -29,20 +29,20 @@ io.ebean ebean-platform-h2 - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 provided io.ebean ebean-ddl-generator - 13.1.0-SNAPSHOT + 13.1.0 @@ -106,7 +106,7 @@ io.ebean ebean-platform-all - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index ef34331a2..0f9772d28 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0-SNAPSHOT + 13.1.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.1.0-SNAPSHOT + 13.1.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.1.0-SNAPSHOT + 13.1.0 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 13.1.0-SNAPSHOT + 13.1.0 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 6325cb624..bb80196b7 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean-platform-all @@ -14,68 +14,72 @@ io.ebean ebean-platform-h2 - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-clickhouse - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-db2 - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-hana - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-hsqldb - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-mysql - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-mariadb - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-nuodb - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-oracle - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-postgres - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-sqlanywhere - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-sqlite - 13.1.0-SNAPSHOT + 13.1.0 io.ebean ebean-platform-sqlserver - 13.1.0-SNAPSHOT + 13.1.0 + + + ebean-parent-13.1.0 + diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 9f10b40e3..bdd78cad6 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean-platform-clickhouse @@ -14,8 +14,12 @@ io.ebean ebean-api - 13.1.0-SNAPSHOT + 13.1.0 + + + ebean-parent-13.1.0 + diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 98d482dee..3b70748fb 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean-platform-db2 @@ -14,8 +14,12 @@ io.ebean ebean-api - 13.1.0-SNAPSHOT + 13.1.0 + + + ebean-parent-13.1.0 + diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 1e7cdcb89..ca36a0c99 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.0-SNAPSHOT + 13.1.0 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.1.0-SNAPSHOT + 13.1.0 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.1.0 + HEAD ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT provided @@ -55,7 +55,7 @@ io.ebean ebean-platform-h2 - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index af2421d29..0e33258bc 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-api - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-core-type - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-ddl-generator - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-externalmapping-api - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-externalmapping-xml - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-autotune - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-querybean - 13.1.0 + 13.1.1-SNAPSHOT io.ebean querybean-generator - 13.1.0 + 13.1.1-SNAPSHOT provided io.ebean kotlin-querybean-generator - 13.1.0 + 13.1.1-SNAPSHOT provided io.ebean ebean-test - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean ebean-postgis - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-redis - 13.1.0 + 13.1.1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 889797188..1458c0867 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.1.0 + 13.1.1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e4cd6bd1e..d7a9cf8dd 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.1.0 + HEAD @@ -41,19 +41,19 @@ io.ebean ebean-api - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-core-type - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-externalmapping-api - 13.1.0 + 13.1.1-SNAPSHOT @@ -144,21 +144,21 @@ io.ebean ebean-platform-h2 - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean ebean-platform-postgres - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 48932c3e9..e2c851ef2 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.1.0 + 13.1.1-SNAPSHOT provided io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT provided @@ -58,7 +58,7 @@ io.ebean ebean-platform-all - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 911128f22..f5802658e 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index f360d683b..6ae3710a1 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,12 +4,12 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.1.0 + HEAD ebean external mapping xml @@ -28,7 +28,7 @@ io.ebean ebean-externalmapping-api - 13.1.0 + 13.1.1-SNAPSHOT @@ -61,21 +61,21 @@ io.ebean ebean-platform-h2 - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean ebean-ddl-generator - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 3358c4443..903e0efe8 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT provided @@ -73,7 +73,7 @@ io.ebean ebean-test - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index c59e23b0a..7b547141b 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean querybean-generator - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean ebean-test - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index f4df5124e..8e0bd8d23 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.1.0 + 13.1.1-SNAPSHOT provided io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT provided io.ebean ebean-querybean - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean querybean-generator - 13.1.0 + 13.1.1-SNAPSHOT test io.ebean ebean-test - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index b5c2df235..7804e2024 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean test @@ -29,20 +29,20 @@ io.ebean ebean-platform-h2 - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.1.0 + 13.1.1-SNAPSHOT @@ -106,7 +106,7 @@ io.ebean ebean-platform-all - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 0f9772d28..dea21ab10 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.0 + 13.1.1-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.1.0 + 13.1.1-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.1.0 + 13.1.1-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 13.1.0 + 13.1.1-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index bb80196b7..564b8d066 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean-platform-all @@ -14,72 +14,68 @@ io.ebean ebean-platform-h2 - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-db2 - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-hana - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-mysql - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-oracle - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-postgres - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.1.0 + 13.1.1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.1.0 + 13.1.1-SNAPSHOT - - - ebean-parent-13.1.0 - diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index bdd78cad6..c39c9f51d 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean-platform-clickhouse @@ -14,12 +14,8 @@ io.ebean ebean-api - 13.1.0 + 13.1.1-SNAPSHOT - - - ebean-parent-13.1.0 - diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 3b70748fb..f9f40cb7d 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean-platform-db2 @@ -14,12 +14,8 @@ io.ebean ebean-api - 13.1.0 + 13.1.1-SNAPSHOT - - - ebean-parent-13.1.0 - diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index ca36a0c99..d2b30ab17 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.0 + 13.1.1-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.1.0 + 13.1.1-SNAPSHOT @@ -26,7 +26,7 @@ io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided @@ -55,7 +55,7 @@ io.ebean ebean-platform-h2 - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 0e33258bc..94cd1ef59 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-core-type - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-ddl-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-externalmapping-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-externalmapping-xml - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-autotune - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-querybean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean querybean-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided io.ebean kotlin-querybean-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided io.ebean ebean-test - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean ebean-postgis - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-redis - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 1458c0867..e90df18d2 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index d7a9cf8dd..86156a84f 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean-core @@ -41,19 +41,19 @@ io.ebean ebean-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-core-type - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-externalmapping-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT @@ -144,21 +144,21 @@ io.ebean ebean-platform-h2 - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean ebean-platform-postgres - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index e2c851ef2..8b229e324 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided @@ -58,7 +58,7 @@ io.ebean ebean-platform-all - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index f5802658e..f030e4d5a 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 6ae3710a1..3bf4a62fa 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT @@ -28,7 +28,7 @@ io.ebean ebean-externalmapping-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT @@ -61,21 +61,21 @@ io.ebean ebean-platform-h2 - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean ebean-ddl-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index fe61dc9d0..7cd34e5ab 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 903e0efe8..d4cdff7c5 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided @@ -73,7 +73,7 @@ io.ebean ebean-test - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 7b547141b..abaca122f 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean querybean-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean ebean-test - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 8e0bd8d23..839083d4f 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided io.ebean ebean-querybean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean querybean-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test io.ebean ebean-test - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 7804e2024..bb9a58fc0 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean test @@ -29,20 +29,20 @@ io.ebean ebean-platform-h2 - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT @@ -106,7 +106,7 @@ io.ebean ebean-platform-all - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index dea21ab10..3f6491ce4 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 564b8d066..568059ad3 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-db2 - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-hana - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-mysql - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-mariadb - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-nuodb - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-oracle - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-postgres - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-sqlite - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index c39c9f51d..e4680320e 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index f9f40cb7d..08d44a40c 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index d2b30ab17..56e8c2d48 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.1.1-SNAPSHOT + 13.2.0-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.2.0 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 provided @@ -55,7 +55,7 @@ io.ebean ebean-platform-h2 - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 94cd1ef59..6dc24e21c 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-api - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-core-type - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-ddl-generator - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-externalmapping-api - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-externalmapping-xml - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-autotune - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-querybean - 13.2.0-SNAPSHOT + 13.2.0 io.ebean querybean-generator - 13.2.0-SNAPSHOT + 13.2.0 provided io.ebean kotlin-querybean-generator - 13.2.0-SNAPSHOT + 13.2.0 provided io.ebean ebean-test - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean ebean-postgis - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-redis - 13.2.0-SNAPSHOT + 13.2.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index e90df18d2..78ae009d7 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.2.0-SNAPSHOT + 13.2.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 86156a84f..bc9904f04 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.2.0 @@ -41,19 +41,19 @@ io.ebean ebean-api - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-core-type - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-externalmapping-api - 13.2.0-SNAPSHOT + 13.2.0 @@ -144,21 +144,21 @@ io.ebean ebean-platform-h2 - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean ebean-platform-postgres - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean ebean-platform-sqlserver - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 8b229e324..d68fe1302 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.2.0-SNAPSHOT + 13.2.0 provided io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 provided @@ -58,7 +58,7 @@ io.ebean ebean-platform-all - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index f030e4d5a..f3df17eeb 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 3bf4a62fa..c9a6b8bcc 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,12 +4,12 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.2.0 ebean external mapping xml @@ -28,7 +28,7 @@ io.ebean ebean-externalmapping-api - 13.2.0-SNAPSHOT + 13.2.0 @@ -61,21 +61,21 @@ io.ebean ebean-platform-h2 - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean ebean-ddl-generator - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index d4cdff7c5..375b80d78 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 provided @@ -73,7 +73,7 @@ io.ebean ebean-test - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index abaca122f..a8987f6cc 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean querybean-generator - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean ebean-test - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 839083d4f..9fead0ad2 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.2.0-SNAPSHOT + 13.2.0 provided io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 provided io.ebean ebean-querybean - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean querybean-generator - 13.2.0-SNAPSHOT + 13.2.0 test io.ebean ebean-test - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index bb9a58fc0..a87ab8b79 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean test @@ -29,20 +29,20 @@ io.ebean ebean-platform-h2 - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 provided io.ebean ebean-ddl-generator - 13.2.0-SNAPSHOT + 13.2.0 @@ -106,7 +106,7 @@ io.ebean ebean-platform-all - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 3f6491ce4..65d4036e4 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0-SNAPSHOT + 13.2.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.2.0-SNAPSHOT + 13.2.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.2.0-SNAPSHOT + 13.2.0 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 13.2.0-SNAPSHOT + 13.2.0 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 568059ad3..5d2105e3c 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean-platform-all @@ -14,68 +14,72 @@ io.ebean ebean-platform-h2 - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-clickhouse - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-db2 - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-hana - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-hsqldb - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-mysql - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-mariadb - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-nuodb - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-oracle - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-postgres - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-sqlanywhere - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-sqlite - 13.2.0-SNAPSHOT + 13.2.0 io.ebean ebean-platform-sqlserver - 13.2.0-SNAPSHOT + 13.2.0 + + + ebean-parent-13.2.0 + diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index e4680320e..3d9f73108 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean-platform-clickhouse @@ -14,8 +14,12 @@ io.ebean ebean-api - 13.2.0-SNAPSHOT + 13.2.0 + + + ebean-parent-13.2.0 + diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 08d44a40c..d7ea110a9 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean-platform-db2 @@ -14,8 +14,12 @@ io.ebean ebean-api - 13.2.0-SNAPSHOT + 13.2.0 + + + ebean-parent-13.2.0 + diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 56e8c2d48..317ae752e 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.0-SNAPSHOT + 13.2.0 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.2.0-SNAPSHOT + 13.2.0 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.2.0 + HEAD ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT provided @@ -55,7 +55,7 @@ io.ebean ebean-platform-h2 - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 6dc24e21c..0f3734bc1 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-api - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-core-type - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-ddl-generator - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-externalmapping-api - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-externalmapping-xml - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-autotune - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-querybean - 13.2.0 + 13.2.1-SNAPSHOT io.ebean querybean-generator - 13.2.0 + 13.2.1-SNAPSHOT provided io.ebean kotlin-querybean-generator - 13.2.0 + 13.2.1-SNAPSHOT provided io.ebean ebean-test - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean ebean-postgis - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-redis - 13.2.0 + 13.2.1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 78ae009d7..f5c522577 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.2.0 + 13.2.1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index bc9904f04..135ff7195 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.2.0 + HEAD @@ -41,19 +41,19 @@ io.ebean ebean-api - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-core-type - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-externalmapping-api - 13.2.0 + 13.2.1-SNAPSHOT @@ -144,21 +144,21 @@ io.ebean ebean-platform-h2 - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean ebean-platform-postgres - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index d68fe1302..635d2a5be 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.2.0 + 13.2.1-SNAPSHOT provided io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT provided @@ -58,7 +58,7 @@ io.ebean ebean-platform-all - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index f3df17eeb..ab0d8ab46 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index c9a6b8bcc..a0dbc8e30 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,12 +4,12 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.2.0 + HEAD ebean external mapping xml @@ -28,7 +28,7 @@ io.ebean ebean-externalmapping-api - 13.2.0 + 13.2.1-SNAPSHOT @@ -61,21 +61,21 @@ io.ebean ebean-platform-h2 - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean ebean-ddl-generator - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 375b80d78..4bd17df14 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT provided @@ -73,7 +73,7 @@ io.ebean ebean-test - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index a8987f6cc..ba35a8d5d 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean querybean-generator - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean ebean-test - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 9fead0ad2..1bb88ca42 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.2.0 + 13.2.1-SNAPSHOT provided io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT provided io.ebean ebean-querybean - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean querybean-generator - 13.2.0 + 13.2.1-SNAPSHOT test io.ebean ebean-test - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index a87ab8b79..2bc1b3a1c 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean test @@ -29,20 +29,20 @@ io.ebean ebean-platform-h2 - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.2.0 + 13.2.1-SNAPSHOT @@ -106,7 +106,7 @@ io.ebean ebean-platform-all - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 65d4036e4..74517c4f8 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.0 + 13.2.1-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.2.0 + 13.2.1-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.2.0 + 13.2.1-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 13.2.0 + 13.2.1-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 5d2105e3c..d66032532 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean-platform-all @@ -14,72 +14,68 @@ io.ebean ebean-platform-h2 - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-db2 - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-hana - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-mysql - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-oracle - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-postgres - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.2.0 + 13.2.1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.2.0 + 13.2.1-SNAPSHOT - - - ebean-parent-13.2.0 - diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 3d9f73108..6650a82b3 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean-platform-clickhouse @@ -14,12 +14,8 @@ io.ebean ebean-api - 13.2.0 + 13.2.1-SNAPSHOT - - - ebean-parent-13.2.0 - diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index d7ea110a9..260cfda65 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean-platform-db2 @@ -14,12 +14,8 @@ io.ebean ebean-api - 13.2.0 + 13.2.1-SNAPSHOT - - - ebean-parent-13.2.0 - diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 317ae752e..5bb72c6c0 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.0 + 13.2.1-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.2.0 + 13.2.1-SNAPSHOT - io.ebean.tile:enhancement:13.1.0 + io.ebean.tile:enhancement:13.3.0 diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 99bdb163e..20b275b10 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -93,7 +93,7 @@ true - io.ebean.tile:enhancement:13.1.0 + io.ebean.tile:enhancement:13.3.0 diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 4bd17df14..1263e02a0 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -104,7 +104,7 @@ true - io.ebean.tile:enhancement:13.1.0 + io.ebean.tile:enhancement:13.3.0 diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index ba35a8d5d..cb9b8f6d8 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -107,7 +107,7 @@ true - io.ebean.tile:enhancement:13.1.0 + io.ebean.tile:enhancement:13.3.0 diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 5b30a545e..e66c5fca3 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -80,7 +80,7 @@ true - io.ebean.tile:enhancement:13.1.0 + io.ebean.tile:enhancement:13.3.0 diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 891833dab..276dd963b 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -266,7 +266,7 @@ true - io.ebean.tile:enhancement:13.1.0 + io.ebean.tile:enhancement:13.3.0 diff --git a/pom.xml b/pom.xml index 0e0ae3d2b..174cc74da 100644 --- a/pom.xml +++ b/pom.xml @@ -46,8 +46,8 @@ 13.0.0 4.6 7.5 - 13.2.1-RC1 - 13.2.1-RC1 + 13.3.0 + 13.3.0 false From 0a43b64f71e66156e8229905fa6d717e57372616 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 11 Apr 2022 13:52:30 +1200 Subject: [PATCH 39/41] #2641 - Add a simple integration test for toString() implementation --- ebean-querybean/src/test/java/org/querytest/QCustomerTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index 2b2ed7567..bd1378ab0 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -270,6 +270,9 @@ public class QCustomerTest { assertThat(foo).hasSize(1); } + + Customer customer = DB.find(Customer.class, cust.getId()); + assertThat(customer.toString()).contains("Customer@0(id:1, status:GOOD, inactive:false, name:usingConnection, version:1, whenCreated:"); } @Test From 4b8eadad1c3f3c0fbd4612eb17064025d1432bcc Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 11 Apr 2022 14:00:45 +1200 Subject: [PATCH 40/41] Bump to 13.3.0-SNAPSHOT --- composites/ebean-clickhouse/pom.xml | 10 +++---- composites/ebean-cockroach/pom.xml | 10 +++---- composites/ebean-db2/pom.xml | 10 +++---- composites/ebean-h2/pom.xml | 10 +++---- composites/ebean-hana/pom.xml | 10 +++---- composites/ebean-mariadb/pom.xml | 10 +++---- composites/ebean-mysql/pom.xml | 10 +++---- composites/ebean-nuodb/pom.xml | 10 +++---- composites/ebean-oracle/pom.xml | 10 +++---- composites/ebean-postgres/pom.xml | 10 +++---- composites/ebean-sqlite/pom.xml | 10 +++---- composites/ebean-sqlserver/pom.xml | 10 +++---- composites/ebean-yugabyte/pom.xml | 10 +++---- composites/ebean/pom.xml | 10 +++---- 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-ddl-generator/pom.xml | 8 ++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++---- ebean-kotlin/pom.xml | 6 ++-- ebean-postgis/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++---- .../java/org/querytest/QCustomerTest.java | 5 +++- ebean-redis/pom.xml | 12 ++++---- ebean-test/pom.xml | 10 +++---- kotlin-querybean-generator/pom.xml | 8 ++--- platforms/all/pom.xml | 28 ++++++++--------- platforms/clickhouse/pom.xml | 4 +-- platforms/db2/pom.xml | 4 +-- platforms/h2/pom.xml | 4 +-- platforms/hana/pom.xml | 4 +-- platforms/hsqldb/pom.xml | 4 +-- platforms/mariadb/pom.xml | 6 ++-- platforms/mysql/pom.xml | 4 +-- platforms/nuodb/pom.xml | 4 +-- platforms/oracle/pom.xml | 4 +-- platforms/pom.xml | 2 +- platforms/postgres/pom.xml | 4 +-- platforms/sqlanywhere/pom.xml | 4 +-- platforms/sqlite/pom.xml | 4 +-- platforms/sqlserver/pom.xml | 4 +-- pom.xml | 2 +- querybean-generator/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 4 +-- 49 files changed, 189 insertions(+), 186 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index 8ecb26efa..168c64b5d 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-clickhouse @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index 244b01a02..0b11f8e63 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-cockroach @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-postgres - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index 0c99fa624..5af1fa1ef 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-db2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-db2 - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 82a1746c8..e27f722c1 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-h2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-h2 - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index de3f8fa55..8e18af012 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-hana @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-hana - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 0dc1b248c..311af73ee 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-mariadb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-mariadb - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index cf02d8aaa..883e05f73 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-mysql @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-mysql - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index f9d58d6d9..565aac29c 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-nuodb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-nuodb - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index 193e29d76..159917357 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-oracle @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-oracle - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index 4cfbe85de..313d9fe07 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-postgres @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-postgres - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index 70b103b47..f89ebc5f1 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-sqlite @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-sqlite - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 10b99d548..ddfd35458 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-sqlserver @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index b5af0c370..8b1a9b582 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-yugabyte @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-postgres - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index bdc1eb785..48e5146f8 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean (all platforms) @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -35,13 +35,13 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-all - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/composites/pom.xml b/composites/pom.xml index 0db0e9108..8cf659c0c 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 4d91ac7b3..280698ef9 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 71b84817e..b19e9e84b 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -26,7 +26,7 @@ io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided @@ -55,7 +55,7 @@ io.ebean ebean-platform-h2 - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 0f3734bc1..4e1d40ef0 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core-type - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-ddl-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-externalmapping-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-externalmapping-xml - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-autotune - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean querybean-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided io.ebean kotlin-querybean-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided io.ebean ebean-test - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean ebean-postgis - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-redis - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index f5c522577..bfc7a9b9a 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 135ff7195..5b8f5aba8 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-core @@ -41,19 +41,19 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core-type - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-externalmapping-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -144,21 +144,21 @@ io.ebean ebean-platform-h2 - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean ebean-platform-postgres - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 635d2a5be..b9931c137 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided @@ -58,7 +58,7 @@ io.ebean ebean-platform-all - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index ab0d8ab46..144f066e7 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 73c04e508..1722c1d61 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -28,7 +28,7 @@ io.ebean ebean-externalmapping-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -61,21 +61,21 @@ io.ebean ebean-platform-h2 - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean ebean-ddl-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 20b275b10..b7fd2e89e 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 1263e02a0..b5c399b83 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided @@ -73,7 +73,7 @@ io.ebean ebean-test - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index cb9b8f6d8..bfdb92ad7 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean querybean-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean ebean-test - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java index bd1378ab0..7cb4c630f 100644 --- a/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java +++ b/ebean-querybean/src/test/java/org/querytest/QCustomerTest.java @@ -272,7 +272,10 @@ public class QCustomerTest { } Customer customer = DB.find(Customer.class, cust.getId()); - assertThat(customer.toString()).contains("Customer@0(id:1, status:GOOD, inactive:false, name:usingConnection, version:1, whenCreated:"); + assert customer != null; + String customerToString = customer.toString(); + assertThat(customerToString).contains("Customer@0(id:"); + assertThat(customerToString).contains(", status:GOOD, inactive:false, name:usingConnection, version:1, whenCreated:"); } @Test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index e66c5fca3..32036c8bc 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean querybean-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test io.ebean ebean-test - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 276dd963b..1ca3e3e77 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean test @@ -29,20 +29,20 @@ io.ebean ebean-platform-h2 - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT @@ -106,7 +106,7 @@ io.ebean ebean-platform-all - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 74517c4f8..3d2d7e1fe 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index d66032532..72f0b03bc 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-db2 - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-hana - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-mysql - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-mariadb - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-nuodb - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-oracle - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-postgres - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-sqlite - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 6650a82b3..ca1b257a6 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 260cfda65..c7cbca8d9 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 5bb72c6c0..2173463f7 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.2.1-SNAPSHOT + 13.3.0-SNAPSHOT