From 618bb04827bdeb3950bae10b3e475ac1ae45a5e3 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:03:17 +0200 Subject: [PATCH 001/123] PR #2759 - FIX: DbForeignkey with noConstraint and NotNull produces incorrect join type --- .../deploy/parse/AnnotationAssocOnes.java | 2 +- .../lazyforeignkeys/MainEntityRelation.java | 15 ++++++++++++++ .../lazyforeignkeys/TestLazyForeignKeys.java | 20 ++++++++++++++++++- .../query/other/TestQuerySingleAttribute.java | 6 ++++++ 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index 97e3c3c8fb..6ca1243bb2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java @@ -122,7 +122,7 @@ private void readAssocOne(DeployBeanPropertyAssocOne prop) { } } - prop.setJoinType(prop.isNullable()); + prop.setJoinType(prop.isNullable() || prop.getForeignKey() != null && prop.getForeignKey().isNoConstraint()); if (!prop.getTableJoin().hasJoinColumns() && beanTable != null) { diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 8f36be0cbc..280b4221cb 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -1,6 +1,7 @@ package org.tests.lazyforeignkeys; import io.ebean.annotation.DbForeignKey; +import io.ebean.annotation.NotNull; import org.tests.model.basic.Cat; import javax.persistence.*; @@ -29,6 +30,12 @@ public class MainEntityRelation { @DbForeignKey(noConstraint = true) private Cat cat; + @ManyToOne + @NotNull + @JoinColumn(name = "cat2_id") + @DbForeignKey(noConstraint = true) + private Cat cat2; + private String attr1; public MainEntity getEntity1() { @@ -55,6 +62,14 @@ public void setCat(Cat cat) { this.cat = cat; } + public Cat getCat2() { + return cat2; + } + + public void setCat2(Cat cat2) { + this.cat2 = cat2; + } + public String getAttr1() { return attr1; } diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index f88f148297..771862a953 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -10,9 +10,11 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Cat; +import javax.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.*; public class TestLazyForeignKeys extends BaseTestCase { @@ -32,6 +34,10 @@ public void prepare() { rel1.setEntity1(e1); rel1.setEntity2(e2); + + Cat cat = new Cat(); + cat.setId(4711L); + rel1.setCat2(cat); DB.save(rel1); } @@ -57,13 +63,25 @@ public void testFindOne() throws Exception { List sql = LoggedSql.stop(); assertThat(sql).hasSize(3); - assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2, t1.species, t0.cat_id from main_entity_relation t0 left join animal t1 on t1.id = t0.cat_id"); + assertSql(sql.get(0)).contains("select t0.id, t0.attr1, t0.id1, t0.id2, t1.species, t0.cat_id, t2.species, t0.cat2_id " + + "from main_entity_relation t0 left join animal t1 on t1.id = t0.cat_id left join animal t2 on t2.id = t0.cat2_id"); if (isSqlServer() || isOracle()) { assertSql(sql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, CASE WHEN t0.id is null THEN 1 ELSE 0 END from main_entity t0"); } else { assertSql(sql.get(1)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0"); assertSql(sql.get(2)).contains("select t0.id, t0.attr1, t0.attr2, t0.id is null from main_entity t0"); } + + assertThat(rel1.getCat2().getId()).isEqualTo(4711L); + assertThatThrownBy(() -> rel1.getCat2().getName()).isInstanceOf(EntityNotFoundException.class); + + Cat cat = new Cat(); + cat.setId(4711L); + cat.setName("miau"); + DB.save(cat); + + DB.refresh(rel1); + assertThat(rel1.getCat2().getName()).isEqualTo("miau"); } @Test diff --git a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java index db02e5edaa..21d00265df 100644 --- a/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java +++ b/ebean-test/src/test/java/org/tests/query/other/TestQuerySingleAttribute.java @@ -825,19 +825,25 @@ void setup() { e3.setAttr1("a1"); DB.save(e3); + // we need a cat that does not exist in database + Cat cat = DB.reference(Cat.class, 4711); + MainEntityRelation rel = new MainEntityRelation(); rel.setEntity1(e1); rel.setEntity2(e1); + rel.setCat2(cat); DB.save(rel); rel = new MainEntityRelation(); rel.setEntity1(e2); rel.setEntity2(e2); + rel.setCat2(cat); DB.save(rel); rel = new MainEntityRelation(); rel.setEntity1(e3); rel.setEntity2(e3); + rel.setCat2(cat); DB.save(rel); } From bb6fcc75fa19e2ba98b6cf9fd1373bbe7c951da1 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:06:05 +0200 Subject: [PATCH 002/123] PR #2773 - Bug: fetch and where with formula join will produce incorrect joins --- .../server/query/SqlTreeBuilder.java | 5 - .../org/tests/model/family/ChildPerson.java | 2 +- .../query/joins/TestQueryJoinOnFormula.java | 126 ++++++++++++++---- 3 files changed, 101 insertions(+), 32 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java index 8a2465293d..448dc4c4e9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java @@ -673,11 +673,6 @@ private SqlTreeNodeExtraJoin findExtraJoinRoot(String includeProp, SqlTreeNodeEx } else { // look in register ... String parentPropertyName = includeProp.substring(0, dotPos); - if (selectIncludes.contains(parentPropertyName)) { - // parent already handled by select - return childJoin; - } - SqlTreeNodeExtraJoin parentJoin = joinRegister.get(parentPropertyName); if (parentJoin == null) { // we need to create this the parent implicitly... diff --git a/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java index a0139709c3..f4f62d71b5 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java @@ -29,7 +29,7 @@ public class ChildPerson extends InheritablePerson { @Formula(select = "coalesce(${ta}.address, j1.address, j2.address)", join = PARENTS_JOIN) private String effectiveAddress; - @Formula(select = "coalesce(${ta}.some_bean_id, j1.some_bean_id, j2.some_bean_id)") + @Formula(select = "coalesce(${ta}.some_bean_id, j1.some_bean_id, j2.some_bean_id)", join = PARENTS_JOIN) @ManyToOne private EBasic effectiveBean; diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index 66c2a76162..3b28d33783 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -1,9 +1,9 @@ package org.tests.query.joins; -import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; @@ -31,8 +31,8 @@ public void test_OrderFindIds() { LoggedSql.start(); List orderIds = DB.find(Order.class) - .where().eq("totalItems", 3) - .findIds(); + .where().eq("totalItems", 3) + .findIds(); assertThat(orderIds).hasSize(2); List loggedSql = LoggedSql.stop(); @@ -46,8 +46,8 @@ public void test_OrderFindList() { LoggedSql.start(); List orders = DB.find(Order.class) - .where().eq("totalItems", 3) - .findList(); + .where().eq("totalItems", 3) + .findList(); assertThat(orders).hasSize(2); List loggedSql = LoggedSql.stop(); @@ -122,11 +122,11 @@ public void testWhereOnChainedFormulaManyWhere() { } assertThat(shipQuery.getGeneratedSql()).contains( "from or_order_ship t0 " + - "join o_order u1 on u1.id = t0.order_id " + - "join or_order_ship u2 on u2.order_id = u1.id " + - "join o_order u3 on u3.id = u2.order_id " + - "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bu3 on z_bu3.order_id = u3.id " + - "where z_bu3.total_amount is not null"); + "join o_order u1 on u1.id = t0.order_id " + + "join or_order_ship u2 on u2.order_id = u1.id " + + "join o_order u3 on u3.id = u2.order_id " + + "left join (select order_id, count(*) as total_items, sum(order_qty*unit_price) as total_amount from o_order_detail group by order_id) z_bu3 on z_bu3.order_id = u3.id " + + "where z_bu3.total_amount is not null"); } @Test @@ -188,9 +188,9 @@ public void test_OrderFindSingleAttributeList() { LoggedSql.start(); List orderDates = DB.find(Order.class) - .select("orderDate") - .where().eq("totalItems", 3) - .findSingleAttributeList(); + .select("orderDate") + .where().eq("totalItems", 3) + .findSingleAttributeList(); assertThat(orderDates).hasSize(2); List sql = LoggedSql.stop(); @@ -205,11 +205,11 @@ public void test_OrderFindOne() { LoggedSql.start(); Order order = DB.find(Order.class) - .select("totalItems") - .where().eq("totalItems", 3) - .setMaxRows(1) - .orderById(true) - .findOne(); + .select("totalItems") + .where().eq("totalItems", 3) + .setMaxRows(1) + .orderById(true) + .findOne(); assertThat(order.getTotalItems()).isEqualTo(3); @@ -229,8 +229,8 @@ public void test_ParentPersonFindIds() { LoggedSql.start(); List orderIds = DB.find(ParentPerson.class) - .where().eq("totalAge", 3) - .findIds(); + .where().eq("totalAge", 3) + .findIds(); List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); @@ -243,10 +243,10 @@ public void test_ParentPersonFindList() { LoggedSql.start(); DB.find(ParentPerson.class) - .select("identifier") - //.where().eq("totalAge", 3) - .where().eq("familyName", "foo") - .findList(); + .select("identifier") + //.where().eq("totalAge", 3) + .where().eq("familyName", "foo") + .findList(); List sql = LoggedSql.stop(); assertEquals(1, sql.size()); @@ -323,12 +323,86 @@ public void test_ChildPersonParentFindCount() { LoggedSql.start(); DB.find(ChildPerson.class) - .where().eq("parent.totalAge", 3) - .findCount(); + .where().eq("parent.totalAge", 3) + .findCount(); List loggedSql = LoggedSql.stop(); assertEquals(1, loggedSql.size()); assertThat(loggedSql.get(0)).contains("select count(*) from child_person t0 left join parent_person t1 on t1.identifier = t0.parent_identifier"); assertThat(loggedSql.get(0)).contains("where coalesce(f2.child_age, 0) = ?"); } + + @Test + public void test_fetch_only() { + + LoggedSql.start(); + + DB.find(ChildPerson.class).select("name").fetch("parent.effectiveBean").findList(); + + List loggedSql = LoggedSql.stop(); + assertThat(loggedSql.get(0)).contains("from child_person t0 " + + "left join parent_person t1 on t1.identifier = t0.parent_identifier " + + "left join grand_parent_person j1 on j1.identifier = t1.parent_identifier " + + "left join e_basic t2 on t2.id = coalesce(t1.some_bean_id, j1.some_bean_id)"); + } + + @Test + public void test_where_only() { + + LoggedSql.start(); + + DB.find(ChildPerson.class).select("name") + .where().eq("parent.effectiveBean.name", "foo") + .findList(); + + List loggedSql = LoggedSql.stop(); + assertThat(loggedSql.get(0)) + .contains("from child_person t0 " + + "left join parent_person t1 on t1.identifier = t0.parent_identifier " + + "left join grand_parent_person j1 on j1.identifier = t1.parent_identifier " + + "left join e_basic t2 on t2.id = coalesce(t1.some_bean_id, j1.some_bean_id) " + + "where t2.name = ?"); + } + + @Test + public void test_fetch_one_prop_with_where() { + + LoggedSql.start(); + + DB.find(ChildPerson.class).select("name") + .fetch("parent", "name") + //.fetch("parent.effectiveBean", "name") + .where().eq("parent.effectiveBean.name", "foo") + .findList(); + + List loggedSql = LoggedSql.stop(); + assertThat(loggedSql.get(0)) + .contains("from child_person t0 " + + "left join parent_person t1 on t1.identifier = t0.parent_identifier " + + "left join grand_parent_person j1 on j1.identifier = t1.parent_identifier " + + "left join e_basic t2 on t2.id = coalesce(t1.some_bean_id, j1.some_bean_id)" + + " where t2.name = ?" + ); + } + + @Test + public void test_fetch_complete_with_where() { + + LoggedSql.start(); + + DB.find(ChildPerson.class).select("name") + .fetch("parent") + .where().eq("parent.effectiveBean.name", "foo") + .findList(); + + List loggedSql = LoggedSql.stop(); + assertThat(loggedSql.get(0)) + .contains("from child_person t0 " + + "left join parent_person t1 on t1.identifier = t0.parent_identifier " + + "left join (select i2.parent_identifier, count(*) as child_count, sum(i2.age) as child_age from child_person i2 group by i2.parent_identifier) f2 on f2.parent_identifier = t1.identifier " + + "left join grand_parent_person j1 on j1.identifier = t1.parent_identifier " + + "left join e_basic t2 on t2.id = coalesce(t1.some_bean_id, j1.some_bean_id) " + + "where t2.name = ?"); + } + } From cd2cff013074d709eb53db242b3b7d11c30468fc Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:15:43 +0200 Subject: [PATCH 003/123] PR #2937 - Optimized cache handling (QueryCache for findId, use QueryCache before BeanCache) --- .../server/core/DefaultServer.java | 119 ++++++++++-------- .../server/core/OrmQueryRequest.java | 77 ++++++++---- .../server/core/SpiOrmQueryRequest.java | 15 +++ .../io/ebeaninternal/server/query/CQuery.java | 3 - .../server/query/CQueryEngine.java | 5 - .../query/CQueryFetchSingleAttribute.java | 4 - .../server/query/CQueryRowCount.java | 4 - .../server/query/DefaultOrmQueryEngine.java | 9 +- .../tests/basic/TestDeleteByIdCollection.java | 4 + .../java/org/tests/cache/TestBeanCache.java | 113 ++++++++++++++++- .../java/org/tests/cache/TestQueryCache.java | 88 +++++++++++++ .../org/tests/model/basic/OCachedBean.java | 2 +- 12 files changed, 349 insertions(+), 94 deletions(-) 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 42699be59e..4295f2aec6 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 @@ -976,40 +976,6 @@ private SpiOrmQueryRequest buildQueryRequest(SpiQuery query, @Nullable return new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) transaction); } - /** - * Try to get the object out of the persistence context. - */ - @Nullable - @SuppressWarnings("unchecked") - private T findIdCheckPersistenceContextAndCache(@Nullable Transaction transaction, SpiQuery query, Object id) { - SpiTransaction t = (SpiTransaction) transaction; - if (t == null) { - t = currentServerTransaction(); - } - BeanDescriptor desc = query.descriptor(); - id = desc.convertId(id); - PersistenceContext pc = null; - if (t != null && useTransactionPersistenceContext(query)) { - // first look in the transaction scoped persistence context - pc = t.persistenceContext(); - if (pc != null) { - WithOption o = desc.contextGetWithOption(pc, id); - if (o != null) { - if (o.isDeleted()) { - // Bean was previously deleted in the same transaction / persistence context - return null; - } - return (T) o.getBean(); - } - } - } - if (!query.isBeanCacheGet() || (t != null && t.isSkipCache())) { - return null; - } - // Hit the L2 bean cache - return desc.cacheBeanGet(id, query.isReadOnly(), pc); - } - /** * Return true if transactions PersistenceContext should be used. */ @@ -1031,15 +997,59 @@ public PersistenceContextScope persistenceContextScope(SpiQuery query) { private T findId(Query query, @Nullable Transaction transaction) { SpiQuery spiQuery = (SpiQuery) query; spiQuery.setType(Type.BEAN); + SpiOrmQueryRequest request = null; if (SpiQuery.Mode.NORMAL == spiQuery.mode() && !spiQuery.isForceHitDatabase()) { // See if we can skip doing the fetch completely by getting the bean from the // persistence context or the bean cache - T bean = findIdCheckPersistenceContextAndCache(transaction, spiQuery, spiQuery.getId()); - if (bean != null) { - return bean; + SpiTransaction t = (SpiTransaction) transaction; + if (t == null) { + t = currentServerTransaction(); } + BeanDescriptor desc = spiQuery.descriptor(); + Object id = desc.convertId(spiQuery.getId()); + PersistenceContext pc = null; + if (t != null && useTransactionPersistenceContext(spiQuery)) { + // first look in the transaction scoped persistence context + pc = t.persistenceContext(); + if (pc != null) { + WithOption o = desc.contextGetWithOption(pc, id); + if (o != null) { + // We have found a hit. This could be also one with o.deleted() == true + // if bean was previously deleted in the same transaction / persistence context + return (T) o.getBean(); + } + } + } + if (t == null || !t.isSkipCache()) { + if (spiQuery.queryCacheMode() != CacheMode.OFF) { + request = buildQueryRequest(spiQuery, transaction); + if (request.isQueryCacheActive()) { + // Hit the query cache + request.prepareQuery(); + T bean = request.getFromQueryCache(); + if (bean != null) { + return bean; + } + } + } + if (spiQuery.isBeanCacheGet()) { + // Hit the L2 bean cache + T bean = desc.cacheBeanGet(id, spiQuery.isReadOnly(), pc); + if (bean != null) { + if (request != null && request.isQueryCachePut()) { + // copy bean from the L2 cache to the faster query cache, if caching is enabled + request.prepareQuery(); + request.putToQueryCache(bean); + } + return bean; + } + } + } + } + + if (request == null) { + request = buildQueryRequest(spiQuery, transaction); } - SpiOrmQueryRequest request = buildQueryRequest(spiQuery, transaction); request.prepareQuery(); if (request.isUseDocStore()) { return docStore().find(request); @@ -1089,15 +1099,18 @@ private T extractUnique(List list) { public Set findSet(Query query, Transaction transaction) { SpiOrmQueryRequest request = buildQueryRequest(Type.SET, query, transaction); request.resetBeanCacheAutoMode(false); + if (request.isQueryCacheActive()) { + request.prepareQuery(); + Object result = request.getFromQueryCache(); + if (result != null) { + return (Set) result; + } + } if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) { // hit bean cache and got all results from cache return request.beanCacheHitsAsSet(); } request.prepareQuery(); - Object result = request.getFromQueryCache(); - if (result != null) { - return (Set) result; - } try { request.initTransIfRequired(); return request.findSet(); @@ -1110,16 +1123,19 @@ public Set findSet(Query query, Transaction transaction) { @SuppressWarnings({"unchecked", "rawtypes"}) public Map findMap(Query query, @Nullable Transaction transaction) { SpiOrmQueryRequest request = buildQueryRequest(Type.MAP, query, transaction); + if (request.isQueryCacheActive()) { + request.prepareQuery(); + Object result = request.getFromQueryCache(); + if (result != null) { + return (Map) result; + } + } request.resetBeanCacheAutoMode(false); if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) { // hit bean cache and got all results from cache return request.beanCacheHitsAsMap(); } request.prepareQuery(); - Object result = request.getFromQueryCache(); - if (result != null) { - return (Map) result; - } try { request.initTransIfRequired(); return request.findMap(); @@ -1396,15 +1412,18 @@ public List findList(Query query, Transaction transaction) { private List findList(Query query, @Nullable Transaction transaction, boolean findOne) { SpiOrmQueryRequest request = buildQueryRequest(Type.LIST, query, transaction); request.resetBeanCacheAutoMode(findOne); + if (request.isQueryCacheActive()) { + request.prepareQuery(); + Object result = request.getFromQueryCache(); + if (result != null) { + return (List) result; + } + } if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) { // hit bean cache and got all results from cache return request.beanCacheHits(); } request.prepareQuery(); - Object result = request.getFromQueryCache(); - if (result != null) { - return (List) result; - } if (request.isUseDocStore()) { return docStore().findList(request); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index e312771fd1..697730b7a4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -40,11 +40,13 @@ public final class OrmQueryRequest extends BeanRequest implements SpiOrmQuery private PersistenceContext persistenceContext; private HashQuery cacheKey; private CQueryPlanKey queryPlanKey; + // The queryPlan during the request. + private CQueryPlan queryPlan; private SpiQuerySecondary secondaryQueries; private List cacheBeans; private BeanPropertyAssocMany manyProperty; private boolean inlineCountDistinct; - private Set dependentTables; + private boolean prepared; public OrmQueryRequest(SpiEbeanServer server, OrmQueryEngine queryEngine, SpiQuery query, SpiTransaction t) { super(server, t); @@ -68,6 +70,7 @@ public boolean isDeleteByStatement() { } else { // delete by ids due to cascading delete needs queryPlanKey = query.setDeleteByIdsPlan(); + queryPlan = null; return false; } } @@ -172,10 +175,24 @@ private void adapterPreQuery() { */ @Override public void prepareQuery() { - secondaryQueries = query.convertJoins(); - beanDescriptor.prepareQuery(query); - adapterPreQuery(); - queryPlanKey = query.prepare(this); + if (!prepared) { + secondaryQueries = query.convertJoins(); + beanDescriptor.prepareQuery(query); + adapterPreQuery(); + queryPlanKey = query.prepare(this); + prepared = true; + } + + } + + /** + * The queryPlanKey has to be updated, if elements are removed from an already prepared query. + */ + private void updateQueryPlanKey() { + if (prepared) { + queryPlanKey = query.prepare(this); + queryPlan = null; + } } public boolean isNativeSql() { @@ -470,7 +487,10 @@ public BeanPropertyAssocMany manyPropertyForOrderBy() { * query plan for this query exists. */ public CQueryPlan queryPlan() { - return beanDescriptor.queryPlan(queryPlanKey); + if (queryPlan == null) { + queryPlan = beanDescriptor.queryPlan(queryPlanKey); + } + return queryPlan; } /** @@ -488,6 +508,7 @@ public CQueryPlanKey queryPlanKey() { * Put the QueryPlan into the cache. */ public void putQueryPlan(CQueryPlan queryPlan) { + this.queryPlan = queryPlan; beanDescriptor.queryPlan(queryPlanKey, queryPlan); } @@ -496,8 +517,16 @@ public void resetBeanCacheAutoMode(boolean findOne) { query.resetBeanCacheAutoMode(findOne); } + @Override + public boolean isQueryCacheActive() { + return query.queryCacheMode() != CacheMode.OFF + && (transaction == null || !transaction.isSkipCache()) + && !server.isDisableL2Cache(); + } + + @Override public boolean isQueryCachePut() { - return cacheKey != null && query.queryCacheMode().isPut(); + return cacheKey != null && queryPlan != null && query.queryCacheMode().isPut(); } public boolean isBeanCachePutMany() { @@ -606,7 +635,14 @@ public boolean getFromBeanCache() { BeanCacheResult cacheResult = beanDescriptor.cacheIdLookup(persistenceContext, idLookup.idValues()); // adjust the query (IN clause) based on the cache hits this.cacheBeans = idLookup.removeHits(cacheResult); - return idLookup.allHits(); + if (idLookup.allHits()) { + return true; + } else { + if (!this.cacheBeans.isEmpty()) { + updateQueryPlanKey(); + } + return false; + } } if (!beanDescriptor.isNaturalKeyCaching()) { return false; @@ -619,7 +655,14 @@ public boolean getFromBeanCache() { BeanCacheResult cacheResult = beanDescriptor.naturalKeyLookup(persistenceContext, naturalKeySet.keys()); // adjust the query (IN clause) based on the cache hits this.cacheBeans = data.removeHits(cacheResult); - return data.allHits(); + if (data.allHits()) { + return true; + } else { + if (!this.cacheBeans.isEmpty()) { + updateQueryPlanKey(); + } + return false; + } } } return false; @@ -631,9 +674,7 @@ public boolean getFromBeanCache() { @Override @SuppressWarnings("unchecked") public Object getFromQueryCache() { - if (query.queryCacheMode() == CacheMode.OFF - || (transaction != null && transaction.isSkipCache()) - || server.isDisableL2Cache()) { + if (!isQueryCacheActive()) { return null; } else { cacheKey = query.queryHash(); @@ -687,8 +728,9 @@ private boolean readAuditQueryType() { } } + @Override public void putToQueryCache(Object result) { - beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, dependentTables, transaction.startNanoTime())); + beanDescriptor.queryCachePut(cacheKey, new QueryCacheEntry(result, queryPlan.dependentTables(), transaction.startNanoTime())); } /** @@ -758,15 +800,6 @@ public boolean isInlineCountDistinct() { return inlineCountDistinct; } - public void addDependentTables(Set tables) { - if (tables != null && !tables.isEmpty()) { - if (dependentTables == null) { - dependentTables = new LinkedHashSet<>(); - } - dependentTables.addAll(tables); - } - } - /** * Return true if no MaxRows or use LIMIT in SQL update. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java index ff2c0ef541..fdff9dc364 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/SpiOrmQueryRequest.java @@ -135,6 +135,21 @@ public interface SpiOrmQueryRequest extends BeanQueryRequest, DocQueryRequ */ A getFromQueryCache(); + /** + * Return if query cache is active. + */ + boolean isQueryCacheActive(); + + /** + * Return if results should be put to query cache. + */ + boolean isQueryCachePut(); + + /** + * Put the result to the query cache. + */ + void putToQueryCache(Object result); + /** * Maybe hit the bean cache returning true if everything was obtained from the * cache (that there were no misses). diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index 36d35c6599..da853e7efe 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -754,7 +754,4 @@ public void handleLoadError(String fullName, Exception e) { query.handleLoadError(fullName, e); } - public Set dependentTables() { - return queryPlan.dependentTables(); - } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 2d89e09681..9bc46a2aa6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -100,7 +100,6 @@ private > A findAttributeCollection(OrmQueryRequest r request.transaction().logSummary(rcQuery.summary()); } if (request.isQueryCachePut()) { - request.addDependentTables(rcQuery.dependentTables()); if (collection instanceof List) { collection = (A) Collections.unmodifiableList((List) collection); request.putToQueryCache(collection); @@ -167,7 +166,6 @@ public int findCount(OrmQueryRequest request) { request.transaction().end(); } if (request.isQueryCachePut()) { - request.addDependentTables(rcQuery.dependentTables()); request.putToQueryCache(count); } return count; @@ -355,9 +353,6 @@ BeanCollection findMany(OrmQueryRequest request) { cquery.auditFindMany(); } request.executeSecondaryQueries(false); - if (request.isQueryCachePut()) { - request.addDependentTables(cquery.dependentTables()); - } return beanCollection; } catch (SQLException e) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java index a687beae5c..16d14d65a3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryFetchSingleAttribute.java @@ -168,10 +168,6 @@ public void profile() { .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.profileId()); } - Set dependentTables() { - return queryPlan.dependentTables(); - } - @Override public void cancel() { lock.lock(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index 4d43da157e..ca7073ea67 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -140,10 +140,6 @@ public void profile() { .addQueryEvent(query.profileEventId(), profileOffset, desc.name(), rowCount, query.profileId()); } - Set dependentTables() { - return queryPlan.dependentTables(); - } - @Override public void cancel() { lock.lock(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index a884a2d062..eed074283d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -160,8 +160,13 @@ public T findId(OrmQueryRequest request) { if (finder != null) { result = finder.postProcess(request, result); } - if (result != null && request.isBeanCachePut()) { - request.descriptor().cacheBeanPut((EntityBean) result); + if (result != null) { + if (request.isBeanCachePut()) { + request.descriptor().cacheBeanPut((EntityBean) result); + } + if (request.isQueryCachePut()) { + request.putToQueryCache(result); + } } return result; } diff --git a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java index 30f2239dee..d2737e89a3 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java +++ b/ebean-test/src/test/java/org/tests/basic/TestDeleteByIdCollection.java @@ -1,6 +1,7 @@ package org.tests.basic; import io.ebean.DB; +import io.ebean.test.LoggedSql; import io.ebean.xtest.base.TransactionalTestCase; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; @@ -10,6 +11,7 @@ import java.util.ArrayList; import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -41,8 +43,10 @@ public void test() { DB.deleteAll(Customer.class, ids); awaitL2Cache(); + LoggedSql.start(); c0Back = DB.find(Customer.class, c0.getId()); c1Back = DB.find(Customer.class, "" + c1.getId()); + assertThat(LoggedSql.stop()).isEmpty(); assertNull(c0Back); assertNull(c1Back); diff --git a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java index 2028a05071..d43fe65366 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestBeanCache.java @@ -16,6 +16,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -67,7 +68,7 @@ public void idsInFindMap() { // Test findIds LoggedSql.start(); - query.copy() + Map map1 = query.copy() .where().idIn(ids.subList(0, 1)) .findMap(); // cache key is: 3/d[{/c1000}]/w[List[IdIn[?1],]] if (isPostgresCompatible()) { @@ -77,7 +78,7 @@ public void idsInFindMap() { } LoggedSql.start(); - query.copy() + Map map2 = query.copy() .where().idIn(ids.subList(0, 4)) .findMap(); // cache key is: 3/d[{/c1000}]/w[List[IdIn[?5],]] if (isPostgresCompatible()) { @@ -87,7 +88,7 @@ public void idsInFindMap() { } LoggedSql.start(); - query.copy() + Map map3 = query.copy() .where().idIn(ids.subList(2, 6)) .findMap(); // same cache key as above and same SQL above if (isPostgresCompatible()) { @@ -95,6 +96,112 @@ public void idsInFindMap() { } else { assertThat(LoggedSql.stop().get(0)).contains("in (?,?,?,?,?)"); } + + ServerCache bc = DB.getDefault().pluginApi().cacheManager().beanCache(OCachedBean.class); + bc.statistics(true); + + ServerCache qc = DB.getDefault().pluginApi().cacheManager().queryCache(OCachedBean.class); + qc.statistics(true); + + LoggedSql.start(); + assertThat(query.copy() + .where().idIn(ids.subList(0, 1)) + .findMap()).isEqualTo(map1).isNotSameAs(map1); + + + assertThat(query.copy() + .where().idIn(ids.subList(0, 4)) + .findMap()).isEqualTo(map2).isNotSameAs(map2); + + assertThat(query.copy() + .where().idIn(ids.subList(2, 6)) + .findMap()).isEqualTo(map3).isNotSameAs(map3); + + assertThat(LoggedSql.stop()).isEmpty(); // we should have no DB-hits + + // we should have all beans in the bean cache, but no hits in the query cache + assertThat(bc.statistics(true).getHitCount()).isEqualTo(map1.size() + map2.size() + map3.size()); + assertThat(qc.statistics(true).getHitCount()).isEqualTo(0); + + // check with a different set, that should be in the cache + query.copy().where().idIn(ids.subList(2, 5)).findMap(); + assertThat(bc.statistics(true).getHitCount()).isEqualTo(3); + assertThat(qc.statistics(true).getHitCount()).isEqualTo(0); + + } + + + @Test + public void idsInFindMapWithBeanAndQueryCache() { + + List beans = createBeans(Arrays.asList("m0", "m1", "m2", "m3", "m4", "m5", "m6")); + List ids = beans.stream().map(OCachedBean::getId).collect(Collectors.toList()); + beanCache.clear(); + beanCache.statistics(true); + Query query = DB.find(OCachedBean.class) + .setUseCache(true) + .setUseQueryCache(true) + .setReadOnly(true); + + // Test findIds + LoggedSql.start(); + Map map1 = query.copy() + .where().idIn(ids.subList(0, 1)) + .findMap(); // cache key is: 3/d[{/c1000}]/w[List[IdIn[?1],]] + if (isPostgresCompatible()) { + assertThat(LoggedSql.stop().get(0)).contains("t0.id = any(?)"); + } else { + assertThat(LoggedSql.stop().get(0)).contains("in (?)"); + } + + LoggedSql.start(); + Map map2 = query.copy() + .where().idIn(ids.subList(0, 4)) + .findMap(); // cache key is: 3/d[{/c1000}]/w[List[IdIn[?5],]] + if (isPostgresCompatible()) { + assertThat(LoggedSql.stop().get(0)).contains("t0.id = any(?)"); + } else { + assertThat(LoggedSql.stop().get(0)).contains("in (?,?,?,?,?)"); + } + + LoggedSql.start(); + Map map3 = query.copy() + .where().idIn(ids.subList(2, 6)) + .findMap(); // same cache key as above and same SQL above + if (isPostgresCompatible()) { + assertThat(LoggedSql.stop().get(0)).contains("t0.id = any(?)"); + } else { + assertThat(LoggedSql.stop().get(0)).contains("in (?,?,?,?,?)"); + } + + ServerCache bc = DB.getDefault().pluginApi().cacheManager().beanCache(OCachedBean.class); + bc.statistics(true); + + ServerCache qc = DB.getDefault().pluginApi().cacheManager().queryCache(OCachedBean.class); + qc.statistics(true); + + LoggedSql.start(); + assertThat(query.copy() + .where().idIn(ids.subList(0, 1)) + .findMap()).isEqualTo(map1).isSameAs(map1); + + assertThat(query.copy() + .where().idIn(ids.subList(0, 4)) + .findMap()).isEqualTo(map2).isSameAs(map2); + + assertThat(query.copy() + .where().idIn(ids.subList(2, 6)) + .findMap()).isEqualTo(map3).isSameAs(map3); + + assertThat(LoggedSql.stop()).isEmpty(); // we should have no DB-hits + + assertThat(bc.statistics(true).getHitCount()).isEqualTo(0); + assertThat(qc.statistics(true).getHitCount()).isEqualTo(3); + + // check with a different set, that should be in the cache + query.copy().where().idIn(ids.subList(2, 5)).findMap(); + assertThat(bc.statistics(true).getHitCount()).isEqualTo(3); + assertThat(qc.statistics(true).getHitCount()).isEqualTo(0); } @Test diff --git a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java index 6970dce776..ed68ef88bb 100644 --- a/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java +++ b/ebean-test/src/test/java/org/tests/cache/TestQueryCache.java @@ -3,12 +3,14 @@ import io.ebean.CacheMode; import io.ebean.DB; import io.ebean.ExpressionList; +import io.ebean.Query; import io.ebean.annotation.Transactional; import io.ebean.annotation.TxIsolation; import io.ebean.bean.BeanCollection; import io.ebean.cache.ServerCache; import io.ebean.test.LoggedSql; import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; @@ -302,6 +304,92 @@ public void findCountFirstRecacheThenOn() { } + /** + * This test primarily checks, if the query cache on findById will work properly. + * + * It also checks some special cases, if query + bean cache are combined with other queries. + * It is important to know, that a "findId" query, that is not yet compiled will use the bean cache. + */ + @Test + @SuppressWarnings("unchecked") + public void testFindByIdWihtBothCaches() { + + ResetBasicData.reset(); + + List ids = DB.find(Customer.class).setMaxRows(5).findIds(); + Customer c = DB.find(Customer.class).setMaxRows(1).findOne(); + + DB.getDefault().pluginApi().cacheManager().clearAll(); + + ServerCache bc = DB.getDefault().pluginApi().cacheManager().beanCache(Customer.class); + ServerCache qc = DB.getDefault().pluginApi().cacheManager().queryCache(Customer.class); + bc.statistics(true); + qc.statistics(true); + + // 1. load the bean cache with some beans + DB.find(Customer.class).where().idIn(ids).findList(); + + Query q = DB.find(Customer.class).setUseQueryCache(true).setUseCache(true).setReadOnly(true); + LoggedSql.start(); + Customer c1 = q.copy().where().eq("name", c.getName()).findOne(); + Customer c2 = q.copy().where().eq("name", c.getName()).findOne(); + assertThat(LoggedSql.stop()).hasSize(1); + + assertTrue(DB.beanState(c1).isReadOnly()); + assertTrue(DB.beanState(c2).isReadOnly()); + assertThat(c1).isSameAs(c2); + assertThat(bc.statistics(true).getHitCount()).isEqualTo(0); + assertThat(qc.statistics(true).getHitCount()).isEqualTo(1); + + + LoggedSql.start(); + c1 = q.copy().where().eq("id", c.getId()).findOne(); + c2 = q.copy().where().eq("id", c.getId()).findOne(); + assertThat(LoggedSql.stop()).isEmpty(); + assertThat(c1).isNotSameAs(c2); + + LoggedSql.start(); + c1 = q.copy().setId(c.getId()).findOne(); + c2 = q.copy().setId(c.getId()).findOne(); + assertThat(LoggedSql.stop()).isEmpty(); + assertThat(c1).isNotSameAs(c2); + + LoggedSql.start(); + List l1 = q.copy().where().idIn(ids.subList(0,2)).findList(); + List l2 = q.copy().where().idIn(ids.subList(0,2)).findList(); + assertThat(LoggedSql.stop()).isEmpty(); + assertThat(l1).hasSize(2).isNotSameAs(l2); + + assertThat(bc.statistics(true).getHitCount()).isEqualTo(8); // 4x findOne and 2x findList with 2 elements + assertThat(qc.statistics(true).getHitCount()).isEqualTo(0); + // Note: The ID queries are immediately handled by the BeanCache, because the underlying queries are never compiled + // and so they have no query plan, which is required for cache access. + // + // So we clear the cache and try it again + DB.getDefault().pluginApi().cacheManager().clearAll(); + + LoggedSql.start(); + c1 = q.copy().where().eq("id", c.getId()).findOne(); + c2 = q.copy().where().eq("id", c.getId()).findOne(); + assertThat(LoggedSql.stop()).hasSize(1); + assertThat(c1).isSameAs(c2); + + LoggedSql.start(); + c1 = q.copy().setId(c.getId()).findOne(); + c2 = q.copy().setId(c.getId()).findOne(); + assertThat(LoggedSql.stop()).isEmpty(); // setId(..) query has same queryPlan as eq("id", ..) + assertThat(c1).isSameAs(c2); + + LoggedSql.start(); + l1 = q.copy().where().idIn(1, 2).findList(); + l2 = q.copy().where().idIn(1, 2).findList(); + assertThat(LoggedSql.stop()).hasSize(1); // we have to hit DB for bean#2 + assertThat(l1).hasSize(2).isSameAs(l2); + + assertThat(bc.statistics(true).getHitCount()).isEqualTo(1); // findList can get one bean from bc + assertThat(qc.statistics(true).getHitCount()).isEqualTo(4); // 6 queries, 2 of them hit db + } + @Test @SuppressWarnings("unchecked") public void testReadOnlyFind() { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java index abe945bb51..1919822cb9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java @@ -9,7 +9,7 @@ /** * Cached bean for testing caching implementation. */ -@Cache +@Cache(enableQueryCache = true) @Entity @Table(name = "o_cached_bean") public class OCachedBean { From f1f944e44071e79bf472d2078308d9b1d0c6746e Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:21:29 +0200 Subject: [PATCH 004/123] PR #2943 - FEATURE: Disable overwriting generated properties at transaction level --- .../src/main/java/io/ebean/Transaction.java | 6 +++ .../io/ebeaninternal/api/SpiTransaction.java | 5 +++ .../api/SpiTransactionProxy.java | 10 +++++ .../server/core/PersistRequestBean.java | 26 ++++++----- .../ImplicitReadOnlyTransaction.java | 9 ++++ .../server/transaction/JdbcTransaction.java | 11 +++++ .../server/transaction/NoTransaction.java | 9 ++++ .../generated/TestGeneratedProperties.java | 43 ++++++++++++++++++- 8 files changed, 108 insertions(+), 11 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java index 065396a925..21ce076a8f 100644 --- a/ebean-api/src/main/java/io/ebean/Transaction.java +++ b/ebean-api/src/main/java/io/ebean/Transaction.java @@ -260,6 +260,12 @@ static Transaction current() { */ void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties); + /** + * If set to false (default is true) generated propertes are only set, if it is the version property or have a null value. + * This may be useful in backup & restore scenarios, if you want set WhenCreated/WhenModified. + */ + void setOverwriteGeneratedProperties(boolean overwriteGeneratedProperties); + /** * Set if the L2 cache should be skipped for "find by id" and "find by natural key" queries. *

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java index e15b51298b..db192fa5c6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java @@ -103,6 +103,11 @@ public interface SpiTransaction extends Transaction { */ Boolean isUpdateAllLoadedProperties(); + /** + * Returns true, if generated properties are overwritten (default) or are only set, if they are null. + */ + boolean isOverwriteGeneratedProperties(); + /** * Return the batchSize specifically set for this transaction or 0. *

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java index bb738cb5ad..4ccce3ee4a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -248,6 +248,16 @@ public void setUpdateAllLoadedProperties(boolean updateAllLoaded) { transaction.setUpdateAllLoadedProperties(updateAllLoaded); } + @Override + public void setOverwriteGeneratedProperties(boolean overwriteGeneratedProperties) { + transaction.setOverwriteGeneratedProperties(overwriteGeneratedProperties); + } + + @Override + public boolean isOverwriteGeneratedProperties() { + return transaction.isOverwriteGeneratedProperties(); + } + @Override public Boolean isUpdateAllLoadedProperties() { return transaction.isUpdateAllLoadedProperties(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 32da95dab1..73daf4412d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -272,24 +272,30 @@ private void onUpdateGeneratedProperties() { } else { // @WhenModified set without invoking interception Object oldVal = prop.getValue(entityBean); - Object value = generatedProperty.getUpdateValue(prop, entityBean, now()); - prop.setValueChanged(entityBean, value); - intercept.setOldValue(prop.propertyIndex(), oldVal); + if (transaction == null || transaction.isOverwriteGeneratedProperties() || oldVal == null) { // version handled above + Object value = generatedProperty.getUpdateValue(prop, entityBean, now()); + prop.setValueChanged(entityBean, value); + intercept.setOldValue(prop.propertyIndex(), oldVal); + } } } } private void onFailedUpdateUndoGeneratedProperties() { for (BeanProperty prop : beanDescriptor.propertiesGenUpdate()) { - Object oldVal = intercept.origValue(prop.propertyIndex()); - prop.setValue(entityBean, oldVal); + if (transaction == null || transaction.isOverwriteGeneratedProperties() || prop.isVersion()) { + Object oldVal = intercept.origValue(prop.propertyIndex()); + prop.setValue(entityBean, oldVal); + } } } private void onInsertGeneratedProperties() { for (BeanProperty prop : beanDescriptor.propertiesGenInsert()) { - Object value = prop.generatedProperty().getInsertValue(prop, entityBean, now()); - prop.setValueChanged(entityBean, value); + if (transaction == null || transaction.isOverwriteGeneratedProperties() || prop.isVersion() || prop.getValue(entityBean) == null) { + Object value = prop.generatedProperty().getInsertValue(prop, entityBean, now()); + prop.setValueChanged(entityBean, value); + } } } @@ -935,13 +941,13 @@ private void logSummaryMessage() { transaction.logSummary("Inserted [{0}] [{1}]{2}", name, (idValue == null ? "" : idValue), draft); break; case UPDATE: - transaction.logSummary("Updated [{0}] [{1}]{2}", name, idValue , draft); + transaction.logSummary("Updated [{0}] [{1}]{2}", name, idValue, draft); break; case DELETE: - transaction.logSummary("Deleted [{0}] [{1}]{2}", name, idValue , draft); + transaction.logSummary("Deleted [{0}] [{1}]{2}", name, idValue, draft); break; case DELETE_SOFT: - transaction.logSummary("SoftDelete [{0}] [{1}]{2}", name, idValue , draft); + transaction.logSummary("SoftDelete [{0}] [{1}]{2}", name, idValue, draft); break; default: break; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index fd721e6c27..20cfac63f1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -272,6 +272,15 @@ public void setReadOnly(boolean readOnly) { public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) { } + @Override + public void setOverwriteGeneratedProperties(boolean overwriteGeneratedProperties) { + } + + @Override + public boolean isOverwriteGeneratedProperties() { + return true; + } + @Override public Boolean isUpdateAllLoadedProperties() { return null; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index 92c2efb4a2..8520e649d8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -53,6 +53,7 @@ class JdbcTransaction implements SpiTransaction, TxnProfileEventCodes { private boolean queryOnly = true; private boolean localReadOnly; private Boolean updateAllLoadedProperties; + private boolean overwriteGeneratedProperties = true; private boolean oldBatchMode; private boolean batchMode; private boolean batchOnCascadeMode; @@ -439,6 +440,16 @@ public final Boolean isUpdateAllLoadedProperties() { return updateAllLoadedProperties; } + @Override + public void setOverwriteGeneratedProperties(boolean overwriteGeneratedProperties) { + this.overwriteGeneratedProperties = overwriteGeneratedProperties; + } + + @Override + public boolean isOverwriteGeneratedProperties() { + return overwriteGeneratedProperties; + } + @Override public final void setBatchMode(boolean batchMode) { this.batchMode = batchMode; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 76228f1f1a..444d936b7f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -226,6 +226,15 @@ public void setPersistCascade(boolean persistCascade) { public void setUpdateAllLoadedProperties(boolean updateAllLoadedProperties) { } + @Override + public void setOverwriteGeneratedProperties(boolean overwriteGeneratedProperties) { + } + + @Override + public boolean isOverwriteGeneratedProperties() { + return true; + } + @Override public void setSkipCache(boolean skipCache) { } diff --git a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java index ced209f8bc..ee97cc1467 100644 --- a/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java +++ b/ebean-test/src/test/java/org/tests/generated/TestGeneratedProperties.java @@ -1,10 +1,13 @@ package org.tests.generated; -import io.ebean.xtest.BaseTestCase; import io.ebean.DB; +import io.ebean.Transaction; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; import org.tests.model.EGenProps; +import java.time.Instant; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -47,4 +50,42 @@ public void test_insert() { DB.delete(bean); } + + @Test + public void test_update_no_overwrite() { + EGenProps bean = new EGenProps(); + bean.setName("updating"); + DB.save(bean); + + bean = DB.find(EGenProps.class, bean.getId()); + bean.setInstantCreated(Instant.parse("2022-01-01T00:00:00Z")); + bean.setInstantUpdated(Instant.parse("2022-01-02T00:00:00Z")); + try (Transaction txn = DB.beginTransaction()) { + txn.setOverwriteGeneratedProperties(false); + DB.save(bean); + txn.commit(); + } + + bean = DB.find(EGenProps.class, bean.getId()); + assertThat(bean.getInstantCreated()).isEqualTo(Instant.parse("2022-01-01T00:00:00Z")); + assertThat(bean.getInstantUpdated()).isEqualTo(Instant.parse("2022-01-02T00:00:00Z")); + } + + @Test + public void test_insert_no_overwrite() { + EGenProps bean = new EGenProps(); + try (Transaction txn = DB.beginTransaction()) { + txn.setOverwriteGeneratedProperties(false); + bean.setName("inserting"); + bean.setInstantCreated(Instant.parse("2022-01-01T00:00:00Z")); + bean.setInstantUpdated(Instant.parse("2022-01-02T00:00:00Z")); + DB.save(bean); + txn.commit(); + } + + + bean = DB.find(EGenProps.class, bean.getId()); + assertThat(bean.getInstantCreated()).isEqualTo(Instant.parse("2022-01-01T00:00:00Z")); + assertThat(bean.getInstantUpdated()).isEqualTo(Instant.parse("2022-01-02T00:00:00Z")); + } } From 4a80c87b808131f7df6776491a7185ec51c0197e Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:24:17 +0200 Subject: [PATCH 005/123] PR #2945 - FEATURE: Support for lazy add on BeanList --- .../java/io/ebean/bean/BeanCollection.java | 7 + .../main/java/io/ebean/common/BeanList.java | 26 +-- .../java/io/ebean/common/BeanListLazyAdd.java | 133 +++++++++++++ .../server/deploy/BaseCollectionHelp.java | 8 +- .../server/deploy/BeanCollectionUtil.java | 2 +- .../server/deploy/BeanListHelp.java | 22 ++- .../server/deploy/BeanMapHelp.java | 7 +- .../server/deploy/BeanSetHelp.java | 7 - .../tests/batchload/TestLazyAddBeanList.java | 180 ++++++++++++++++++ 9 files changed, 352 insertions(+), 40 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/common/BeanListLazyAdd.java create mode 100644 ebean-test/src/test/java/org/tests/batchload/TestLazyAddBeanList.java diff --git a/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java b/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java index 1161476ddd..4c07e9da45 100644 --- a/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java +++ b/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java @@ -164,6 +164,13 @@ enum ModifyListenMode { */ Collection actualEntries(); + /** + * Returns entries, that were lazily added at the end of the list. Might be null. + */ + default Collection getLazyAddedEntries(boolean reset) { + return null; + } + /** * return true if there are real rows held. Return false is this is using * Deferred fetch to lazy load the rows and the rows have not yet been diff --git a/ebean-api/src/main/java/io/ebean/common/BeanList.java b/ebean-api/src/main/java/io/ebean/common/BeanList.java index 12d0770d62..a1ecb1d4ec 100644 --- a/ebean-api/src/main/java/io/ebean/common/BeanList.java +++ b/ebean-api/src/main/java/io/ebean/common/BeanList.java @@ -8,14 +8,14 @@ /** * List capable of lazy loading and modification awareness. */ -public final class BeanList extends AbstractBeanCollection implements List, BeanCollectionAdd { +public class BeanList extends AbstractBeanCollection implements List, BeanCollectionAdd { private static final long serialVersionUID = 1L; /** * The underlying List implementation. */ - private List list; + List list; /** * Specify the underlying List implementation. @@ -111,30 +111,30 @@ public boolean checkEmptyLazyLoad() { } } + protected void initList(boolean skipLoad, boolean onlyIds) { + if (skipLoad) { + list = new ArrayList<>(); + } else { + lazyLoadCollection(onlyIds); + } + } + private void initClear() { lock.lock(); try { if (list == null) { - if (!disableLazyLoad && modifyListening) { - lazyLoadCollection(true); - } else { - list = new ArrayList<>(); - } + initList(disableLazyLoad || !modifyListening, true); } } finally { lock.unlock(); } } - private void init() { + void init() { lock.lock(); try { if (list == null) { - if (disableLazyLoad) { - list = new ArrayList<>(); - } else { - lazyLoadCollection(false); - } + initList(disableLazyLoad, false); } } finally { lock.unlock(); diff --git a/ebean-api/src/main/java/io/ebean/common/BeanListLazyAdd.java b/ebean-api/src/main/java/io/ebean/common/BeanListLazyAdd.java new file mode 100644 index 0000000000..8ffa4b47df --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/common/BeanListLazyAdd.java @@ -0,0 +1,133 @@ +package io.ebean.common; + +import io.ebean.bean.BeanCollection; +import io.ebean.bean.BeanCollectionLoader; +import io.ebean.bean.EntityBean; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * This bean list can perform additions without populating the list. + * This might be useful, if you just want to add entries to an existing collection. + * Works only for lists and only if there is no order column + */ +public class BeanListLazyAdd extends BeanList { + + public BeanListLazyAdd(BeanCollectionLoader loader, EntityBean ownerBean, String propertyName) { + super(loader, ownerBean, propertyName); + } + + private List lazyAddedEntries; + + @Override + public boolean add(E bean) { + checkReadOnly(); + + lock.lock(); + try { + if (list == null) { + // list is not yet initialized, so we may add elements to a spare list + if (lazyAddedEntries == null) { + lazyAddedEntries = new ArrayList<>(); + } + lazyAddedEntries.add(bean); + } else { + list.add(bean); + } + } finally { + lock.unlock(); + } + + if (modifyListening) { + modifyAddition(bean); + } + return true; + } + + @Override + public boolean addAll(Collection beans) { + checkReadOnly(); + + lock.lock(); + try { + if (list == null) { + // list is not yet initialized, so we may add elements to a spare list + if (lazyAddedEntries == null) { + lazyAddedEntries = new ArrayList<>(); + } + lazyAddedEntries.addAll(beans); + } else { + list.addAll(beans); + } + } finally { + lock.unlock(); + } + + if (modifyListening) { + getModifyHolder().modifyAdditionAll(beans); + } + + return true; + } + + + @Override + public void loadFrom(BeanCollection other) { + super.loadFrom(other); + if (lazyAddedEntries != null) { + list.addAll(lazyAddedEntries); + lazyAddedEntries = null; + } + } + + /** + * on init, this happens on all accessor methods except on 'add' and addAll, + * we add the lazy added entries at the end of the list + */ + @Override + protected void initList(boolean skipLoad, boolean onlyIds) { + if (skipLoad) { + if (lazyAddedEntries != null) { + list = lazyAddedEntries; + lazyAddedEntries = null; + } else { + list = new ArrayList<>(); + } + } else { + lazyLoadCollection(onlyIds); + if (lazyAddedEntries != null) { + list.addAll(lazyAddedEntries); + lazyAddedEntries = null; + } + } + } + + @Override + public List getLazyAddedEntries(boolean reset) { + List ret = lazyAddedEntries; + if (reset) { + lazyAddedEntries = null; + } + return ret; + } + + @Override + public boolean isSkipSave() { + return lazyAddedEntries == null && super.isSkipSave(); + } + + public boolean checkEmptyLazyLoad() { + if (list != null) { + return false; + } else if (lazyAddedEntries == null) { + list = new ArrayList<>(); + return true; + } else { + list = lazyAddedEntries; + lazyAddedEntries = null; + return false; + } + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java index b6cb6314ba..f161f18230 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BaseCollectionHelp.java @@ -11,7 +11,7 @@ abstract class BaseCollectionHelp implements BeanCollectionHelp { final BeanPropertyAssocMany many; - private final BeanDescriptor targetDescriptor; + final BeanDescriptor targetDescriptor; final String propertyName; BeanCollectionLoader loader; @@ -21,12 +21,6 @@ abstract class BaseCollectionHelp implements BeanCollectionHelp { this.propertyName = many.name(); } - BaseCollectionHelp() { - this.many = null; - this.targetDescriptor = null; - this.propertyName = null; - } - @Override public final void setLoader(BeanCollectionLoader loader) { this.loader = loader; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java index 6532df7f15..35ff6003e0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java @@ -32,7 +32,7 @@ public static Collection getActualEntries(Object o) { if (o instanceof BeanCollection) { BeanCollection bc = (BeanCollection) o; if (!bc.isPopulated()) { - return null; + return bc.getLazyAddedEntries(true); } // For maps this is a collection of Map.Entry, otherwise it // returns a collection of beans diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java index c2ddfeca73..5e228bb9f9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanListHelp.java @@ -6,6 +6,7 @@ import io.ebean.bean.BeanCollectionAdd; import io.ebean.bean.EntityBean; import io.ebean.common.BeanList; +import io.ebean.common.BeanListLazyAdd; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonWriter; @@ -19,12 +20,11 @@ */ public class BeanListHelp extends BaseCollectionHelp { + private final boolean hasOrderColumn; + BeanListHelp(BeanPropertyAssocMany many) { super(many); - } - - BeanListHelp() { - super(); + hasOrderColumn = many.hasOrderColumn(); } @Override @@ -53,7 +53,12 @@ public final BeanCollection createEmptyNoParent() { @Override public final BeanCollection createEmpty(EntityBean parentBean) { - BeanList beanList = new BeanList<>(loader, parentBean, propertyName); + BeanList beanList; + if (hasOrderColumn) { + beanList = new BeanList<>(loader, parentBean, propertyName); + } else { + beanList = new BeanListLazyAdd<>(loader, parentBean, propertyName); + } if (many != null) { beanList.setModifyListening(many.modifyListenMode()); } @@ -62,7 +67,12 @@ public final BeanCollection createEmpty(EntityBean parentBean) { @Override public final BeanCollection createReference(EntityBean parentBean) { - BeanList beanList = new BeanList<>(loader, parentBean, propertyName); + BeanList beanList; + if (hasOrderColumn) { + beanList = new BeanList<>(loader, parentBean, propertyName); + } else { + beanList = new BeanListLazyAdd<>(loader, parentBean, propertyName); + } beanList.setModifyListening(many.modifyListenMode()); return beanList; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java index 6ce968ca2b..7652a1b214 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMapHelp.java @@ -20,18 +20,13 @@ */ public class BeanMapHelp extends BaseCollectionHelp { - private final BeanPropertyAssocMany many; - private final BeanDescriptor targetDescriptor; - private final String propertyName; private final BeanProperty beanProperty; /** * When help is attached to a specific many property. */ BeanMapHelp(BeanPropertyAssocMany many) { - this.many = many; - this.targetDescriptor = many.targetDescriptor(); - this.propertyName = many.name(); + super(many); this.beanProperty = targetDescriptor.beanProperty(many.mapKey()); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java index ec2f6e31e1..4115b6ac4d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanSetHelp.java @@ -26,13 +26,6 @@ public class BeanSetHelp extends BaseCollectionHelp { super(many); } - /** - * For a query that returns a set. - */ - BeanSetHelp() { - super(); - } - @Override public final BeanCollectionAdd getBeanCollectionAdd(Object bc, String mapKey) { if (bc instanceof BeanSet) { diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyAddBeanList.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyAddBeanList.java new file mode 100644 index 0000000000..961195f7c0 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyAddBeanList.java @@ -0,0 +1,180 @@ +package org.tests.batchload; + +import io.ebean.DB; +import io.ebean.common.BeanList; +import io.ebean.common.BeanListLazyAdd; +import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.tests.model.basic.Contact; +import org.tests.model.basic.Customer; +import org.tests.order.OrderMaster; +import org.tests.order.OrderReferencedChild; + +import java.util.Arrays; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class TestLazyAddBeanList extends BaseTestCase { + + private Customer cust; + private OrderMaster orderMaster; + + @BeforeEach + void init() { + cust = new Customer(); + cust.setName("noFetch"); + DB.save(cust); + cust = DB.find(Customer.class, cust.getId()); // fetch fresh from DB + + orderMaster = new OrderMaster(); + DB.save(orderMaster); + orderMaster = DB.find(OrderMaster.class, orderMaster.getId()); + } + + @AfterEach + void tearDown() { + DB.delete(cust); + DB.delete(orderMaster); + } + + @Test + public void testCollectionType() { + assertThat(cust.getContacts()) + .isInstanceOf(BeanListLazyAdd.class); + + assertThat(orderMaster.getChildren()) + .isInstanceOf(BeanList.class) + .isNotInstanceOf(BeanListLazyAdd.class); + + assertThat(DB.reference(Customer.class, 1).getContacts()) + .isInstanceOf(BeanListLazyAdd.class); + + assertThat(DB.reference(OrderMaster.class, 1).getChildren()) + .isInstanceOf(BeanList.class) + .isNotInstanceOf(BeanListLazyAdd.class); + } + + @Test + public void testNoFetch() { + + LoggedSql.start(); + cust.addContact(new Contact("jim", "slim")); + cust.addContact(new Contact("joe", "big")); + DB.save(cust); + + List sql = LoggedSql.stop(); + assertThat(sql.get(0)).contains("insert into contact"); + assertThat(sql.get(1)).contains("bind(jim,slim,"); + assertThat(sql.get(2)).contains("bind(joe,big,"); + assertThat(sql).hasSize(3); + + assertThat(cust.getContacts()).hasSize(2); + + List list = DB.find(Customer.class) + .fetch("contacts", "firstName") + .where() + .idEq(cust.getId()).findSingleAttributeList(); +// check if it is really saved + assertThat(list).containsExactlyInAnyOrder("jim", "joe"); + } + + @Test + public void testFetch() { + + LoggedSql.start(); + orderMaster.getChildren().add(new OrderReferencedChild("foo")); + orderMaster.getChildren().add(new OrderReferencedChild("bar")); + DB.save(orderMaster); + + List sql = LoggedSql.stop(); + + assertThat(sql.get(0)).contains("from order_referenced_parent"); // lazy load children + assertThat(sql.get(1)).contains("insert into order_referenced_parent"); + assertThat(sql.get(2)).contains("bind(D,foo,"); + assertThat(sql.get(3)).contains("bind(D,bar,"); + + List list = DB.find(OrderMaster.class) + .fetch("children", "name") + .where().idEq(orderMaster.getId()) + .findSingleAttributeList(); + // check if it is really saved + assertThat(list).containsExactlyInAnyOrder("foo", "bar"); + } + + @Test + public void testAddToExisting() { + + // add some existing entries + LoggedSql.start(); + cust.getContacts().addAll(Arrays.asList( + new Contact("jim", "slim"), + new Contact("joe", "big"))); + assertThat(LoggedSql.stop()).isEmpty(); + + LoggedSql.start(); + DB.save(cust); + assertThat(LoggedSql.stop()).hasSize(3); // insert + 2x bind + + cust = DB.find(Customer.class, cust.getId()); + + LoggedSql.start(); + List contacts = cust.getContacts(); + contacts.add(new Contact("charlie", "brown")); + assertThat(LoggedSql.stop()).isEmpty(); + + LoggedSql.start(); + assertThat(contacts). + extracting(Contact::getFirstName). + containsExactlyInAnyOrder("jim", "joe", "charlie"); + List sql = LoggedSql.stop(); + + assertThat(sql.get(0)).contains("from o_customer t0 left join contact t1 "); + assertThat(sql).hasSize(1); + } + + @Test + public void testBatch() { + for (int i = 0; i < 10; i++) { + Customer bcust = new Customer(); + bcust.setName("batch " + i); + //bcust.getContacts().add(new Contact("Noemi","Praml")); + DB.save(bcust); + } + + LoggedSql.start(); + List custs = DB.find(Customer.class).where().startsWith("name", "batch").findList(); + assertThat(custs).hasSize(10); + assertThat(LoggedSql.stop()).hasSize(1); + + + LoggedSql.start(); + for (Customer cust : custs) { + cust.getContacts().addAll(Arrays.asList( + new Contact(cust.getName() + " jim", "slim"), + new Contact(cust.getName() + " joe", "big"))); + } + assertThat(LoggedSql.stop()).isEmpty(); + + LoggedSql.start(); + custs.get(0).getContacts().size(); // trigger batch load + assertThat(LoggedSql.stop()).hasSize(1); + + LoggedSql.start(); + DB.saveAll(custs); + assertThat(LoggedSql.stop()).hasSize(21); + + LoggedSql.start(); + custs = DB.find(Customer.class).where().startsWith("name", "batch").findList(); + assertThat(custs).hasSize(10); + + for (Customer cust : custs) { + assertThat(cust.getContacts()).hasSize(2).extracting(Contact::getFirstName).containsExactlyInAnyOrder(cust.getName() + " jim", cust.getName() + " joe"); + } + assertThat(LoggedSql.stop()).hasSize(2); + } + +} From 4ab43e0d4d0c125c2541f5a88547f5abb1ca22f2 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:25:49 +0200 Subject: [PATCH 006/123] PR #2955 - IMPROVED: Tenant support for query plans --- .../java/io/ebean/meta/MetaQueryPlan.java | 5 +++ .../io/ebeaninternal/api/SpiDbQueryPlan.java | 2 +- .../api/SpiTransactionManager.java | 2 +- .../server/core/InternalConfiguration.java | 3 +- .../server/query/CQueryBindCapture.java | 29 +++++++++---- .../server/query/CQueryPlanManager.java | 19 ++++----- .../server/query/CQueryPlanRequest.java | 18 +++----- .../server/query/DQueryPlanOutput.java | 23 ++++++++++- .../transaction/TransactionManager.java | 4 +- .../partition/MultiTenantPartitionTest.java | 41 ++++++++++++++++++- 10 files changed, 109 insertions(+), 37 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java index 7c431022c5..4258b7c9ca 100644 --- a/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java +++ b/ebean-api/src/main/java/io/ebean/meta/MetaQueryPlan.java @@ -44,6 +44,11 @@ public interface MetaQueryPlan { */ String plan(); + /** + * The tenant ID of the plan. + */ + Object tenantId(); + /** * Return the query execution time associated with the bind values capture. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDbQueryPlan.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDbQueryPlan.java index 535232d76a..c8a4210055 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDbQueryPlan.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDbQueryPlan.java @@ -12,6 +12,6 @@ public interface SpiDbQueryPlan extends MetaQueryPlan { /** * Extend with queryTimeMicros, captureCount, captureMicros and when the bind values were captured. */ - SpiDbQueryPlan with(long queryTimeMicros, long captureCount, long captureMicros, Instant whenCaptured); + SpiDbQueryPlan with(long queryTimeMicros, long captureCount, long captureMicros, Instant whenCaptured, Object tenantId); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java index 01311d1673..cc0ff69efa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionManager.java @@ -60,6 +60,6 @@ public interface SpiTransactionManager { /** * Return a connection used for query plan collection. */ - Connection queryPlanConnection() throws SQLException; + Connection queryPlanConnection(Object tenantId) throws SQLException; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 080d95560c..812057fbc9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -582,7 +582,8 @@ public QueryPlanManager initQueryPlanManager(TransactionManager transactionManag return QueryPlanManager.NOOP; } long threshold = config.getQueryPlanThresholdMicros(); - return new CQueryPlanManager(transactionManager, threshold, queryPlanLogger(databasePlatform.platform()), extraMetrics); + return new CQueryPlanManager(transactionManager, config.getCurrentTenantProvider(), + threshold, queryPlanLogger(databasePlatform.platform()), extraMetrics); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java index 855d7f0104..6d57148f5d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBindCapture.java @@ -1,14 +1,17 @@ package io.ebeaninternal.server.query; -import io.ebeaninternal.api.SpiDbQueryPlan; -import io.ebeaninternal.api.SpiQueryBindCapture; -import io.ebeaninternal.api.SpiQueryPlan; +import io.ebean.config.CurrentTenantProvider; +import io.ebeaninternal.api.*; import io.ebeaninternal.server.bind.capture.BindCapture; +import java.sql.Connection; +import java.sql.SQLException; import java.time.Instant; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import static java.lang.System.Logger.Level.ERROR; + final class CQueryBindCapture implements SpiQueryBindCapture { private static final double multiplier = 1.5d; @@ -16,18 +19,21 @@ final class CQueryBindCapture implements SpiQueryBindCapture { private final ReentrantLock lock = new ReentrantLock(); private final CQueryPlanManager manager; private final SpiQueryPlan queryPlan; + private final CurrentTenantProvider tenantProvider; private BindCapture bindCapture; private long queryTimeMicros; private long thresholdMicros; private long captureCount; + private Object tenantId; private long lastBindCapture; - CQueryBindCapture(CQueryPlanManager manager, SpiQueryPlan queryPlan, long thresholdMicros) { + CQueryBindCapture(CQueryPlanManager manager, SpiQueryPlan queryPlan, long thresholdMicros, CurrentTenantProvider tenantProvider) { this.manager = manager; this.queryPlan = queryPlan; this.thresholdMicros = thresholdMicros; + this.tenantProvider = tenantProvider; } /** @@ -45,6 +51,7 @@ public void setBind(BindCapture bindCapture, long queryTimeMicros, long startNan this.thresholdMicros = Math.round(queryTimeMicros * multiplier); this.captureCount++; this.bindCapture = bindCapture; + this.tenantId = tenantProvider == null ? null : tenantProvider.currentId(); this.queryTimeMicros = queryTimeMicros; lastBindCapture = System.currentTimeMillis(); manager.notifyBindCapture(this, startNanos); @@ -68,19 +75,27 @@ public void queryPlanInit(long thresholdMicros) { /** * Collect the query plan using already captured bind values. */ - public boolean collectQueryPlan(CQueryPlanRequest request) { + public boolean collectQueryPlan(CQueryPlanRequest request, SpiTransactionManager transactionManager) { if (bindCapture == null || request.since() < lastBindCapture) { // no bind capture since the last capture return false; } + final Instant whenCaptured = Instant.ofEpochMilli(this.lastBindCapture); final BindCapture last = this.bindCapture; + final Object tenantId = this.tenantId; final long startNanos = System.nanoTime(); - SpiDbQueryPlan queryPlan = manager.collectPlan(request.connection(), this.queryPlan, last); + SpiDbQueryPlan queryPlan; + try (Connection connection = transactionManager.queryPlanConnection(tenantId)) { + queryPlan = manager.collectPlan(connection, this.queryPlan, last); + } catch (SQLException e) { + CoreLog.log.log(ERROR, "Error during query plan collection", e); + return false; + } if (queryPlan != null) { final long captureMicros = TimeUnit.MICROSECONDS.convert(System.nanoTime() - startNanos, TimeUnit.NANOSECONDS); - request.add(queryPlan.with(queryTimeMicros, captureCount, captureMicros, whenCaptured)); + request.add(queryPlan.with(queryTimeMicros, captureCount, captureMicros, whenCaptured, tenantId)); // effectively turn off bind capture for this plan thresholdMicros = Long.MAX_VALUE; return true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java index b3a4091d41..4757489288 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanManager.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.query; +import io.ebean.config.CurrentTenantProvider; import io.ebean.meta.MetaQueryPlan; import io.ebean.meta.QueryPlanRequest; import io.ebean.metric.TimedMetric; @@ -8,11 +9,9 @@ import io.ebeaninternal.server.bind.capture.BindCapture; import java.sql.Connection; -import java.sql.SQLException; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import static java.lang.System.Logger.Level.ERROR; import static java.util.Collections.emptyList; public final class CQueryPlanManager implements QueryPlanManager { @@ -21,13 +20,17 @@ public final class CQueryPlanManager implements QueryPlanManager { private final ConcurrentHashMap plans = new ConcurrentHashMap<>(); private final TransactionManager transactionManager; + private final CurrentTenantProvider tenantProvider; private final QueryPlanLogger planLogger; private final TimedMetric timeCollection; private final TimedMetric timeBindCapture; private long defaultThreshold; - public CQueryPlanManager(TransactionManager transactionManager, long defaultThreshold, QueryPlanLogger planLogger, ExtraMetrics extraMetrics) { + public CQueryPlanManager(TransactionManager transactionManager, + CurrentTenantProvider tenantProvider, + long defaultThreshold, QueryPlanLogger planLogger, ExtraMetrics extraMetrics) { this.transactionManager = transactionManager; + this.tenantProvider = tenantProvider; this.defaultThreshold = defaultThreshold; this.planLogger = planLogger; this.timeCollection = extraMetrics.planCollect(); @@ -41,7 +44,7 @@ public void setDefaultThreshold(long thresholdMicros) { @Override public SpiQueryBindCapture createBindCapture(SpiQueryPlan queryPlan) { - return new CQueryBindCapture(this, queryPlan, defaultThreshold); + return new CQueryBindCapture(this, queryPlan, defaultThreshold, tenantProvider); } public void notifyBindCapture(CQueryBindCapture planBind, long startNanos) { @@ -58,16 +61,12 @@ public List collect(QueryPlanRequest request) { } private List collectPlans(QueryPlanRequest request) { - try (Connection connection = transactionManager.queryPlanConnection()) { - CQueryPlanRequest req = new CQueryPlanRequest(connection, request, plans.keySet().iterator()); + + CQueryPlanRequest req = new CQueryPlanRequest(transactionManager, request, plans.keySet().iterator()); while (req.hasNext()) { req.nextCapture(); } return req.plans(); - } catch (SQLException e) { - CoreLog.log.log(ERROR, "Error during query plan collection", e); - return emptyList(); - } } public SpiDbQueryPlan collectPlan(Connection connection, SpiQueryPlan queryPlan, BindCapture last) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java index 573b66026c..8441f4e4b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryPlanRequest.java @@ -2,8 +2,8 @@ import io.ebean.meta.MetaQueryPlan; import io.ebean.meta.QueryPlanRequest; +import io.ebeaninternal.api.SpiTransactionManager; -import java.sql.Connection; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -15,14 +15,15 @@ final class CQueryPlanRequest { private final List plans = new ArrayList<>(); - private final Connection connection; + private final SpiTransactionManager transactionManager; private final long since; private final int maxCount; private final long maxTime; private final Iterator iterator; - CQueryPlanRequest(Connection connection, QueryPlanRequest req, Iterator iterator) { - this.connection = connection; + + CQueryPlanRequest(SpiTransactionManager transactionManager, QueryPlanRequest req, Iterator iterator) { + this.transactionManager = transactionManager; this.iterator = iterator; this.maxCount = req.maxCount(); long reqSince = req.since(); @@ -31,13 +32,6 @@ final class CQueryPlanRequest { this.maxTime = maxTimeMillis > 0 ? System.currentTimeMillis() + maxTimeMillis : 0; } - /** - * Return the connection used to collect the db query plan. - */ - Connection connection() { - return connection; - } - /** * Add the collected query plan. */ @@ -71,7 +65,7 @@ boolean hasNext() { */ void nextCapture() { final CQueryBindCapture next = iterator.next(); - if (next.collectQueryPlan(this)) { + if (next.collectQueryPlan(this, transactionManager)) { iterator.remove(); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java index c4ffaf9ada..686e1420a9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DQueryPlanOutput.java @@ -24,6 +24,8 @@ final class DQueryPlanOutput implements MetaQueryPlan, SpiDbQueryPlan { private long captureMicros; private Instant whenCaptured; + private Object tenantId; + DQueryPlanOutput(Class beanType, String label, String hash, String sql, ProfileLocation profileLocation, String bind, String plan) { this.beanType = beanType; this.label = label; @@ -84,6 +86,14 @@ public String plan() { return plan; } + /** + * Returns the tenant id of this plan. + */ + @Override + public Object tenantId() { + return tenantId; + } + /** * Return the query execution time associated with the capture of bind values used * to build the query plan. @@ -113,18 +123,27 @@ public Instant whenCaptured() { @Override public String toString() { - return " BeanType:" + ((beanType == null) ? "" : beanType.getSimpleName()) + " planHash:" + hash + " label:" + label + " queryTimeMicros:" + queryTimeMicros + " captureCount:" + captureCount + "\n SQL:" + sql + "\nBIND:" + bind + "\nPLAN:" + plan; + return " BeanType:" + ((beanType == null) ? "" : beanType.getSimpleName()) + + " planHash:" + hash + + " label:" + label + + " queryTimeMicros:" + queryTimeMicros + + " captureCount:" + captureCount + + (tenantId == null ? "" : (" tenant:" + tenantId)) + + "\n SQL:" + sql + + "\nBIND:" + bind + + "\nPLAN:" + plan; } /** * Additionally set the query execution time and the number of bind captures. */ @Override - public DQueryPlanOutput with(long queryTimeMicros, long captureCount, long captureMicros, Instant whenCaptured) { + public DQueryPlanOutput with(long queryTimeMicros, long captureCount, long captureMicros, Instant whenCaptured, Object tenantId) { this.queryTimeMicros = queryTimeMicros; this.captureCount = captureCount; this.captureMicros = captureMicros; this.whenCaptured = whenCaptured; + this.tenantId = tenantId; return this; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index c0b0610fa2..c8842d290f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -247,8 +247,8 @@ public final String name() { } @Override - public final Connection queryPlanConnection() throws SQLException { - return dataSourceSupplier.connection(null); + public final Connection queryPlanConnection(Object tenantId) throws SQLException { + return dataSourceSupplier.connection(tenantId); } @Override diff --git a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java index 90dc62e444..d6c7a5c661 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MultiTenantPartitionTest.java @@ -4,6 +4,9 @@ import io.ebean.DatabaseFactory; import io.ebean.config.DatabaseConfig; import io.ebean.config.TenantMode; +import io.ebean.meta.MetaQueryPlan; +import io.ebean.meta.QueryPlanInit; +import io.ebean.meta.QueryPlanRequest; import io.ebean.test.LoggedSql; import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.AfterAll; @@ -22,12 +25,13 @@ class MultiTenantPartitionTest extends BaseTestCase { static List tenants() { List tenants = new ArrayList<>(); for (int i = 0; i < 5; i++) { - tenants.add(new MtTenant("ten_"+i, names[i], names[i]+"@foo.com".toLowerCase())); + tenants.add(new MtTenant("ten_" + i, names[i], names[i] + "@foo.com".toLowerCase())); } return tenants; } private static final Database server = init(); + static { server.saveAll(tenants()); } @@ -76,6 +80,41 @@ void start() { LoggedSql.stop(); } + @Test + void queryPlanCapture() throws InterruptedException { + + QueryPlanRequest request = new QueryPlanRequest(); + request.maxCount(1_000); + request.maxTimeMillis(10_000); + server.metaInfo().queryPlanCollectNow(request); + + QueryPlanInit init = new QueryPlanInit(); + init.setAll(true); + init.thresholdMicros(1); + server.metaInfo().queryPlanInit(init); + + try { + + // run queries again + UserContext.set("rob", "ten_1"); + server.find(MtContent.class).findList(); + + UserContext.set("fred", "ten_2"); + server.find(MtContent.class).setId(2).findOne(); + + // obtains db query plans ... + List plans0 = server.metaInfo().queryPlanCollectNow(request); + assertThat(plans0).isNotEmpty(); + + assertThat(plans0).extracting(MetaQueryPlan::tenantId).containsExactlyInAnyOrder("ten_1", "ten_2"); + } finally { + // disable capturing + init.thresholdMicros(Long.MAX_VALUE); + server.metaInfo().queryPlanInit(init); + } + } + + @Test void deleteById() { UserContext.set("fred", "ten_2"); From a7db1f63770f8e5d63a1eba664085f2855897e8e Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:27:01 +0200 Subject: [PATCH 007/123] PR #2956 - FEATURE: Tenant partitioned caches could improve cache-hit ratio --- .../java/io/ebean/config/DatabaseConfig.java | 26 ++++ .../server/cache/CacheManagerOptions.java | 13 +- .../server/cache/DefaultCacheHolder.java | 50 ++++++-- .../cache/DefaultServerCacheManager.java | 4 + .../server/cache/SpiCacheManager.java | 6 + .../server/deploy/BeanDescriptor.java | 2 +- .../deploy/BeanDescriptorCacheHelp.java | 111 +++++++++--------- .../deploy/BeanDescriptorCacheHelpFixed.java | 72 ++++++++++++ .../BeanDescriptorCacheHelpPartitioned.java | 74 ++++++++++++ 9 files changed, 289 insertions(+), 69 deletions(-) create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelpFixed.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelpPartitioned.java diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index 8abaf3d131..5d9ebe25b9 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -441,6 +441,8 @@ public class DatabaseConfig { private int backgroundExecutorShutdownSecs = 30; private BackgroundExecutorWrapper backgroundExecutorWrapper = new MdcBackgroundExecutorWrapper(); + private boolean tenantPartitionedCache; + // defaults for the L2 bean caching private int cacheMaxSize = 10000; @@ -1470,6 +1472,21 @@ public void setBackgroundExecutorWrapper(BackgroundExecutorWrapper backgroundExe this.backgroundExecutorWrapper = backgroundExecutorWrapper; } + /** + * Returns, if the caches are partitioned by tenant. + */ + public boolean isTenantPartitionedCache() { + return tenantPartitionedCache; + } + + /** + * Sets the tenant partitioning mode for caches. This means, caches are created on demand, + * but they may not get invalidated across tenant boundaries * + */ + public void setTenantPartitionedCache(boolean tenantPartitionedCache) { + this.tenantPartitionedCache = tenantPartitionedCache; + } + /** * Return the L2 cache default max size. */ @@ -2949,6 +2966,15 @@ protected void loadSettings(PropertiesWrapper p) { ddlPlaceholders = p.get("ddl.placeholders", ddlPlaceholders); ddlHeader = p.get("ddl.header", ddlHeader); + tenantPartitionedCache = p.getBoolean("tenantPartitionedCache", tenantPartitionedCache); + + cacheMaxIdleTime = p.getInt("cacheMaxIdleTime", cacheMaxIdleTime); + cacheMaxSize = p.getInt("cacheMaxSize", cacheMaxSize); + cacheMaxTimeToLive = p.getInt("cacheMaxTimeToLive", cacheMaxTimeToLive); + queryCacheMaxIdleTime = p.getInt("queryCacheMaxIdleTime", queryCacheMaxIdleTime); + queryCacheMaxSize = p.getInt("queryCacheMaxSize", queryCacheMaxSize); + queryCacheMaxTimeToLive = p.getInt("queryCacheMaxTimeToLive", queryCacheMaxTimeToLive); + // read tenant-configuration from config: // tenant.mode = NONE | DB | SCHEMA | CATALOG | PARTITION String mode = p.get("tenant.mode"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java index ae0c10f4c1..d1ed0efdfd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/CacheManagerOptions.java @@ -13,18 +13,20 @@ public final class CacheManagerOptions { private final ClusterManager clusterManager; - private final DatabaseConfig databaseConfig; + private final String serverName; private final boolean localL2Caching; private CurrentTenantProvider currentTenantProvider; private QueryCacheEntryValidate queryCacheEntryValidate; private ServerCacheFactory cacheFactory = new DefaultServerCacheFactory(); private ServerCacheOptions beanDefault = new ServerCacheOptions(); private ServerCacheOptions queryDefault = new ServerCacheOptions(); + private final boolean tenantPartitionedCache; CacheManagerOptions() { this.localL2Caching = true; this.clusterManager = null; - this.databaseConfig = null; + this.serverName = "db"; + this.tenantPartitionedCache = false; this.cacheFactory = new DefaultServerCacheFactory(); this.beanDefault = new ServerCacheOptions(); this.queryDefault = new ServerCacheOptions(); @@ -32,9 +34,10 @@ public final class CacheManagerOptions { public CacheManagerOptions(ClusterManager clusterManager, DatabaseConfig config, boolean localL2Caching) { this.clusterManager = clusterManager; - this.databaseConfig = config; + this.serverName = config.getName(); this.localL2Caching = localL2Caching; this.currentTenantProvider = config.getCurrentTenantProvider(); + this.tenantPartitionedCache = config.isTenantPartitionedCache(); } public CacheManagerOptions with(ServerCacheOptions beanDefault, ServerCacheOptions queryDefault) { @@ -55,7 +58,7 @@ public CacheManagerOptions with(CurrentTenantProvider currentTenantProvider) { } public String getServerName() { - return (databaseConfig == null) ? "db" : databaseConfig.getName(); + return serverName; } public boolean isLocalL2Caching() { @@ -85,4 +88,6 @@ public ClusterManager getClusterManager() { public QueryCacheEntryValidate getQueryCacheEntryValidate() { return queryCacheEntryValidate; } + + public boolean isTenantPartitionedCache() { return tenantPartitionedCache; } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java index aba5ab3638..06d322ecd1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java @@ -32,6 +32,7 @@ final class DefaultCacheHolder { private final ServerCacheOptions queryDefault; private final CurrentTenantProvider tenantProvider; private final QueryCacheEntryValidate queryCacheEntryValidate; + private final boolean tenantPartitionedCache; DefaultCacheHolder(CacheManagerOptions builder) { this.cacheFactory = builder.getCacheFactory(); @@ -39,6 +40,7 @@ final class DefaultCacheHolder { this.queryDefault = builder.getQueryDefault(); this.tenantProvider = builder.getCurrentTenantProvider(); this.queryCacheEntryValidate = builder.getQueryCacheEntryValidate(); + this.tenantPartitionedCache = builder.isTenantPartitionedCache(); } void visitMetrics(MetricVisitor visitor) { @@ -56,16 +58,42 @@ ServerCache getCache(Class beanType, String collectionProperty) { return getCacheInternal(beanType, ServerCacheType.COLLECTION_IDS, collectionProperty); } + private String key(String beanName) { + if (tenantPartitionedCache) { + StringBuilder sb = new StringBuilder(beanName.length() + 64); + sb.append(beanName); + sb.append('.'); + sb.append(tenantProvider.currentId()); + return sb.toString(); + } else { + return beanName; + } + } + private String key(String beanName, ServerCacheType type) { - return beanName + type.code(); + StringBuilder sb = new StringBuilder(beanName.length() + 64); + sb.append(beanName); + if (tenantPartitionedCache) { + sb.append('.'); + sb.append(tenantProvider.currentId()); + } + sb.append(type.code()); + return sb.toString(); } private String key(String beanName, String collectionProperty, ServerCacheType type) { + StringBuilder sb = new StringBuilder(beanName.length() + 64); + sb.append(beanName); + if (tenantPartitionedCache) { + sb.append('.'); + sb.append(tenantProvider.currentId()); + } if (collectionProperty != null) { - return beanName + "." + collectionProperty + type.code(); - } else { - return beanName + type.code(); + sb.append('.'); + sb.append(collectionProperty); } + sb.append(type.code()); + return sb.toString(); } /** @@ -82,12 +110,17 @@ private ServerCache createCache(Class beanType, ServerCacheType type, String if (type == ServerCacheType.COLLECTION_IDS) { lock.lock(); try { - collectIdCaches.computeIfAbsent(beanType.getName(), s -> new ConcurrentSkipListSet<>()).add(key); + collectIdCaches.computeIfAbsent(key(beanType.getName()), s -> new ConcurrentSkipListSet<>()).add(key); } finally { lock.unlock(); } } - return cacheFactory.createCache(new ServerCacheConfig(type, key, shortName, options, tenantProvider, queryCacheEntryValidate)); + if (tenantPartitionedCache) { + return cacheFactory.createCache(new ServerCacheConfig(type, key, shortName, options, null, queryCacheEntryValidate)); + } else { + return cacheFactory.createCache(new ServerCacheConfig(type, key, shortName, options, tenantProvider, queryCacheEntryValidate)); + } + } void clearAll() { @@ -103,7 +136,7 @@ public void clear(String name) { clearIfExists(key(name, ServerCacheType.QUERY)); clearIfExists(key(name, ServerCacheType.BEAN)); clearIfExists(key(name, ServerCacheType.NATURAL_KEY)); - Set keys = collectIdCaches.get(name); + Set keys = collectIdCaches.get(key(name)); if (keys != null) { for (String collectionIdKey : keys) { clearIfExists(collectionIdKey); @@ -147,4 +180,7 @@ private ServerCacheOptions getBeanOptions(Class cls) { return beanDefault.copy(nearCache); } + boolean isTenantPartitionedCache() { + return tenantPartitionedCache; + } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java index 0b7264ff90..39558d19d8 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCacheManager.java @@ -154,4 +154,8 @@ public ServerCache getBeanCache(Class beanType) { return cacheHolder.getCache(beanType, ServerCacheType.BEAN); } + @Override + public boolean isTenantPartitionedCache() { + return cacheHolder.isTenantPartitionedCache(); + } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java index bf6d4d5a21..ebeec00f68 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/SpiCacheManager.java @@ -88,4 +88,10 @@ public interface SpiCacheManager { */ void clearLocal(Class beanType); + /** + * returns true, if this chacheManager runs in tenant partitioned mode + * @return + */ + boolean isTenantPartitionedCache(); + } 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 73bb1c126c..d138861a9f 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 @@ -319,7 +319,7 @@ public BeanDescriptor(BeanDescriptorMap owner, DeployBeanDescriptor deploy) { this.idOnlyReference = isIdOnlyReference(propertiesBaseScalar); boolean noRelationships = propertiesOne.length + propertiesMany.length == 0; this.cacheSharableBeans = noRelationships && deploy.getCacheOptions().isReadOnly(); - this.cacheHelp = new BeanDescriptorCacheHelp<>(this, owner.cacheManager(), deploy.getCacheOptions(), cacheSharableBeans, propertiesOneImported); + this.cacheHelp = BeanDescriptorCacheHelpPartitioned.create(this, owner.cacheManager(), deploy.getCacheOptions(), cacheSharableBeans, propertiesOneImported); this.jsonHelp = initJsonHelp(); this.draftHelp = new BeanDescriptorDraftHelp<>(this); this.docStoreAdapter = owner.createDocStoreBeanAdapter(this, deploy); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 79a20ce129..ae482166d1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -25,7 +25,7 @@ * * @param The entity bean type */ -final class BeanDescriptorCacheHelp { +abstract class BeanDescriptorCacheHelp { private static final System.Logger log = CoreLog.internal; @@ -34,7 +34,7 @@ final class BeanDescriptorCacheHelp { private static final System.Logger manyLog = AppLog.getLogger("io.ebean.cache.COLL"); private static final System.Logger natLog = AppLog.getLogger("io.ebean.cache.NATKEY"); - private final BeanDescriptor desc; + final BeanDescriptor desc; private final SpiCacheManager cacheManager; private final CacheOptions cacheOptions; /** @@ -42,13 +42,10 @@ final class BeanDescriptorCacheHelp { */ private final boolean cacheSharableBeans; private final boolean invalidateQueryCache; - private final Class beanType; + final Class beanType; private final String cacheName; private final BeanPropertyAssocOne[] propertiesOneImported; private final String[] naturalKey; - private final ServerCache beanCache; - private final ServerCache naturalKeyCache; - private final ServerCache queryCache; private final boolean noCaching; private final SpiCacheControl cacheControl; private final SpiCacheRegion cacheRegion; @@ -61,6 +58,15 @@ final class BeanDescriptorCacheHelp { */ private boolean cacheNotifyOnDelete; + static BeanDescriptorCacheHelp create(BeanDescriptor desc, SpiCacheManager cacheManager, CacheOptions cacheOptions, + boolean cacheSharableBeans, BeanPropertyAssocOne[] propertiesOneImported) { + if ((cacheOptions.isEnableQueryCache() || cacheOptions.isEnableBeanCache()) && cacheManager.isTenantPartitionedCache()) { + return new BeanDescriptorCacheHelpPartitioned<>(desc, cacheManager, cacheOptions, cacheSharableBeans, propertiesOneImported); + } else { + return new BeanDescriptorCacheHelpFixed<>(desc, cacheManager, cacheOptions, cacheSharableBeans, propertiesOneImported); + } + } + BeanDescriptorCacheHelp(BeanDescriptor desc, SpiCacheManager cacheManager, CacheOptions cacheOptions, boolean cacheSharableBeans, BeanPropertyAssocOne[] propertiesOneImported) { this.desc = desc; @@ -72,38 +78,38 @@ final class BeanDescriptorCacheHelp { this.cacheSharableBeans = cacheSharableBeans; this.propertiesOneImported = propertiesOneImported; this.naturalKey = cacheOptions.getNaturalKey(); - if (!cacheOptions.isEnableQueryCache()) { - this.queryCache = null; - } else { - this.queryCache = cacheManager.getQueryCache(beanType); - } - if (cacheOptions.isEnableBeanCache()) { - this.beanCache = cacheManager.getBeanCache(beanType); - if (cacheOptions.getNaturalKey() != null) { - this.naturalKeyCache = cacheManager.getNaturalKeyCache(beanType); - } else { - this.naturalKeyCache = null; - } - } else { - this.beanCache = null; - this.naturalKeyCache = null; - } - this.noCaching = (beanCache == null && queryCache == null); + this.noCaching = !cacheOptions.isEnableQueryCache() && !cacheOptions.isEnableBeanCache(); if (noCaching) { this.cacheControl = DCacheControlNone.INSTANCE; this.cacheRegion = (invalidateQueryCache) ? cacheManager.getRegion(cacheOptions.getRegion()) : DCacheRegionNone.INSTANCE; } else { this.cacheRegion = cacheManager.getRegion(cacheOptions.getRegion()); - this.cacheControl = new DCacheControl(cacheRegion, (beanCache != null), (naturalKeyCache != null), (queryCache != null)); + this.cacheControl = new DCacheControl(cacheRegion, + cacheOptions.isEnableBeanCache(), + cacheOptions.isEnableBeanCache() && cacheOptions.getNaturalKey() != null, + cacheOptions.isEnableQueryCache()); } } + abstract boolean hasBeanCache(); + + abstract boolean hasQueryCache(); + + abstract ServerCache getQueryCache(); + + abstract ServerCache getNaturalKeyCache(); + + abstract ServerCache getBeanCache(); + + /** * Derive the cache notify flags. */ void deriveNotifyFlags() { - cacheNotifyOnAll = (invalidateQueryCache || beanCache != null || queryCache != null); + cacheNotifyOnAll = (invalidateQueryCache + || hasBeanCache() + || hasQueryCache()); cacheNotifyOnDelete = !cacheNotifyOnAll && isNotifyOnDeletes(); if (log.isLoggable(DEBUG)) { if (cacheNotifyOnAll || cacheNotifyOnDelete) { @@ -178,11 +184,11 @@ CacheOptions getCacheOptions() { * Clear the query cache. */ void queryCacheClear() { - if (queryCache != null) { + if (hasQueryCache()) { if (queryLog.isLoggable(DEBUG)) { queryLog.log(DEBUG, " CLEAR {0}", cacheName); } - queryCache.clear(); + getQueryCache().clear(); } } @@ -190,7 +196,7 @@ void queryCacheClear() { * Add query cache clear to the changeSet. */ private void queryCacheClear(CacheChangeSet changeSet) { - if (queryCache != null) { + if (hasQueryCache()) { changeSet.addClearQuery(desc); } } @@ -199,10 +205,10 @@ private void queryCacheClear(CacheChangeSet changeSet) { * Get a query result from the query cache. */ Object queryCacheGet(Object id) { - if (queryCache == null) { + if (!hasQueryCache()) { throw new IllegalStateException("No query cache enabled on " + desc + ". Need explicit @Cache(enableQueryCache=true)"); } - Object queryResult = queryCache.get(id); + Object queryResult = getQueryCache().get(id); if (queryLog.isLoggable(DEBUG)) { if (queryResult == null) { queryLog.log(DEBUG, " GET {0}({1}) - cache miss", cacheName, id); @@ -217,13 +223,13 @@ Object queryCacheGet(Object id) { * Put a query result into the query cache. */ void queryCachePut(Object id, QueryCacheEntry entry) { - if (queryCache == null) { + if (!hasQueryCache()) { throw new IllegalStateException("No query cache enabled on " + desc + ". Need explicit @Cache(enableQueryCache=true)"); } if (queryLog.isLoggable(DEBUG)) { queryLog.log(DEBUG, " PUT {0}({1})", cacheName, id); } - queryCache.put(id, entry); + getQueryCache().put(id, entry); } void manyPropRemove(String propertyName, String parentKey) { @@ -294,7 +300,7 @@ boolean manyPropLoad(BeanPropertyAssocMany many, BeanCollection bc, String */ void manyPropPut(BeanPropertyAssocMany many, Object details, String parentKey) { if (many.isElementCollection()) { - CachedBeanData data = (CachedBeanData) beanCache.get(parentKey); + CachedBeanData data = (CachedBeanData) getBeanCache().get(parentKey); if (data != null) { try { // add as JSON to bean cache @@ -306,7 +312,7 @@ void manyPropPut(BeanPropertyAssocMany many, Object details, String parentKey if (beanLog.isLoggable(DEBUG)) { beanLog.log(DEBUG, " UPDATE {0}({1}) changes:{2}", cacheName, parentKey, changes); } - beanCache.put(parentKey, newData); + getBeanCache().put(parentKey, newData); } catch (IOException e) { log.log(ERROR, "Error updating L2 cache", e); } @@ -352,7 +358,7 @@ BeanCacheResult cacheIdLookup(PersistenceContext context, Collection ids) if (ids.isEmpty()) { return new BeanCacheResult<>(); } - Map beanDataMap = beanCache.getAll(keys); + Map beanDataMap = getBeanCache().getAll(keys); if (beanLog.isLoggable(TRACE)) { beanLog.log(TRACE, " MGET {0}({1}) - hits:{2}", cacheName, ids, beanDataMap.keySet()); } @@ -374,7 +380,7 @@ BeanCacheResult naturalKeyLookup(PersistenceContext context, Set keys } // naturalKey -> Id map - Map naturalKeyMap = naturalKeyCache.getAll(keys); + Map naturalKeyMap = getNaturalKeyCache().getAll(keys); if (natLog.isLoggable(TRACE)) { natLog.log(TRACE, " MLOOKUP {0}({1}) - hits:{2}", cacheName, keys, naturalKeyMap); } @@ -391,7 +397,7 @@ BeanCacheResult naturalKeyLookup(PersistenceContext context, Set keys } Set ids = new HashSet<>(naturalKeyMap.values()); - Map beanDataMap = beanCache.getAll(ids); + Map beanDataMap = getBeanCache().getAll(ids); if (beanLog.isLoggable(TRACE)) { beanLog.log(TRACE, " MGET {0}({1}) - hits:{2}", cacheName, ids, beanDataMap.keySet()); } @@ -422,25 +428,16 @@ private void setupContext(Object bean, PersistenceContext context) { desc.contextPut(context, id, bean); } - /** - * Return the beanCache creating it if necessary. - */ - private ServerCache getBeanCache() { - if (beanCache == null) { - throw new IllegalStateException("No bean cache enabled for " + desc + ". Add the @Cache annotation."); - } - return beanCache; - } /** * Clear the bean cache. */ void beanCacheClear() { - if (beanCache != null) { + if (hasBeanCache()) { if (beanLog.isLoggable(DEBUG)) { beanLog.log(DEBUG, " CLEAR {0}", cacheName); } - beanCache.clear(); + getBeanCache().clear(); } } @@ -516,7 +513,7 @@ void beanCachePutAllDirect(Collection beans) { if (natLog.isLoggable(DEBUG)) { natLog.log(DEBUG, " MPUT {0}({1}, {2})", cacheName, naturalKey, natKeys.keySet()); } - naturalKeyCache.putAll(natKeys); + getNaturalKeyCache().putAll(natKeys); } } @@ -536,7 +533,7 @@ void beanCachePutDirect(EntityBean bean) { if (natLog.isLoggable(DEBUG)) { natLog.log(DEBUG, " PUT {0}({1}, {2})", cacheName, naturalKey, key); } - naturalKeyCache.put(naturalKey, key); + getNaturalKeyCache().put(naturalKey, key); } } } @@ -679,11 +676,11 @@ EntityBean embeddedBeanLoadDirect(CachedBeanData data, PersistenceContext contex * Remove a bean from the cache given its Id. */ void beanCacheApplyInvalidate(Collection keys) { - if (beanCache != null) { + if (hasBeanCache()) { if (beanLog.isLoggable(DEBUG)) { beanLog.log(DEBUG, " MREMOVE {0}({1})", cacheName, keys); } - beanCache.removeAll(new HashSet<>(keys)); + getBeanCache().removeAll(new HashSet<>(keys)); } for (BeanPropertyAssocOne imported : propertiesOneImported) { imported.cacheClear(); @@ -767,7 +764,7 @@ void persistDeleteIds(Collection ids, CacheChangeSet changeSet) { changeSet.addInvalidate(desc); } else { queryCacheClear(changeSet); - if (beanCache != null) { + if (hasBeanCache()) { changeSet.addBeanRemoveMany(desc, ids); } cacheDeleteImported(true, null, changeSet); @@ -782,7 +779,7 @@ void persistDelete(Object id, PersistRequestBean deleteRequest, CacheChangeSe changeSet.addInvalidate(desc); } else { queryCacheClear(changeSet); - if (beanCache != null) { + if (hasBeanCache()) { changeSet.addBeanRemove(desc, id); } cacheDeleteImported(true, deleteRequest.entityBean(), changeSet); @@ -817,7 +814,7 @@ void persistUpdate(Object id, PersistRequestBean updateRequest, CacheChangeSe } else { queryCacheClear(changeSet); - if (beanCache == null) { + if (!hasBeanCache()) { // query caching only return; } @@ -860,7 +857,7 @@ void persistTableIUD(TableIUD tableIUD, CacheChangeSet changeSet) { void cacheNaturalKeyPut(String key, String newKey) { if (newKey != null) { - naturalKeyCache.put(newKey, key); + getNaturalKeyCache().put(newKey, key); } } @@ -893,7 +890,7 @@ void cacheBeanUpdate(String key, Map changes, boolean updateNatu if (natLog.isLoggable(DEBUG)) { natLog.log(DEBUG, ".. update {0} REMOVE({1}) - old key for ({2})", cacheName, oldKey, key); } - naturalKeyCache.remove(oldKey); + getNaturalKeyCache().remove(oldKey); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelpFixed.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelpFixed.java new file mode 100644 index 0000000000..448f661cce --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelpFixed.java @@ -0,0 +1,72 @@ +package io.ebeaninternal.server.deploy; + +import io.ebean.cache.ServerCache; +import io.ebeaninternal.server.cache.SpiCacheManager; +import io.ebeaninternal.server.core.CacheOptions; + + +/** + * Helper for BeanDescriptor that manages the bean, query and collection caches. + * + * @param The entity bean type + */ +final class BeanDescriptorCacheHelpFixed extends BeanDescriptorCacheHelp { + private final ServerCache beanCache; + private final ServerCache naturalKeyCache; + private final ServerCache queryCache; + + + BeanDescriptorCacheHelpFixed(BeanDescriptor desc, SpiCacheManager cacheManager, CacheOptions cacheOptions, + boolean cacheSharableBeans, BeanPropertyAssocOne[] propertiesOneImported) { + super(desc, cacheManager, cacheOptions, cacheSharableBeans, propertiesOneImported); + if (!cacheOptions.isEnableQueryCache()) { + this.queryCache = null; + } else { + this.queryCache = cacheManager.getQueryCache(beanType); + } + + if (cacheOptions.isEnableBeanCache()) { + this.beanCache = cacheManager.getBeanCache(beanType); + if (cacheOptions.getNaturalKey() != null) { + this.naturalKeyCache = cacheManager.getNaturalKeyCache(beanType); + } else { + this.naturalKeyCache = null; + } + } else { + this.beanCache = null; + this.naturalKeyCache = null; + } + } + + @Override + boolean hasBeanCache() { + return beanCache != null; + } + + @Override + boolean hasQueryCache() { + return queryCache != null; + } + + + @Override + ServerCache getQueryCache() { + return queryCache; + } + + @Override + ServerCache getNaturalKeyCache() { + return naturalKeyCache; + } + + /** + * Return the beanCache creating it if necessary. + */ + @Override + ServerCache getBeanCache() { + if (beanCache == null) { + throw new IllegalStateException("No bean cache enabled for " + desc + ". Add the @Cache annotation."); + } + return beanCache; + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelpPartitioned.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelpPartitioned.java new file mode 100644 index 0000000000..0e6ccd537f --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelpPartitioned.java @@ -0,0 +1,74 @@ +package io.ebeaninternal.server.deploy; + +import io.ebean.cache.ServerCache; +import io.ebeaninternal.server.cache.SpiCacheManager; +import io.ebeaninternal.server.core.CacheOptions; + +import java.util.function.Supplier; + +/** + * Helper for BeanDescriptor that manages the bean, query and collection caches. + * + * @param The entity bean type + */ +final class BeanDescriptorCacheHelpPartitioned extends BeanDescriptorCacheHelp { + private final Supplier beanCacheSupplier; + private final Supplier naturalKeyCacheSupplier; + private final Supplier queryCacheSupplier; + + + BeanDescriptorCacheHelpPartitioned(BeanDescriptor desc, SpiCacheManager cacheManager, CacheOptions cacheOptions, + boolean cacheSharableBeans, BeanPropertyAssocOne[] propertiesOneImported) { + super(desc, cacheManager, cacheOptions, cacheSharableBeans, propertiesOneImported); + if (!cacheOptions.isEnableQueryCache()) { + this.queryCacheSupplier = null; + } else { + this.queryCacheSupplier = () -> cacheManager.getQueryCache(beanType); + } + + if (cacheOptions.isEnableBeanCache()) { + this.beanCacheSupplier = () -> cacheManager.getBeanCache(beanType); + if (cacheOptions.getNaturalKey() != null) { + this.naturalKeyCacheSupplier = () -> cacheManager.getNaturalKeyCache(beanType); + } else { + this.naturalKeyCacheSupplier = null; + } + } else { + this.beanCacheSupplier = null; + this.naturalKeyCacheSupplier = null; + } + } + + @Override + boolean hasBeanCache() { + return beanCacheSupplier != null; + } + + @Override + boolean hasQueryCache() { + return queryCacheSupplier != null; + } + + + @Override + ServerCache getQueryCache() { + return queryCacheSupplier.get(); + } + + @Override + ServerCache getNaturalKeyCache() { + return naturalKeyCacheSupplier.get(); + } + + /** + * Return the beanCache creating it if necessary. + */ + @Override + ServerCache getBeanCache() { + if (beanCacheSupplier != null) { + return beanCacheSupplier.get(); + } else { + throw new IllegalStateException("No bean cache enabled for " + desc + ". Add the @Cache annotation."); + } + } +} From 924f6114babed447822be2a9be0c00d00a3a2e8d Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:28:07 +0200 Subject: [PATCH 008/123] PR #3041 - IMPROVED: checkUniqueness supports queryCache and skipClean --- ebean-api/src/main/java/io/ebean/DB.java | 4 +- .../src/main/java/io/ebean/Database.java | 13 +- .../server/core/DefaultServer.java | 37 ++++-- .../xtest/internal/api/TDSpiEbeanServer.java | 7 +- .../ebean/xtest/internal/api/TDSpiServer.java | 7 +- .../tests/insert/TestInsertCheckUnique.java | 119 +++++++++++++++++- .../model/basic/EBasicWithUniqueCon.java | 3 + 7 files changed, 163 insertions(+), 27 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index f20bcb740c..4109291fd0 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -501,8 +501,8 @@ public static Set checkUniqueness(Object bean) { /** * Same as {@link #checkUniqueness(Object)} but with given transaction. */ - public static Set checkUniqueness(Object bean, Transaction transaction) { - return getDefault().checkUniqueness(bean, transaction); + public static Set checkUniqueness(Object bean, Transaction transaction, boolean useQueryCache, boolean skipClean) { + return getDefault().checkUniqueness(bean, transaction, useQueryCache, skipClean); } /** diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 21fb37d05b..5df0e22ee8 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -1105,12 +1105,21 @@ public interface Database { * @param bean The entity bean to check uniqueness on * @return a set of Properties if constraint validation was detected or empty list. */ - Set checkUniqueness(Object bean); + default Set checkUniqueness(Object bean) { + return checkUniqueness(bean, null, false, true); + } /** * Same as {@link #checkUniqueness(Object)}. but with given transaction. */ - Set checkUniqueness(Object bean, Transaction transaction); + default Set checkUniqueness(Object bean, Transaction transaction) { + return checkUniqueness(bean, transaction, false, true); + } + + /** + * Same as {@link #checkUniqueness(Object)}. but with given transaction and extended search options. + */ + Set checkUniqueness(Object bean, Transaction transaction, boolean useQueryCache, boolean skipClean); /** * Marks the entity bean as dirty. 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 4295f2aec6..5f2a6aac1a 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 @@ -2182,12 +2182,7 @@ public void slowQueryCheck(long timeMicros, int rowCount, SpiQuery query) { } @Override - public Set checkUniqueness(Object bean) { - return checkUniqueness(bean, null); - } - - @Override - public Set checkUniqueness(Object bean, @Nullable Transaction transaction) { + public Set checkUniqueness(Object bean, @Nullable Transaction transaction, boolean useQueryCache, boolean skipClean) { EntityBean entityBean = checkEntityBean(bean); BeanDescriptor beanDesc = descriptor(entityBean.getClass()); BeanProperty idProperty = beanDesc.idProperty(); @@ -2199,13 +2194,14 @@ public Set checkUniqueness(Object bean, @Nullable Transaction transact if (entityBean._ebean_getIntercept().isNew() && id != null) { // Primary Key is changeable only on new models - so skip check if we are not new Query query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory); + query.setUseQueryCache(useQueryCache); query.setId(id); - if (findCount(query, transaction) > 0) { + if (exists(query, transaction)) { return Collections.singleton(idProperty); } } for (BeanProperty[] props : beanDesc.uniqueProps()) { - Set ret = checkUniqueness(entityBean, beanDesc, props, transaction); + Set ret = checkUniqueness(entityBean, beanDesc, props, transaction, useQueryCache, skipClean); if (ret != null) { return ret; } @@ -2213,13 +2209,34 @@ public Set checkUniqueness(Object bean, @Nullable Transaction transact return Collections.emptySet(); } + /** + * Checks, if any property is dirty. + */ + private boolean isAnyPropertyDirty(EntityBean entityBean, BeanProperty[] props) { + if (entityBean._ebean_getIntercept().isNew()) { + return true; + } + for (BeanProperty prop : props) { + if (entityBean._ebean_getIntercept().isDirtyProperty(prop.propertyIndex())) { + return true; + } + } + return false; + } + /** * Returns a set of properties if saving the bean will violate the unique constraints (defined by given properties). */ @Nullable - private Set checkUniqueness(EntityBean entityBean, BeanDescriptor beanDesc, BeanProperty[] props, @Nullable Transaction transaction) { + private Set checkUniqueness(EntityBean entityBean, BeanDescriptor beanDesc, BeanProperty[] props, @Nullable Transaction transaction, + boolean useQueryCache, boolean skipClean) { + if (skipClean && !isAnyPropertyDirty(entityBean, props)) { + return null; + } + BeanProperty idProperty = beanDesc.idProperty(); Query query = new DefaultOrmQuery<>(beanDesc, this, expressionFactory); + query.setUseQueryCache(useQueryCache); ExpressionList exprList = query.where(); if (!entityBean._ebean_getIntercept().isNew()) { // if model is not new, exclude ourself. @@ -2232,7 +2249,7 @@ private Set checkUniqueness(EntityBean entityBean, BeanDescriptor b } exprList.eq(prop.name(), value); } - if (findCount(query, transaction) > 0) { + if (exists(query, transaction)) { Set ret = new LinkedHashSet<>(); Collections.addAll(ret, props); return ret; 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 6d9a752143..96ad00cbc5 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 @@ -958,12 +958,7 @@ public void slowQueryCheck(long executionTimeMicros, int rowCount, SpiQuery q } @Override - public Set checkUniqueness(Object bean) { - return Collections.emptySet(); - } - - @Override - public Set checkUniqueness(Object bean, Transaction transaction) { + public Set checkUniqueness(Object bean, Transaction transaction, boolean useQueryCache, boolean skipClean) { return Collections.emptySet(); } diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java index 3fa7f84b8a..1aecd3d5c4 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java @@ -399,12 +399,7 @@ public int saveAll(Collection beans, Transaction transaction) throws Optimist } @Override - public Set checkUniqueness(Object bean) { - return null; - } - - @Override - public Set checkUniqueness(Object bean, Transaction transaction) { + public Set checkUniqueness(Object bean, Transaction transaction, boolean useQueryCache, boolean skipClean) { return null; } diff --git a/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java b/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java index c7cf31b77c..0efa0272ee 100644 --- a/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java +++ b/ebean-test/src/test/java/org/tests/insert/TestInsertCheckUnique.java @@ -1,13 +1,16 @@ package org.tests.insert; -import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Transaction; import io.ebean.plugin.Property; +import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.tests.model.basic.EBasicWithUniqueCon; import org.tests.model.draftable.Document; +import java.util.List; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; @@ -102,9 +105,123 @@ public void example() { System.out.println("uniqueProperties > " + uniqueProperties); System.out.println(" custom msg > " + msg); + } + LoggedSql.start(); assertThat(DB.checkUniqueness(doc2).toString()).contains("title"); + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(1); + assertThat(sql.get(0)).contains("select t0.id from document t0 where t0.title = ?"); + + + } + } + + /** + * When invoking checkUniqueness multiple times, we can benefit from the "exists" query cache if bean has query cache enabled + */ + @Test + public void testUseQueryCache() { + DB.find(EBasicWithUniqueCon.class).delete(); // clean up DB (otherwise test may be affected by other test) + + EBasicWithUniqueCon basic = new EBasicWithUniqueCon(); + basic.setName("foo"); + basic.setOther("bar"); + basic.setOtherOne("baz"); + + // create a new bean + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, null, true, false)).isEmpty(); + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + assertThat(sql.get(0)).contains("select t0.id from e_basicverucon t0 where t0.name = ?"); + assertThat(sql.get(1)).contains("select t0.id from e_basicverucon t0 where t0.other = ? and t0.other_one = ?"); + DB.save(basic); + try { + // reload from database + basic = DB.find(EBasicWithUniqueCon.class, basic.getId()); + + // and check again + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, null, true, false)).isEmpty(); + sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + assertThat(sql.get(0)).contains("select t0.id from e_basicverucon t0 where t0.id <> ? and t0.name = ?"); + assertThat(sql.get(1)).contains("select t0.id from e_basicverucon t0 where t0.id <> ? and t0.other = ? and t0.other_one = ?"); + + // and check again - expect to hit query cache + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, null, true, false)).isEmpty(); + sql = LoggedSql.stop(); + assertThat(sql).as("Expected to hit query cache").hasSize(0); + + // and check again, where only one value is changed + basic.setOther("fooo"); + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, null, true, false)).isEmpty(); + sql = LoggedSql.stop(); + assertThat(sql).hasSize(1); + assertThat(sql.get(0)).contains("fooo,baz)"); + + } finally { + DB.delete(EBasicWithUniqueCon.class, basic.getId()); + } + } + + + /** + * When invoking checkUniqueness multiple times, we can benefit from the "exists" query cache if bean has query cache enabled + */ + @Test + public void testSkipClean() { + DB.find(EBasicWithUniqueCon.class).delete(); // clean up DB (otherwise test may be affected by other test) + + EBasicWithUniqueCon basic = new EBasicWithUniqueCon(); + basic.setName("foo"); + basic.setOther("bar"); + basic.setOtherOne("baz"); + + // create a new bean + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, null, false, true)).isEmpty(); + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + assertThat(sql.get(0)).contains("select t0.id from e_basicverucon t0 where t0.name = ?"); + assertThat(sql.get(1)).contains("select t0.id from e_basicverucon t0 where t0.other = ? and t0.other_one = ?"); + DB.save(basic); + try (Transaction txn = DB.beginTransaction()) { + // reload from database + basic = DB.find(EBasicWithUniqueCon.class, basic.getId()); + + // and check again. We do not check unmodified properties + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, txn, false, true)).isEmpty(); + sql = LoggedSql.stop(); + assertThat(sql).hasSize(0); + + // and check again, where only one value is changed + basic.setOther("fooo"); + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, txn, false, true)).isEmpty(); + sql = LoggedSql.stop(); + assertThat(sql).hasSize(1); + assertThat(sql.get(0)).contains("fooo,baz)"); + + // multiple checks will hit DB + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, txn, false, true)).isEmpty(); + sql = LoggedSql.stop(); + assertThat(sql).hasSize(1); + + // enable also query cache + assertThat(DB.checkUniqueness(basic, txn, true, true)).isEmpty(); + LoggedSql.start(); + assertThat(DB.checkUniqueness(basic, txn, true, true)).isEmpty(); + sql = LoggedSql.stop(); + assertThat(sql).isEmpty(); + } finally { + DB.delete(EBasicWithUniqueCon.class, basic.getId()); } } } diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java index 20a1326b2b..6573b3007e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java @@ -1,10 +1,13 @@ package org.tests.model.basic; +import io.ebean.annotation.Cache; + import javax.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; @Entity +@Cache(enableQueryCache = true) @Table(name = "e_basicverucon") @UniqueConstraint(columnNames = {"other", "other_one"}) public class EBasicWithUniqueCon { From 590cecd6975f3250cc387b465e6b0144b638074e Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:30:18 +0200 Subject: [PATCH 009/123] PR #3143 - FEATURE: DbJson Support for Dto-Queries --- .../deploy/meta/DeployBeanProperty.java | 14 +++- .../server/deploy/meta/DeployProperty.java | 53 ++++++++++++ .../server/deploy/parse/DeployUtil.java | 2 +- .../server/dto/DtoMetaBuilder.java | 10 ++- .../server/dto/DtoMetaDeployProperty.java | 81 +++++++++++++++++++ .../server/dto/DtoMetaProperty.java | 71 +++++++++++++++- .../server/type/DefaultTypeManager.java | 27 +++++-- .../server/type/TypeManager.java | 11 ++- .../org/tests/json/TestDbJson_Jackson.java | 75 ++++++++++++++++- 9 files changed, 325 insertions(+), 19 deletions(-) create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployProperty.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaDeployProperty.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 4f927043c5..4a1499138a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -35,7 +35,7 @@ * Description of a property of a bean. Includes its deployment information such * as database column mapping information. */ -public class DeployBeanProperty { +public class DeployBeanProperty implements DeployProperty { private static final int ID_ORDER = 1000000; private static final int UNIDIRECTIONAL_ORDER = 100000; @@ -226,6 +226,11 @@ public DeployBeanDescriptor getDesc() { return desc; } + @Override + public Class getOwnerType() { + return desc.getBeanType(); + } + /** * Return the DB column length for character columns. *

@@ -258,10 +263,12 @@ public void setJsonDeserialize(boolean jsonDeserialize) { this.jsonDeserialize = jsonDeserialize; } + @Override public MutationDetection getMutationDetection() { return mutationDetection; } + @Override public void setMutationDetection(MutationDetection dirtyDetection) { this.mutationDetection = dirtyDetection; } @@ -476,8 +483,9 @@ public void setGeneratedProperty(GeneratedProperty generatedValue) { } /** - * Return true if this property is mandatory. + * Return true if this property is not mandatory. */ + @Override public boolean isNullable() { return nullable; } @@ -848,6 +856,7 @@ public Class getPropertyType() { /** * Return the generic type for this property. */ + @Override public Type getGenericType() { return genericType; } @@ -1052,6 +1061,7 @@ public A getMetaAnnotation(Class annotationType) { return null; } + @Override @SuppressWarnings("unchecked") public List getMetaAnnotations(Class annotationType) { List result = new ArrayList<>(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployProperty.java new file mode 100644 index 0000000000..0fe3a4b8f1 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployProperty.java @@ -0,0 +1,53 @@ +package io.ebeaninternal.server.deploy.meta; + +import io.ebean.annotation.MutationDetection; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.List; + +/** + * Property, with basic type information (BeanProperty and DtoProperty). + */ +public interface DeployProperty { + + /** + * Return the name of the property. + */ + String getName(); + + /** + * Return the generic type for this property. + */ + Type getGenericType(); + + /** + * Return the property type. + */ + Class getPropertyType(); + + /** + * Returns the owner class of this property. + */ + Class getOwnerType(); + + /** + * Returns the annotations on this property. + */ + List getMetaAnnotations(Class annotationType); + + /** + * Returns the mutation detection setting of this property. + */ + MutationDetection getMutationDetection(); + + /** + * Sets the mutation detection setting of this property. + */ + void setMutationDetection(MutationDetection mutationDetection); + + /** + * Return true if this property is not mandatory. + */ + boolean isNullable(); +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index ba7937dc68..9fe23c0b1c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -224,7 +224,7 @@ private void setDbJsonType(DeployBeanProperty prop, int dbType, int dbLength, Mu /** * Return the JDBC type for the JSON storage type. */ - private int dbJsonStorage(DbJsonType dbJsonType) { + public static int dbJsonStorage(DbJsonType dbJsonType) { switch (dbJsonType) { case JSONB: return DbPlatformType.JSONB; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java index 06929cefeb..bb6dde7fa3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaBuilder.java @@ -1,5 +1,7 @@ package io.ebeaninternal.server.dto; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonB; import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.server.type.TypeManager; @@ -21,10 +23,16 @@ final class DtoMetaBuilder { private final Class dtoType; private final List properties = new ArrayList<>(); private final Map constructorMap = new HashMap<>(); + private final Set> annotationFilter = new HashSet<>(); DtoMetaBuilder(Class dtoType, TypeManager typeManager) { this.dtoType = dtoType; this.typeManager = typeManager; + annotationFilter.add(DbJson.class); + annotationFilter.add(DbJsonB.class); + if (typeManager.jsonMarkerAnnotation() != null) { + annotationFilter.add(typeManager.jsonMarkerAnnotation()); + } } DtoMeta build() { @@ -38,7 +46,7 @@ private void readProperties() { if (includeMethod(method)) { try { final String name = propertyName(method.getName()); - properties.add(new DtoMetaProperty(typeManager, dtoType, method, name)); + properties.add(new DtoMetaProperty(typeManager, dtoType, method, name, annotationFilter)); } catch (Exception e) { CoreLog.log.log(DEBUG, "exclude on " + dtoType + " method " + method, e); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaDeployProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaDeployProperty.java new file mode 100644 index 0000000000..d4519fe509 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaDeployProperty.java @@ -0,0 +1,81 @@ +package io.ebeaninternal.server.dto; + +import io.ebean.annotation.MutationDetection; +import io.ebeaninternal.server.deploy.meta.DeployProperty; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +/** + * DeployProperty for Dto-Properties. + * + * @author Roland Praml, FOCONIS AG + */ +class DtoMetaDeployProperty implements DeployProperty { + private final String name; + private final Class ownerType; + private final Type genericType; + private final Class propertyType; + private final Set metaAnnotations; + private final boolean nullable; + private MutationDetection mutationDetection = MutationDetection.DEFAULT; + + DtoMetaDeployProperty(String name, Class ownerType, Type genericType, Class propertyType, Set metaAnnotations, Method method) { + this.name = name; + this.ownerType = ownerType; + this.genericType = genericType; + this.nullable = !propertyType.isPrimitive(); + this.propertyType = propertyType; + this.metaAnnotations = metaAnnotations; + } + + @Override + public String getName() { + return name; + } + + @Override + public Type getGenericType() { + return genericType; + } + + @Override + public Class getPropertyType() { + return propertyType; + } + + @Override + public Class getOwnerType() { + return ownerType; + } + + @Override + public List getMetaAnnotations(Class annotationType) { + List result = new ArrayList<>(); + for (Annotation ann : metaAnnotations) { + if (ann.annotationType() == annotationType) { + result.add((A) ann); + } + } + return result; + } + + @Override + public MutationDetection getMutationDetection() { + return mutationDetection; + } + + @Override + public void setMutationDetection(MutationDetection mutationDetection) { + this.mutationDetection = mutationDetection; + } + + @Override + public boolean isNullable() { + return nullable; + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java index 680c0095b6..6a052fe05c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/dto/DtoMetaProperty.java @@ -1,15 +1,26 @@ package io.ebeaninternal.server.dto; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonB; +import io.ebean.config.dbplatform.DbPlatformType; import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; +import io.ebean.util.AnnotationUtil; +import io.ebeaninternal.server.deploy.meta.DeployProperty; +import io.ebeaninternal.server.deploy.parse.DeployUtil; import io.ebeaninternal.server.type.TypeManager; +import java.lang.annotation.Annotation; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; +import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.sql.SQLException; +import java.util.Collections; +import java.util.List; +import java.util.Set; final class DtoMetaProperty implements DtoReadSet { @@ -20,18 +31,74 @@ final class DtoMetaProperty implements DtoReadSet { private final MethodHandle setter; private final ScalarType scalarType; - DtoMetaProperty(TypeManager typeManager, Class dtoType, Method writeMethod, String name) throws IllegalAccessException, NoSuchMethodException { + DtoMetaProperty(TypeManager typeManager, Class dtoType, Method writeMethod, String name, Set> annotationFilter) + throws IllegalAccessException, NoSuchMethodException { this.dtoType = dtoType; this.name = name; if (writeMethod != null) { this.setter = lookupMethodHandle(dtoType, writeMethod); - this.scalarType = typeManager.type(propertyType(writeMethod), propertyClass(writeMethod)); + Field field = findField(dtoType, name); + DeployProperty deployProp = new DtoMetaDeployProperty(name, + dtoType, + propertyType(writeMethod), + propertyClass(writeMethod), + field == null ? Collections.emptySet() : AnnotationUtil.metaFindAllFor(field, annotationFilter), + writeMethod); + scalarType = getScalarType(typeManager, deployProp); } else { this.scalarType = null; this.setter = null; } } + private ScalarType getScalarType(TypeManager typeManager, DeployProperty deployProp) { + final ScalarType scalarType; + + List json = deployProp.getMetaAnnotations(DbJson.class); + if (!json.isEmpty()) { + return typeManager.dbJsonType(deployProp, DeployUtil.dbJsonStorage(json.get(0).storage()), json.get(0).length()); + } + List jsonB = deployProp.getMetaAnnotations(DbJsonB.class); + if (!jsonB.isEmpty()) { + return typeManager.dbJsonType(deployProp, DbPlatformType.JSONB, jsonB.get(0).length()); + } + if (typeManager.jsonMarkerAnnotation() != null + && !deployProp.getMetaAnnotations(typeManager.jsonMarkerAnnotation()).isEmpty()) { + return typeManager.dbJsonType(deployProp, DbPlatformType.JSON, 0); + } + return typeManager.type(deployProp); + + + } + + /** + * Find all annotations on fields and methods. + */ + private Set findMetaAnnotations(Class dtoType, Method writeMethod, String name, Set> annotationFilter) { + Field field = findField(dtoType, name); + if (field != null) { + Set metaAnnotations = AnnotationUtil.metaFindAllFor(field, annotationFilter); + metaAnnotations.addAll(AnnotationUtil.metaFindAllFor(writeMethod, annotationFilter)); + return metaAnnotations; + } else { + return AnnotationUtil.metaFindAllFor(writeMethod, annotationFilter); + } + } + + /** + * Find field in class with same name + */ + private Field findField(Class type, String name) { + while (type != Object.class && type != null) { + try { + return dtoType.getDeclaredField(name); + } catch (NoSuchFieldException e) { + type = type.getSuperclass(); + } + } + return null; + } + private static MethodHandle lookupMethodHandle(Class dtoType, Method method) throws NoSuchMethodException, IllegalAccessException { return LOOKUP.findVirtual(dtoType, method.getName(), MethodType.methodType(method.getReturnType(), method.getParameterTypes())); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index fd50c145b2..141f81a020 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -18,10 +18,12 @@ import io.ebeaninternal.server.core.ServiceUtil; import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployProperty; import javax.persistence.AttributeConverter; import javax.persistence.EnumType; import java.io.File; +import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; @@ -191,7 +193,8 @@ public ScalarType type(int jdbcType) { } @Override - public ScalarType type(Type propertyType, Class propertyClass) { + public ScalarType type(DeployProperty prop) { + Type propertyType = prop.getGenericType(); if (propertyType instanceof ParameterizedType) { ParameterizedType pt = (ParameterizedType) propertyType; Type rawType = pt.getRawType(); @@ -199,7 +202,7 @@ public ScalarType type(Type propertyType, Class propertyClass) { return dbArrayType((Class) rawType, propertyType, true); } } - return type(propertyClass); + return type(prop.getPropertyType()); } /** @@ -297,8 +300,14 @@ private boolean isEnumType(Type valueType) { return TypeReflectHelper.isEnumType(valueType); } + @Override - public ScalarType dbJsonType(DeployBeanProperty prop, int dbType, int dbLength) { + public Class jsonMarkerAnnotation() { + return jsonMapper == null ? null : jsonMapper.markerAnnotation(); + } + + @Override + public ScalarType dbJsonType(DeployProperty prop, int dbType, int dbLength) { Class type = prop.getPropertyType(); if (type.equals(String.class)) { return ScalarTypeJsonString.typeFor(postgres, dbType); @@ -328,14 +337,14 @@ public ScalarType dbJsonType(DeployBeanProperty prop, int dbType, int dbLengt return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT); } - private boolean keepSource(DeployBeanProperty prop) { + private boolean keepSource(DeployProperty prop) { if (prop.getMutationDetection() == MutationDetection.DEFAULT) { prop.setMutationDetection(jsonManager.mutationDetection()); } return prop.getMutationDetection() == MutationDetection.SOURCE; } - private DocPropertyType docPropertyType(DeployBeanProperty prop, Class type) { + private DocPropertyType docPropertyType(DeployProperty prop, Class type) { return type.equals(List.class) || type.equals(Set.class) ? docType(prop.getGenericType()) : DocPropertyType.OBJECT; } @@ -369,14 +378,18 @@ private boolean isMapValueTypeObject(Type genericType) { return Object.class.equals(typeArgs[1]) || "?".equals(typeArgs[1].toString()); } - private ScalarType createJsonObjectMapperType(DeployBeanProperty prop, int dbType, DocPropertyType docType) { + private ScalarType createJsonObjectMapperType(DeployProperty prop, int dbType, DocPropertyType docType) { if (jsonMapper == null) { throw new IllegalArgumentException("Unsupported @DbJson mapping - Jackson ObjectMapper not present for " + prop); } if (MutationDetection.DEFAULT == prop.getMutationDetection()) { prop.setMutationDetection(jsonManager.mutationDetection()); } - var req = new ScalarJsonRequest(jsonManager, dbType, docType, prop.getDesc().getBeanType(), prop.getMutationDetection(), prop.getName()); + Class type = prop.getOwnerType(); + if (prop instanceof DeployBeanProperty) { + type = ((DeployBeanProperty) prop).getField().getDeclaringClass(); + } + var req = new ScalarJsonRequest(jsonManager, dbType, docType, type, prop.getMutationDetection(), prop.getName()); return jsonMapper.createType(req); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java index e683b43e61..828174a677 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java @@ -2,8 +2,10 @@ import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; +import io.ebeaninternal.server.deploy.meta.DeployProperty; import javax.persistence.EnumType; +import java.lang.annotation.Annotation; import java.lang.reflect.Type; /** @@ -40,20 +42,25 @@ public interface TypeManager { *

* For example Array based ScalarType for types like {@code List}. */ - ScalarType type(Type propertyType, Class type); + ScalarType type(DeployProperty property); /** * Create a ScalarType for an Enum using a mapping (rather than JPA Ordinal or String which has limitations). */ ScalarType enumType(Class> enumType, EnumType enumerated); + /** + * Returns the Json Marker annotation (e.g. JacksonAnnotation) + */ + Class jsonMarkerAnnotation(); + /** * Return the ScalarType used to handle JSON content. *

* Note that type expected to be JsonNode or Map. *

*/ - ScalarType dbJsonType(DeployBeanProperty prop, int dbType, int dbLength); + ScalarType dbJsonType(DeployProperty prop, int dbType, int dbLength); /** * Return the ScalarType used to handle DB ARRAY. diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java index 47fbfdc582..4826e3873e 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_Jackson.java @@ -1,15 +1,25 @@ package org.tests.json; import com.fasterxml.jackson.databind.ObjectMapper; -import io.ebean.xtest.BaseTestCase; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.ebean.DB; +import io.ebean.annotation.DbJson; +import io.ebean.annotation.DbJsonB; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.Test; +import org.tests.model.json.BasicJacksonType; import org.tests.model.json.EBasicJsonJackson; import org.tests.model.json.EBasicJsonJackson2; import org.tests.model.json.LongJacksonType; import org.tests.model.json.StringJacksonType; import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; @@ -59,9 +69,56 @@ public void testJsonDeserializeAnnotation() throws IOException { assertThat(found.getValueMap()).containsEntry(1L, "one").containsEntry(2L, "two"); } + public static class DtoJackson { + @DbJson(length = 700) + Set> valueSet = new LinkedHashSet<>(); + + @DbJsonB + List> valueList = new ArrayList<>(); + + @DbJson(length = 700) + @JsonDeserialize(keyAs = Long.class) + Map> valueMap = new LinkedHashMap<>(); + + @DbJson(length = 500) + BasicJacksonType plainValue; + + public Set> getValueSet() { + return valueSet; + } + + public void setValueSet(Set> valueSet) { + this.valueSet = valueSet; + } + + public List> getValueList() { + return valueList; + } + + public void setValueList(List> valueList) { + this.valueList = valueList; + } + + public Map> getValueMap() { + return valueMap; + } + + public void setValueMap(Map> valueMap) { + this.valueMap = valueMap; + } + + public BasicJacksonType getPlainValue() { + return plainValue; + } + + public void setPlainValue(BasicJacksonType plainValue) { + this.plainValue = plainValue; + } + } + /** * This testcase verifies if polymorph objects will work in ebean. - * + *

* for BasicJacksonType there exists two types and has a @JsonTypeInfo * annotation. It is expected that this information is also honored by ebean. */ @@ -94,7 +151,8 @@ public void testPolymorph() throws IOException { assertThat(found.getPlainValue()).isInstanceOf(LongJacksonType.class); assertThat(found.getValueList()).hasSize(2); assertThat(found.getValueSet()).hasSize(2); - assertThat(found.getValueMap()).hasSize(2);; + assertThat(found.getValueMap()).hasSize(2); + ; DB.save(bean); @@ -103,7 +161,16 @@ public void testPolymorph() throws IOException { assertThat(found.getPlainValue()).isInstanceOf(LongJacksonType.class); assertThat(found.getValueList()).hasSize(2); assertThat(found.getValueSet()).hasSize(2); - assertThat(found.getValueMap()).hasSize(2);; + assertThat(found.getValueMap()).hasSize(2); + + + DtoJackson dto = DB.find(EBasicJsonJackson2.class).setId(bean.getId()) + .select("valueSet,valueList,valueMap,plainValue").asDto(DtoJackson.class).findOne(); + + assertThat(dto.getPlainValue()).isInstanceOf(LongJacksonType.class); + assertThat(dto.getValueList()).hasSize(2); + assertThat(dto.getValueSet()).hasSize(2); + assertThat(dto.getValueMap()).hasSize(2); } From 063cb3d54b16ca1dc441ab9848b9df6a7dde4626 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:33:09 +0200 Subject: [PATCH 010/123] PR #3144 - FEATURE: NEW: QueryPlanLogger for DB2 --- .../java/io/ebean/config/DatabaseConfig.java | 20 ++ .../server/core/InternalConfiguration.java | 2 + .../server/query/QueryPlanLoggerDb2.java | 122 ++++++++++ .../server/query/QueryPlanLoggerDb2.sql | 211 ++++++++++++++++++ 4 files changed, 355 insertions(+) create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerDb2.java create mode 100644 ebean-core/src/main/resources/io/ebeaninternal/server/query/QueryPlanLoggerDb2.sql diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index 5d9ebe25b9..2062c0f65c 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -502,6 +502,11 @@ public class DatabaseConfig { */ private boolean queryPlanEnable; + /** + * Additional platform specific options for query-plan generation. + */ + private String queryPlanOptions; + /** * The default threshold in micros for collecting query plans. */ @@ -2878,6 +2883,7 @@ protected void loadSettings(PropertiesWrapper p) { queryPlanTTLSeconds = p.getInt("queryPlanTTLSeconds", queryPlanTTLSeconds); slowQueryMillis = p.getLong("slowQueryMillis", slowQueryMillis); queryPlanEnable = p.getBoolean("queryPlan.enable", queryPlanEnable); + queryPlanOptions = p.get("queryPlan.options", queryPlanOptions); queryPlanThresholdMicros = p.getLong("queryPlan.thresholdMicros", queryPlanThresholdMicros); queryPlanCapture = p.getBoolean("queryPlan.capture", queryPlanCapture); queryPlanCapturePeriodSecs = p.getLong("queryPlan.capturePeriodSecs", queryPlanCapturePeriodSecs); @@ -3277,6 +3283,20 @@ public void setQueryPlanEnable(boolean queryPlanEnable) { this.queryPlanEnable = queryPlanEnable; } + /** + * Returns platform specific query plan options. + */ + public String getQueryPlanOptions() { + return queryPlanOptions; + } + + /** + * Set platform specific query plan options. + */ + public void setQueryPlanOptions(String queryPlanOptions) { + this.queryPlanOptions = queryPlanOptions; + } + /** * Return the query plan collection threshold in microseconds. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 812057fbc9..b5c994c993 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -597,6 +597,8 @@ QueryPlanLogger queryPlanLogger(Platform platform) { return new QueryPlanLoggerSqlServer(); case ORACLE: return new QueryPlanLoggerOracle(); + case DB2: + return new QueryPlanLoggerDb2(config.getQueryPlanOptions()); default: return new QueryPlanLoggerExplain(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerDb2.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerDb2.java new file mode 100644 index 0000000000..568b9df5c5 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerDb2.java @@ -0,0 +1,122 @@ + +package io.ebeaninternal.server.query; + +import io.ebean.util.IOUtils; +import io.ebean.util.StringHelper; +import io.ebeaninternal.api.CoreLog; +import io.ebeaninternal.api.SpiDbQueryPlan; +import io.ebeaninternal.api.SpiQueryPlan; +import io.ebeaninternal.server.bind.capture.BindCapture; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Map; +import java.util.Random; + +import static java.lang.System.Logger.Level.WARNING; + +/** + * A QueryPlanLogger for DB2. + *

+ * To use query plan capturing, you have to install the explain tables with + * SYSPROC.SYSINSTALLOBJECTS( 'EXPLAIN', 'C' , '', CURRENT SCHEMA ). + * To do this in a repeatable script, you may use this statement: + * + * 

+ * BEGIN
+ * IF NOT EXISTS (SELECT * FROM SYSCAT.TABLES WHERE TABSCHEMA = CURRENT SCHEMA AND TABNAME = 'EXPLAIN_STREAM') THEN
+ *    call SYSPROC.SYSINSTALLOBJECTS( 'EXPLAIN', 'C' , '', CURRENT SCHEMA );
+ * END IF;
+ * END
+ *
+ * + * @author Roland Praml, FOCONIS AG + */ +public final class QueryPlanLoggerDb2 extends QueryPlanLogger { + + private Random rnd = new Random(); + + private final String schema; + + private final boolean create; + + private static final String GET_PLAN_TEMPLATE = readReasource("QueryPlanLoggerDb2.sql"); + + private static final String CREATE_TEMPLATE = "BEGIN\n" + + "IF NOT EXISTS (SELECT * FROM SYSCAT.TABLES WHERE TABSCHEMA = ${SCHEMA} AND TABNAME = 'EXPLAIN_STREAM') THEN\n" + + " CALL SYSPROC.SYSINSTALLOBJECTS( 'EXPLAIN', 'C' , '', ${SCHEMA} );\n" + + "END IF;\n" + + "END"; + + public QueryPlanLoggerDb2(String opts) { + Map map = StringHelper.delimitedToMap(opts, ";", "="); + create = !"false" .equals(map.get("create")); // default is create + String schema = map.get("schema"); // should be null or SYSTOOLS + if (schema == null || schema.isEmpty()) { + this.schema = null; + } else { + this.schema = schema.toUpperCase(); + } + } + + private static String readReasource(String resName) { + try (InputStream stream = QueryPlanLoggerDb2.class.getResourceAsStream(resName)) { + if (stream == null) { + throw new IllegalStateException("Could not find resource " + resName); + } + BufferedReader reader = IOUtils.newReader(stream); + StringBuilder sb = new StringBuilder(); + reader.lines().forEach(line -> sb.append(line).append('\n')); + return sb.toString(); + } catch (IOException e) { + throw new IllegalStateException("Could not read resource " + resName, e); + } + } + + @Override + public SpiDbQueryPlan collectPlan(Connection conn, SpiQueryPlan plan, BindCapture bind) { + try (Statement stmt = conn.createStatement()) { + if (create) { + // create explain tables if neccessary + if (schema == null) { + stmt.execute(CREATE_TEMPLATE.replace("${SCHEMA}", "CURRENT USER")); + } else { + stmt.execute(CREATE_TEMPLATE.replace("${SCHEMA}", "'" + schema + "'")); + } + conn.commit(); + } + + try { + int queryNo = rnd.nextInt(Integer.MAX_VALUE); + + String sql = "EXPLAIN PLAN SET QUERYNO = " + queryNo + " FOR " + plan.sql(); + try (PreparedStatement explainStmt = conn.prepareStatement(sql)) { + bind.prepare(explainStmt, conn); + explainStmt.execute(); + } + + sql = schema == null + ? GET_PLAN_TEMPLATE.replace("${SCHEMA}", conn.getMetaData().getUserName().toUpperCase()) + : GET_PLAN_TEMPLATE.replace("${SCHEMA}", schema); + + try (PreparedStatement pstmt = conn.prepareStatement(sql)) { + pstmt.setInt(1, queryNo); + try (ResultSet rset = pstmt.executeQuery()) { + return readQueryPlan(plan, bind, rset); + } + } + } finally { + conn.rollback(); // do not keep query plans in DB + } + } catch (SQLException e) { + CoreLog.log.log(WARNING, "Could not log query plan", e); + return null; + } + } +} diff --git a/ebean-core/src/main/resources/io/ebeaninternal/server/query/QueryPlanLoggerDb2.sql b/ebean-core/src/main/resources/io/ebeaninternal/server/query/QueryPlanLoggerDb2.sql new file mode 100644 index 0000000000..ae3993082c --- /dev/null +++ b/ebean-core/src/main/resources/io/ebeaninternal/server/query/QueryPlanLoggerDb2.sql @@ -0,0 +1,211 @@ +WITH tree(operator_ID, level, path, explain_time, cycle) +AS +( +SELECT 1 operator_id + , 0 level + , CAST('001' AS VARCHAR(1000)) path + , max(explain_time) explain_time + , 0 + FROM ${SCHEMA}.EXPLAIN_OPERATOR O + WHERE O.EXPLAIN_REQUESTER = SESSION_USER + +UNION ALL + +SELECT s.source_id + , level + 1 + , tree.path || '/' || LPAD(CAST(s.source_id AS VARCHAR(3)), 3, '0') path + , tree.explain_time + , POSITION('/' || LPAD(CAST(s.source_id AS VARCHAR(3)), 3, '0') || '/' IN path USING OCTETS) + FROM tree + , ${SCHEMA}.EXPLAIN_STREAM S + WHERE s.target_id = tree.operator_id + AND s.explain_time = tree.explain_time + AND S.Object_Name IS NULL + AND S.explain_requester = SESSION_USER + AND tree.cycle = 0 + AND level < 100 +) +SELECT * + FROM ( +SELECT "Explain Plan" + FROM ( +SELECT CAST( LPAD(id, MAX(LENGTH(id)) OVER(), ' ') + || ' | ' + || RPAD(operation, MAX(LENGTH(operation)) OVER(), ' ') + || ' | ' + || LPAD(rows, MAX(LENGTH(rows)) OVER(), ' ') + || ' | ' + -- Don't show ActualRows columns if there are no actuals available at all + || CASE WHEN COUNT(ActualRows) OVER () > 1 -- the heading 'ActualRows' is always present, so "1" means no OTHER values + THEN LPAD(ActualRows, MAX(LENGTH(ActualRows)) OVER(), ' ') || ' | ' + ELSE '' + END + || LPAD(cost, MAX(LENGTH(cost)) OVER(), ' ') + AS VARCHAR(100)) "Explain Plan" + , path + FROM ( +SELECT 'ID' ID + , 'Operation' Operation + , 'Rows' Rows + , 'ActualRows' ActualRows + , 'Cost' Cost + , '0' Path + FROM SYSIBM.SYSDUMMY1 +-- TODO: UNION ALL yields duplicate. where do they come from? +UNION +SELECT CAST(tree.operator_id as VARCHAR(254)) ID + , CAST(LPAD(' ', tree.level, ' ') + || CASE WHEN tree.cycle = 1 + THEN '(cycle) ' + ELSE '' + END + || COALESCE ( + TRIM(O.Operator_Type) + || COALESCE(' (' || argument || ')', '') + || ' ' + || COALESCE(S.Object_Name,'') + , '' + ) + AS VARCHAR(254)) AS OPERATION + , COALESCE(CAST(rows AS VARCHAR(254)), '') Rows + , CAST(ActualRows as VARCHAR(254)) ActualRows -- note: no coalesce + , COALESCE(CAST(CAST(O.Total_Cost AS BIGINT) AS VARCHAR(254)), '') Cost + , path + FROM tree + LEFT JOIN ( SELECT i.source_id + , i.target_id + , CAST(CAST(ROUND(o.stream_count) AS BIGINT) AS VARCHAR(12)) + || ' of ' + || CAST (total_rows AS VARCHAR(12)) + || CASE WHEN total_rows > 0 + AND ROUND(o.stream_count) <= total_rows THEN + ' (' + || LPAD(CAST (ROUND(ROUND(o.stream_count)/total_rows*100,2) + AS NUMERIC(5,2)), 6, ' ') + || '%)' + ELSE '' + END rows + , CASE WHEN act.actual_value is not null then + CAST(CAST(ROUND(act.actual_value) AS BIGINT) AS VARCHAR(12)) + || ' of ' + || CAST (total_rows AS VARCHAR(12)) + || CASE WHEN total_rows > 0 THEN + ' (' + || LPAD(CAST (ROUND(ROUND(act.actual_value)/total_rows*100,2) + AS NUMERIC(5,2)), 6, ' ') + || '%)' + ELSE NULL + END END ActualRows + , i.object_name + , i.explain_time + FROM (SELECT MAX(source_id) source_id + , target_id + , MIN(CAST(ROUND(stream_count,0) AS BIGINT)) total_rows + , CAST(LISTAGG(object_name) AS VARCHAR(50)) object_name + , explain_time + FROM ${SCHEMA}.EXPLAIN_STREAM + WHERE explain_time = (SELECT MAX(explain_time) + FROM ${SCHEMA}.EXPLAIN_OPERATOR + WHERE EXPLAIN_REQUESTER = SESSION_USER + ) + GROUP BY target_id, explain_time + ) I + LEFT JOIN ${SCHEMA}.EXPLAIN_STREAM O + ON ( I.target_id=o.source_id + AND I.explain_time = o.explain_time + AND O.EXPLAIN_REQUESTER = SESSION_USER + ) + LEFT JOIN ${SCHEMA}.EXPLAIN_ACTUALS act + ON ( act.operator_id = i.target_id + AND act.explain_time = i.explain_time + AND act.explain_requester = SESSION_USER + AND act.ACTUAL_TYPE like 'CARDINALITY%' + ) + ) s + ON ( s.target_id = tree.operator_id + AND s.explain_time = tree.explain_time + ) + LEFT JOIN ${SCHEMA}.EXPLAIN_OPERATOR O + ON ( o.operator_id = tree.operator_id + AND o.explain_time = tree.explain_time + AND o.explain_requester = SESSION_USER + ) + LEFT JOIN (SELECT LISTAGG (CASE argument_type + WHEN 'UNIQUE' THEN + CASE WHEN argument_value = 'TRUE' + THEN 'UNIQUE' + ELSE NULL + END + WHEN 'TRUNCSRT' THEN + CASE WHEN argument_value = 'TRUE' + THEN 'TOP-N' + ELSE NULL + END + WHEN 'SCANDIR' THEN + CASE WHEN argument_value != 'FORWARD' + THEN argument_value + ELSE NULL + END + ELSE argument_value + END + , ' ') argument + , operator_id + , explain_time + FROM ${SCHEMA}.EXPLAIN_ARGUMENT EA + WHERE argument_type IN ('AGGMODE' -- GRPBY + , 'UNIQUE', 'TRUNCSRT' -- SORT + , 'SCANDIR' -- IXSCAN, TBSCAN + , 'OUTERJN' -- JOINs + ) + AND explain_requester = SESSION_USER + GROUP BY explain_time, operator_id + + ) A + ON ( a.operator_id = tree.operator_id + AND a.explain_time = tree.explain_time + ) + ) O +UNION ALL +VALUES ('Explain plan (c) 2014-2017 by Markus Winand - NO WARRANTY - V20171102','Z0') + , ('Modifications by Ember Crooks - NO WARRANTY','Z1') + , ('http://use-the-index-luke.com/s/last_explained','Z2') + , ('', 'A') + , ('', 'Y') + , ('Predicate Information', 'AA') +UNION ALL +SELECT CAST (LPAD(CASE WHEN operator_id = LAG (operator_id) + OVER (PARTITION BY operator_id + ORDER BY pred_order + ) + THEN '' + ELSE operator_id || ' - ' + END + , MAX(LENGTH(operator_id )+4) OVER() + , ' ') + || how_applied + || ' ' + || predicate_text + AS VARCHAR(100)) "Predicate Information" + , 'P' || LPAD(id_order, 5, '0') || pred_order path + FROM (SELECT CAST(operator_id AS VARCHAR(254)) operator_id + , LPAD(trim(how_applied) + , MAX (LENGTH(TRIM(how_applied))) + OVER (PARTITION BY operator_id) + , ' ' + ) how_applied + -- next: capped to length 80 to avoid + -- SQL0445W Value "..." has been truncated. SQLSTATE=01004 + -- error when long literal values may appear (space padded!) + , CAST(substr(predicate_text, 1, 80) AS VARCHAR(80)) predicate_text + , CASE how_applied WHEN 'START' THEN '1' + WHEN 'STOP' THEN '2' + WHEN 'SARG' THEN '3' + ELSE '9' + END pred_order + , operator_id id_order + FROM ${SCHEMA}.EXPLAIN_PREDICATE p + WHERE explain_time = (SELECT max(explain_time) FROM ${SCHEMA}.EXPLAIN_STATEMENT WHERE queryno = ?) + ) +) +ORDER BY path +) From a71ef12e16fd46879c85ea8a235159fd78924e49 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:38:11 +0200 Subject: [PATCH 011/123] PR #3145 - FIX: Query on formula m2o-property uses wrong alias --- .../server/deploy/BeanProperty.java | 3 +- .../server/deploy/BeanPropertyAssocOne.java | 14 ++++- .../server/deploy/DbSqlContext.java | 2 +- .../server/query/DefaultDbSqlContext.java | 13 +++-- .../java/org/tests/model/basic/TreeNode.java | 31 +++++++++++ .../query/joins/TestQueryJoinOnFormula.java | 52 +++++++++++++++++++ 6 files changed, 108 insertions(+), 7 deletions(-) create mode 100644 ebean-test/src/test/java/org/tests/model/basic/TreeNode.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 4ad4fa35eb..a439e73794 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -456,7 +456,8 @@ public int fetchPreference() { @Override public void appendFrom(DbSqlContext ctx, SqlJoinType joinType, String manyWhere) { if (formula && sqlFormulaJoin != null) { - ctx.appendFormulaJoin(sqlFormulaJoin, joinType, manyWhere); + String alias = ctx.tableAliasManyWhere(manyWhere); + ctx.appendFormulaJoin(sqlFormulaJoin, joinType, alias); } else if (secondaryTableJoin != null) { String relativePrefix = ctx.relativePrefix(secondaryTableJoinPrefix); secondaryTableJoin.addJoin(joinType, relativePrefix, ctx); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 44666d2050..ef05929f7f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -613,12 +613,24 @@ public void appendSelect(DbSqlContext ctx, boolean subQuery) { } } + /** + * Add table join with explicit table alias. + */ + @Override + public SqlJoinType addJoin(SqlJoinType joinType, String a1, String a2, DbSqlContext ctx) { + if (sqlFormulaJoin != null) { + ctx.appendFormulaJoin(sqlFormulaJoin, joinType, a1); + } + return super.addJoin(joinType, a1, a2, ctx); + } + @Override public void appendFrom(DbSqlContext ctx, SqlJoinType joinType, String manyWhere) { if (!isTransient && !primaryKeyExport) { localHelp.appendFrom(ctx, joinType); if (sqlFormulaJoin != null) { - ctx.appendFormulaJoin(sqlFormulaJoin, joinType, manyWhere); + String alias = ctx.tableAliasManyWhere(manyWhere); + ctx.appendFormulaJoin(sqlFormulaJoin, joinType, alias); } } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java index 9557ee7a1e..be515b634a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DbSqlContext.java @@ -73,7 +73,7 @@ public interface DbSqlContext { * Append a Sql Formula join. This converts the "${ta}" keyword to the current * table alias. */ - void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType, String manyWhere); + void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType, String tableAlias); /** * Return the current content length. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java index f4611617cd..b615fcd4ea 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultDbSqlContext.java @@ -197,7 +197,7 @@ public String tableAlias(String prefix) { @Override public String tableAliasManyWhere(String prefix) { - return alias.tableAliasManyWhere(prefix); + return prefix == null ? tableAliasStack.peek() : alias.tableAliasManyWhere(prefix); } @Override @@ -225,9 +225,8 @@ public DefaultDbSqlContext append(String s) { } @Override - public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType, String manyWhere) { + public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType, String tableAlias) { // replace ${ta} placeholder with the real table alias... - String tableAlias = manyWhere == null ? tableAliasStack.peek() : tableAliasManyWhere(manyWhere); String converted = sqlFormulaJoin.replace(tableAliasPlaceHolder, tableAlias); if (formulaJoins == null) { formulaJoins = new HashSet<>(); @@ -240,11 +239,17 @@ public void appendFormulaJoin(String sqlFormulaJoin, SqlJoinType joinType, Strin formulaJoins.add(converted); sb.append(" "); if (joinType == SqlJoinType.OUTER) { - if ("join".equalsIgnoreCase(sqlFormulaJoin.substring(0, 4))) { + if ("join".equalsIgnoreCase(converted.substring(0, 4))) { // prepend left as we are in the 'many' part sb.append("left "); } } + if (joinType == SqlJoinType.INNER) { + if ("left join".equalsIgnoreCase(converted.substring(0, 9))) { + // remove left as we do not need it + converted = converted.substring(5); + } + } sb.append(converted); } diff --git a/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java b/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java new file mode 100644 index 0000000000..674d0f8241 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java @@ -0,0 +1,31 @@ +package org.tests.model.basic; + +import io.ebean.annotation.Formula; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import java.util.List; + +/** + * @author Roland Praml, FOCONIS AG + */ +@Entity +public class TreeNode { + + @Id + private int id; + + @ManyToOne + private TreeNode parent; + @OneToMany + private List children; + + private int softRef; + + @Formula(select = "${ta}_ref.id", join = "left join e_basic ${ta}_ref on ${ta}_ref.id = ${ta}.soft_ref") + @ManyToOne + private EBasic ref; + +} diff --git a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java index 3b28d33783..0cc1451515 100644 --- a/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java +++ b/ebean-test/src/test/java/org/tests/query/joins/TestQueryJoinOnFormula.java @@ -9,6 +9,7 @@ import org.tests.model.basic.Order; import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; +import org.tests.model.basic.TreeNode; import org.tests.model.family.ChildPerson; import org.tests.model.family.ParentPerson; @@ -405,4 +406,55 @@ public void test_fetch_complete_with_where() { + "where t2.name = ?"); } + public void test_softRef() { + + LoggedSql.start(); + + DB.find(TreeNode.class) + .where().isNotNull("ref.id") + .findList(); + + List loggedSql = LoggedSql.stop(); + assertThat(loggedSql.get(0)).contains("select t0.id, t0.soft_ref, t0.parent_id, t0_ref.id " + + "from tree_node t0 " + + "left join e_basic t0_ref on t0_ref.id = t0.soft_ref " + + "left join e_basic t1 on t1.id = t0_ref.id where t1.id is not null"); + } + + @Test + public void test_softRefChildren() { + + LoggedSql.start(); + + DB.find(TreeNode.class).select("id") + .where().isNotNull("children.ref.id") + .findList(); + + List loggedSql = LoggedSql.stop(); + if (isPostgresCompatible()) { + // TBD + } else { + assertThat(loggedSql.get(0)).contains("select distinct t0.id " + + "from tree_node t0 " + + "join tree_node u1 on u1.parent_id = t0.id " + + "join e_basic u1_ref on u1_ref.id = u1.soft_ref " + + "join e_basic u2 on u2.id = u1_ref.id where u2.id is not null"); + } + LoggedSql.start(); + DB.find(TreeNode.class).select("id") + .where().isNull("children.ref.id") + .findList(); + + loggedSql = LoggedSql.stop(); + if (isPostgresCompatible()) { + // TBD + } else { + assertThat(loggedSql.get(0)).contains("select distinct t0.id " + + "from tree_node t0 " + + "left join tree_node u1 on u1.parent_id = t0.id " + + "left join e_basic u1_ref on u1_ref.id = u1.soft_ref " + + "left join e_basic u2 on u2.id = u1_ref.id where u2.id is null"); + } + } + } From a54721fe1144d45d0974b65d60adf4e308a680f4 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:39:23 +0200 Subject: [PATCH 012/123] PR #3146 - FIX: ScalarTypes can handle String values --- .../server/type/ScalarTypeBoolean.java | 11 +++-------- .../server/type/ScalarTypeDouble.java | 2 +- .../server/type/ScalarTypeInteger.java | 3 ++- .../server/type/ScalarTypeLong.java | 2 +- .../server/type/ScalarTypeYear.java | 2 +- .../server/type/ScalarTypeIntegerTest.java | 19 +++++++++++++++++++ 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java index 62aa6c5538..6719200024 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeBoolean.java @@ -2,12 +2,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import io.ebean.core.type.DataBinder; -import io.ebean.core.type.DataReader; -import io.ebean.core.type.DocPropertyType; -import io.ebean.core.type.ScalarTypeBase; -import io.ebean.core.type.BasicTypeConverter; +import io.ebean.core.type.*; import java.io.DataInput; import java.io.DataOutput; @@ -348,8 +343,8 @@ public void writeData(DataOutput dataOutput, Boolean val) throws IOException { } @Override - public Boolean jsonRead(JsonParser parser) { - return JsonToken.VALUE_TRUE == parser.getCurrentToken() ? Boolean.TRUE : Boolean.FALSE; + public Boolean jsonRead(JsonParser parser) throws IOException { + return parser.getValueAsBoolean(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java index 3fe5deba07..0874bfe825 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDouble.java @@ -78,7 +78,7 @@ public void writeData(DataOutput dataOutput, Double value) throws IOException { @Override public Double jsonRead(JsonParser parser) throws IOException { - return parser.getDoubleValue(); + return parser.getValueAsDouble(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java index aea3b8d166..c4a2a7b1f3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeInteger.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; import io.ebean.core.type.DocPropertyType; @@ -88,7 +89,7 @@ public Integer parse(String value) { @Override public Integer jsonRead(JsonParser parser) throws IOException { - return parser.getIntValue(); + return parser.getValueAsInt(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java index b04a0a9369..6ee80ccea2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeLong.java @@ -88,7 +88,7 @@ public void writeData(DataOutput dataOutput, Long value) throws IOException { @Override public Long jsonRead(JsonParser parser) throws IOException { - return parser.getLongValue(); + return parser.getValueAsLong(); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java index 9c60047f54..071d20e1ea 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeYear.java @@ -83,7 +83,7 @@ public Year parse(String value) { @Override public Year jsonRead(JsonParser parser) throws IOException { - return Year.of(parser.getIntValue()); + return Year.of(parser.getValueAsInt()); } @Override diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java index ba292a20a6..b72e3306b9 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeIntegerTest.java @@ -1,8 +1,13 @@ package io.ebeaninternal.server.type; +import com.fasterxml.jackson.core.JsonParser; +import io.ebean.DB; import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.io.StringReader; + import static org.assertj.core.api.Assertions.assertThat; public class ScalarTypeIntegerTest { @@ -19,4 +24,18 @@ public void format_when_integer() { assertThat(type.format(1)).isEqualTo("1"); } + @Test + public void json() throws IOException { + + JsonParser parser = DB.json().createParser(new StringReader("1")); + parser.nextToken(); + Object parsed = type.jsonRead(parser); + assertThat(parsed).isEqualTo(1); + + parser = DB.json().createParser(new StringReader("\"1.0\"")); + parser.nextToken(); + parsed = type.jsonRead(parser); + assertThat(parsed).isEqualTo(1); + } + } From 6cd356c7e7276b669d2b3197725b7ccc223b7e1f Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:41:36 +0200 Subject: [PATCH 013/123] PR #3147 - FIX: Rethrow error in commit path of callbacks --- .../server/transaction/JdbcTransaction.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index 8520e649d8..9687c4c91a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -191,7 +191,6 @@ final void checkAutoCommit(Connection connection) throws SQLException { } - @Override public final void setAutoPersistUpdates(boolean autoPersistUpdates) { this.autoPersistUpdates = autoPersistUpdates; @@ -252,7 +251,7 @@ public final void register(TransactionCallback callback) { callbackList.add(callback); } - private void withEachCallback(Consumer consumer) { + private void withEachCallbackFailSilent(Consumer consumer) { if (callbackList != null) { // using old style loop to cater for case when new callbacks are added recursively (as otherwise iterator fails fast) for (int i = 0; i < callbackList.size(); i++) { @@ -260,17 +259,27 @@ private void withEachCallback(Consumer consumer) { consumer.accept(callbackList.get(i)); } catch (Exception e) { log.log(ERROR, "Error executing transaction callback", e); + throw wrapIfNeeded(e); } } } } + private void withEachCallback(Consumer consumer) { + if (callbackList != null) { + // using old style loop to cater for case when new callbacks are added recursively (as otherwise iterator fails fast) + for (int i = 0; i < callbackList.size(); i++) { + consumer.accept(callbackList.get(i)); + } + } + } + private void firePreRollback() { - withEachCallback(TransactionCallback::preRollback); + withEachCallbackFailSilent(TransactionCallback::preRollback); } private void firePostRollback() { - withEachCallback(TransactionCallback::postRollback); + withEachCallbackFailSilent(TransactionCallback::postRollback); if (changeLogHolder != null) { changeLogHolder.postRollback(); } From b4864715b45f68f40c0961bda267bf7c6be39a6d Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:42:57 +0200 Subject: [PATCH 014/123] PR #3148 - FIX: Recursive batch flush can save beans in wrong order --- .../server/persist/BatchControl.java | 19 ++++--- .../batchinsert/TestBatchInsertFlush.java | 50 +++++++++++++++---- .../basic/event/CustomerPersistAdapter.java | 13 ++++- 3 files changed, 66 insertions(+), 16 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java index 220842cf22..08e6bc6ab0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchControl.java @@ -224,14 +224,21 @@ private void flushPstmtHolder(boolean reset) throws BatchedSqlException { * Execute all the requests contained in the list. */ void executeNow(ArrayList list) throws BatchedSqlException { - for (int i = 0; i < list.size(); i++) { - if (i % batchSize == 0) { - // hit the batch size so flush - flushPstmtHolder(); + boolean old = transaction.isFlushOnQuery(); + transaction.setFlushOnQuery(false); + // disable flush on query due transsaction callbacks + try { + for (int i = 0; i < list.size(); i++) { + if (i % batchSize == 0) { + // hit the batch size so flush + flushPstmtHolder(); + } + list.get(i).executeNow(); } - list.get(i).executeNow(); + flushPstmtHolder(); + } finally { + transaction.setFlushOnQuery(old); } - flushPstmtHolder(); } public void flushOnCommit() throws BatchedSqlException { diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java index f0506ed58e..34be40f666 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchInsertFlush.java @@ -1,23 +1,23 @@ package org.tests.batchinsert; -import io.ebean.*; -import io.ebean.xtest.BaseTestCase; -import io.ebean.xtest.IgnorePlatform; +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.Transaction; import io.ebean.annotation.PersistBatch; import io.ebean.annotation.Platform; import io.ebean.annotation.Transactional; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.IgnorePlatform; import io.ebean.xtest.base.DtoQuery2Test; import io.ebeaninternal.api.SpiTransaction; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Customer; -import org.tests.model.basic.EBasicVer; -import org.tests.model.basic.TSDetail; -import org.tests.model.basic.TSMaster; +import org.tests.model.basic.*; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -25,6 +25,38 @@ public class TestBatchInsertFlush extends BaseTestCase { + @Test + public void batchFlush() { + + TSMaster m = new TSMaster(); + m.setName("master1"); + DB.save(m); + DB.getDefault().cacheManager().clearAll(); + + try (Transaction txn = DB.beginTransaction()) { + txn.setBatchSize(2); + txn.setBatchMode(true); + + List customers = new ArrayList<>(); + + for (int i = 0; i < 3; i++) { + Customer customer = ResetBasicData.createCustomer("BatchFlushPreInsert " + i, null, null, 3); + customer.addContact(new Contact("Fred" + i, "Blue")); + customers.add(customer); + } + + for (int i = 3; i < 6; i++) { + Customer customer = ResetBasicData.createCustomer("BatchFlushPostInsert " + i, null, null, 3); + customer.addContact(new Contact("Fred" + i, "Blue")); + customers.add(customer); + } + + DB.saveAll(customers); + + txn.commit(); + } + } + @Test public void no_cascade() { @@ -70,7 +102,7 @@ public void no_cascade() { // detail assertThat(sql.get(3)).contains("insert into t_detail_with_other_namexxxyy"); - assertThat(((SpiTransaction)transaction).label()).isEqualTo("TestBatchInsertFlush.no_cascade"); + assertThat(((SpiTransaction) transaction).label()).isEqualTo("TestBatchInsertFlush.no_cascade"); } finally { transaction.end(); @@ -133,7 +165,7 @@ public void transactional_flushOnDtoQuery() { // trigger JDBC batch by default DB.findDto(DtoQuery2Test.DCust.class, "select id, name from o_customer") - .findList(); + .findList(); List sql = LoggedSql.stop(); assertSql(sql.get(0)).contains("insert into e_basicver"); diff --git a/ebean-test/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java index 9ff0b4acfa..197f6e2415 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java +++ b/ebean-test/src/test/java/org/tests/model/basic/event/CustomerPersistAdapter.java @@ -1,8 +1,10 @@ package org.tests.model.basic.event; +import io.ebean.DB; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; import org.tests.model.basic.Customer; +import org.tests.model.basic.TSMaster; public class CustomerPersistAdapter extends BeanPersistAdapter { @@ -16,7 +18,9 @@ public boolean preInsert(BeanPersistRequest request) { // StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); // request.getTransaction().log("+++++ "+Arrays.toString(stackTrace)); - + if (((Customer) request.bean()).getName().startsWith("BatchFlushPreInsert")) { + DB.find(TSMaster.class).where().eq("name", "master1").exists(); + } return true; } @@ -28,4 +32,11 @@ public boolean preUpdate(BeanPersistRequest request) { return true; } + @Override + public void postInsert(BeanPersistRequest request) { + super.postInsert(request); + if (((Customer) request.bean()).getName().startsWith("BatchFlushPostInsert")) { + DB.find(TSMaster.class).where().eq("name", "master1").exists(); + } + } } From d9383dc9d96613fe95ace3f71ace565e2ba1d1a4 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:43:46 +0200 Subject: [PATCH 015/123] PR #3149 - FIX: TypeManager initialization fails, if Jackson is not on class path --- .../server/type/DefaultTypeManager.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index 141f81a020..2d0297cbaf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -97,8 +97,7 @@ public DefaultTypeManager(DatabaseConfig config, BootupClasses bootupClasses) { this.offlineMigrationGeneration = DbOffline.isGenerateMigration(); this.defaultEnumType = config.getDefaultEnumType(); - ServiceLoader mappers = ServiceLoader.load(ScalarJsonMapper.class); - jsonMapper = mappers.findFirst().orElse(null); + jsonMapper = findJsonMapper(); initialiseStandard(config); initialiseJavaTimeTypes(config); @@ -112,6 +111,28 @@ public DefaultTypeManager(DatabaseConfig config, BootupClasses bootupClasses) { } } + /** + * Searches the JsonMapper and checks if markerAnnotation is on class path. + */ + private static ScalarJsonMapper findJsonMapper() { + ServiceLoader mappers = ServiceLoader.load(ScalarJsonMapper.class); + ScalarJsonMapper mapper = mappers.findFirst().orElse(null); + if (mapper != null) { + try { + if (mapper.markerAnnotation() != null) { + return mapper; + } else { + log.log(System.Logger.Level.WARNING, "Not using {0}, because no marker annotation was provided. " + + "Please check, if there is a supported json library (e.g. jackson) on your classpath", mapper.getClass().getName()); + } + } catch (NoClassDefFoundError e) { + log.log(System.Logger.Level.WARNING, "Can not use {0}. An error occured: {1}. " + + "Please check, if there is a supported json library (e.g. jackson) on your classpath", mapper.getClass().getName(), e.getMessage()); + } + } + return null; + } + private void loadGeoTypeBinder(DatabaseConfig config) { GeoTypeProvider provider = config.getServiceObject(GeoTypeProvider.class); if (provider == null) { From e7f157e3e157cb1e55cf74784bd102eaaf2eb916 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:45:09 +0200 Subject: [PATCH 016/123] PR #3151 - NEW: DDL generation can be invoked separately --- .../src/main/java/io/ebean/Database.java | 4 ++++ .../io/ebeaninternal/api/SpiDdlGenerator.java | 5 ++++ .../server/core/DefaultServer.java | 5 ++++ .../server/core/InternalConfiguration.java | 5 ++++ .../dbmigration/DdlGenerator.java | 24 +++++++++---------- .../ebean/xtest/internal/api/TDSpiServer.java | 5 ++++ 6 files changed, 35 insertions(+), 13 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 5df0e22ee8..c61c60a7ef 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -1518,4 +1518,8 @@ default Set checkUniqueness(Object bean, Transaction transaction) { */ void truncate(Class... beanTypes); + /** + * RunDdl manually. This can be used if 'db.ddl.run=false' is set and you plan to run DDL manually. + */ + void runDdl(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java index b3c4858139..d821e75b84 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiDdlGenerator.java @@ -12,4 +12,9 @@ public interface SpiDdlGenerator { */ void execute(boolean online); + /** + * Run DDL manually. This can be used to initialize multi tenant environments or if you plan not to run + * DDL on startup + */ + void runDdl(); } 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 5f2a6aac1a..65c916243e 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 @@ -2291,4 +2291,9 @@ List queryPlanInit(QueryPlanInit initRequest) { List queryPlanCollectNow(QueryPlanRequest request) { return queryPlanManager.collect(request); } + + @Override + public void runDdl() { + ddlGenerator.runDdl(); + } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index b5c994c993..35a8ee0410 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -619,6 +619,11 @@ private static class NoopDdl implements SpiDdlGenerator { this.ddlRun = ddlRun; } + @Override + public void runDdl() { + CoreLog.log.log(ERROR, "Manual DDL run not possible"); + } + @Override public void execute(boolean online) { if (online && ddlRun) { diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index 4f935f28df..c0c56abddf 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -63,11 +63,10 @@ public DdlGenerator(SpiEbeanServer server) { if (!config.getTenantMode().isDdlEnabled() && config.isDdlRun()) { log.log(WARNING, "DDL can''t be run on startup with TenantMode " + config.getTenantMode()); this.runDdl = false; - this.useMigrationStoredProcedures = false; } else { this.runDdl = config.isDdlRun(); - this.useMigrationStoredProcedures = config.getDatabasePlatform().useMigrationStoredProcedures(); } + this.useMigrationStoredProcedures = config.getDatabasePlatform() != null && config.getDatabasePlatform().useMigrationStoredProcedures(); this.scriptTransform = createScriptTransform(config); this.baseDir = initBaseDir(); } @@ -85,7 +84,7 @@ private File initBaseDir() { @Override public void execute(boolean online) { generateDdl(); - if (online) { + if (online && runDdl) { runDdl(); } } @@ -105,16 +104,15 @@ protected void generateDdl() { /** * Run the DDL drop and DDL create scripts if properties have been set. */ - protected void runDdl() { - if (runDdl) { - Connection connection = null; - try { - connection = obtainConnection(); - runDdlWith(connection); - } finally { - JdbcClose.rollback(connection); - JdbcClose.close(connection); - } + @Override + public void runDdl() { + Connection connection = null; + try { + connection = obtainConnection(); + runDdlWith(connection); + } finally { + JdbcClose.rollback(connection); + JdbcClose.close(connection); } } diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java index 1aecd3d5c4..4799a631a6 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java @@ -622,4 +622,9 @@ public void loadBeanL2(EntityBeanIntercept ebi) { public void loadBean(EntityBeanIntercept ebi) { } + + @Override + public void runDdl() { + + } } From e666277c8c0b998c3fd9d85ccab32276de77fa6b Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:46:21 +0200 Subject: [PATCH 017/123] PR #3152 - NEW: DefaultDbMigration is configurable from properties --- .../dbmigration/DbMigrationPlugin.java | 56 ++++++++ .../dbmigration/DefaultDbMigration.java | 132 ++++++++++++++---- .../src/main/java/module-info.java | 1 + .../META-INF/services/io.ebean.plugin.Plugin | 1 + .../resources/application-test.properties | 24 ---- .../DbMigrationDropHistoryTest.java | 2 - .../dbmigration/DbMigrationGenerateTest.java | 42 ++---- .../src/test/resources/ebean.properties | 17 +++ 8 files changed, 195 insertions(+), 80 deletions(-) create mode 100644 ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java create mode 100644 ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.plugin.Plugin diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java new file mode 100644 index 0000000000..1839cf4917 --- /dev/null +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DbMigrationPlugin.java @@ -0,0 +1,56 @@ +package io.ebeaninternal.dbmigration; + +import java.io.IOException; + +import io.ebean.plugin.Plugin; +import io.ebean.plugin.SpiServer; + +/** + * Plugin to generate db-migration scripts automatically. + * @author Roland Praml, FOCONIS AG + */ +public class DbMigrationPlugin implements Plugin { + + private DefaultDbMigration dbMigration; + + private static String lastMigration; + private static String lastInit; + + @Override + public void configure(SpiServer server) { + dbMigration = new DefaultDbMigration(); + dbMigration.setServer(server); + } + + @Override + public void online(boolean online) { + try { + lastInit = null; + lastMigration = null; + if (dbMigration.generate) { + String tmp = lastMigration = dbMigration.generateMigration(); + if (tmp == null) { + return; + } + } + if (dbMigration.generateInit) { + lastInit = dbMigration.generateInitMigration(); + } + } catch (IOException e) { + throw new RuntimeException("Error while generating migration", e); + } + } + + @Override + public void shutdown() { + dbMigration = null; + } + + public static String getLastInit() { + return lastInit; + } + + public static String getLastMigration() { + return lastMigration; + } +} diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java index a96957d0ab..2e19b99d32 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java @@ -1,17 +1,16 @@ package io.ebeaninternal.dbmigration; import io.avaje.applog.AppLog; +import io.avaje.classpath.scanner.core.Location; import io.ebean.DB; import io.ebean.Database; import io.ebean.annotation.Platform; -import io.ebean.config.DatabaseConfig; -import io.ebean.config.DbConstraintNaming; -import io.ebean.config.PlatformConfig; -import io.ebean.config.PropertiesWrapper; +import io.ebean.config.*; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.DatabasePlatformProvider; import io.ebean.dbmigration.DbMigration; import io.ebean.util.IOUtils; +import io.ebean.util.StringHelper; import io.ebeaninternal.api.DbOffline; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.dbmigration.ddlgeneration.DdlOptions; @@ -26,10 +25,7 @@ import java.io.File; import java.io.IOException; import java.io.Writer; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.ServiceLoader; +import java.util.*; import static io.ebeaninternal.api.PlatformMatch.matchPlatform; import static java.lang.System.Logger.Level.*; @@ -61,8 +57,8 @@ public class DefaultDbMigration implements DbMigration { private static final String initialVersion = "1.0"; private static final String GENERATED_COMMENT = "THIS IS A GENERATED FILE - DO NOT MODIFY"; - private final List platformProviders = new ArrayList<>(); - protected final boolean online; + private List platformProviders = new ArrayList<>(); + protected boolean online; private boolean logToSystemOut = true; protected SpiEbeanServer server; protected String pathToResources = "src/main/resources"; @@ -77,8 +73,10 @@ public class DefaultDbMigration implements DbMigration { protected List platforms = new ArrayList<>(); protected DatabaseConfig databaseConfig; protected DbConstraintNaming constraintNaming; + @Deprecated protected Boolean strictMode; - protected Boolean includeGeneratedFileComment; + protected boolean includeGeneratedFileComment; + @Deprecated protected String header; protected String applyPrefix = ""; protected String version; @@ -88,6 +86,9 @@ public class DefaultDbMigration implements DbMigration { private int lockTimeoutSeconds; protected boolean includeBuiltInPartitioning = true; protected boolean includeIndex; + protected boolean generate = false; + protected boolean generateInit = false; + private boolean keepLastInit = true; /** * Create for offline migration generation. @@ -123,12 +124,66 @@ public void setServerConfig(DatabaseConfig config) { if (constraintNaming == null) { this.constraintNaming = databaseConfig.getConstraintNaming(); } + if (databasePlatform == null) { + this.databasePlatform = databaseConfig.getDatabasePlatform(); + } Properties properties = config.getProperties(); if (properties != null) { - PropertiesWrapper props = new PropertiesWrapper("ebean", config.getName(), properties, null); + PropertiesWrapper props = new PropertiesWrapper("ebean", config.getName(), properties, config.getClassLoadConfig()); migrationPath = props.get("migration.migrationPath", migrationPath); migrationInitPath = props.get("migration.migrationInitPath", migrationInitPath); pathToResources = props.get("migration.pathToResources", pathToResources); + addForeignKeySkipCheck = props.getBoolean("migration.addForeignKeySkipCheck", addForeignKeySkipCheck); + applyPrefix = props.get("migration.applyPrefix", applyPrefix); + databasePlatform = props.createInstance(DatabasePlatform.class, "migration.databasePlatform", databasePlatform); + generatePendingDrop = props.get("migration.generatePendingDrop", generatePendingDrop); + includeBuiltInPartitioning = props.getBoolean("migration.includeBuiltInPartitioning", includeBuiltInPartitioning); + includeGeneratedFileComment = props.getBoolean("migration.includeGeneratedFileComment", includeGeneratedFileComment); + includeIndex = props.getBoolean("migration.includeIndex", includeIndex); + lockTimeoutSeconds = props.getInt("migration.lockTimeoutSeconds", lockTimeoutSeconds); + logToSystemOut = props.getBoolean("migration.logToSystemOut", logToSystemOut); + modelPath = props.get("migration.modelPath", modelPath); + modelSuffix = props.get("migration.modelSuffix", modelSuffix); + name = props.get("migration.name", name); + online = props.getBoolean("migration.online", online); + vanillaPlatform = props.getBoolean("migration.vanillaPlatform", vanillaPlatform); + version = props.get("migration.version", version); + generate = props.getBoolean("migration.generate", generate); + generateInit = props.getBoolean("migration.generateInit", generateInit); + // header & strictMode must be configured at DatabaseConfig level + parsePlatforms(props, config); + } + } + + protected void parsePlatforms(PropertiesWrapper props, DatabaseConfig config) { + String platforms = props.get("migration.platforms"); + if (platforms == null || platforms.isEmpty()) { + return; + } + String[] tmp = StringHelper.splitNames(platforms); + for (String plat : tmp) { + DatabasePlatform dbPlatform; + String platformName = plat; + String platformPrefix = null; + int pos = plat.indexOf('='); + if (pos != -1) { + platformName = plat.substring(0, pos); + platformPrefix = plat.substring(pos + 1); + } + + if (platformName.indexOf('.') == -1) { + // parse platform as enum value + Platform platform = Enum.valueOf(Platform.class, platformName.toUpperCase()); + dbPlatform = platform(platform); + } else { + // parse platform as class + dbPlatform = (DatabasePlatform) config.getClassLoadConfig().newInstance(platformName); + } + if (platformPrefix == null) { + platformPrefix = dbPlatform.platform().name().toLowerCase(); + } + + addDatabasePlatform(dbPlatform, platformPrefix); } } @@ -319,7 +374,18 @@ private String generateMigrationFor(boolean initMigration) throws IOException { } String pendingVersion = generatePendingDrop(); - if (pendingVersion != null) { + if ("auto".equals(pendingVersion)) { + StringJoiner sj = new StringJoiner(","); + String diff = generateDiff(request); + if (diff != null) { + sj.add(diff); + request = createRequest(initMigration); + } + for (String pendingDrop : request.getPendingDrops()) { + sj.add(generatePendingDrop(request, pendingDrop)); + } + return sj.length() == 0 ? null : sj.toString(); + } else if (pendingVersion != null) { return generatePendingDrop(request, pendingVersion); } else { return generateDiff(request); @@ -554,7 +620,7 @@ private String generateMigration(Request request, Migration dbMigration, String return null; } else { if (!platforms.isEmpty()) { - writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir); + writeExtraPlatformDdl(fullVersion, request.currentModel, dbMigration, request.migrationDir, request.initMigration && keepLastInit); } else if (databasePlatform != null) { // writer needs the current model to provide table/column details for @@ -634,12 +700,17 @@ private String toUnderScore(String name) { /** * Write any extra platform ddl. */ - private void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath) throws IOException { + private void writeExtraPlatformDdl(String fullVersion, CurrentModel currentModel, Migration dbMigration, File writePath, boolean clear) throws IOException { DdlOptions options = new DdlOptions(addForeignKeySkipCheck); for (Pair pair : platforms) { DdlWrite writer = new DdlWrite(new MConfiguration(), currentModel.read(), options); PlatformDdlWriter platformWriter = createDdlWriter(pair.platform); File subPath = platformWriter.subPath(writePath, pair.prefix); + if (clear) { + for (File existing : subPath.listFiles()) { + existing.delete(); + } + } platformWriter.processMigration(dbMigration, writer, subPath, fullVersion); } } @@ -657,7 +728,7 @@ private boolean writeMigrationXml(Migration dbMigration, File resourcePath, Stri if (file.exists()) { return false; } - String comment = Boolean.TRUE.equals(includeGeneratedFileComment) ? GENERATED_COMMENT : null; + String comment = includeGeneratedFileComment ? GENERATED_COMMENT : null; MigrationXmlWriter xmlWriter = new MigrationXmlWriter(comment); xmlWriter.write(dbMigration, file); return true; @@ -675,6 +746,9 @@ private void setDefaults() { databasePlatform = server.databasePlatform(); } if (databaseConfig != null) { + // FIXME: StrictMode and header may be defined HERE and in DatabaseConfig. + // We shoild change either DefaultDbMigration or databaseConfig, so that it is only + // defined on one place if (strictMode != null) { databaseConfig.setDdlStrictMode(strictMode); } @@ -749,15 +823,20 @@ public File migrationDirectory() { * Return the file path to write the xml and sql to. */ File migrationDirectory(boolean initMigration) { - // path to src/main/resources in typical maven project - File resourceRootDir = new File(pathToResources); - if (!resourceRootDir.exists()) { - String msg = String.format("Error - path to resources %s does not exist. Absolute path is %s", pathToResources, resourceRootDir.getAbsolutePath()); - throw new UnknownResourcePathException(msg); - } - String resourcePath = migrationPath(initMigration); + Location resourcePath = migrationPath(initMigration); // expect to be a path to something like - src/main/resources/dbmigration - File path = new File(resourceRootDir, resourcePath); + File path; + if (resourcePath.isClassPath()) { + // path to src/main/resources in typical maven project + File resourceRootDir = new File(pathToResources); + if (!resourceRootDir.exists()) { + String msg = String.format("Error - path to resources %s does not exist. Absolute path is %s", pathToResources, resourceRootDir.getAbsolutePath()); + throw new UnknownResourcePathException(msg); + } + path = new File(resourceRootDir, resourcePath.path()); + } else { + path = new File(resourcePath.path()); + } if (!path.exists()) { if (!path.mkdirs()) { logInfo("Warning - Unable to ensure migration directory exists at %s", path.getAbsolutePath()); @@ -766,8 +845,9 @@ File migrationDirectory(boolean initMigration) { return path; } - private String migrationPath(boolean initMigration) { - return initMigration ? migrationInitPath : migrationPath; + private Location migrationPath(boolean initMigration) { + // remove classpath: or filesystem: prefix + return new Location(initMigration ? migrationInitPath : migrationPath); } /** diff --git a/ebean-ddl-generator/src/main/java/module-info.java b/ebean-ddl-generator/src/main/java/module-info.java index 1a7ef332e4..c5b6af08b2 100644 --- a/ebean-ddl-generator/src/main/java/module-info.java +++ b/ebean-ddl-generator/src/main/java/module-info.java @@ -1,5 +1,6 @@ module io.ebean.ddl.generator { + uses io.ebean.plugin.Plugin; exports io.ebean.dbmigration; provides io.ebean.dbmigration.DbMigration with io.ebeaninternal.dbmigration.DefaultDbMigration; diff --git a/ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.plugin.Plugin b/ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.plugin.Plugin new file mode 100644 index 0000000000..83ec94df48 --- /dev/null +++ b/ebean-ddl-generator/src/main/resources/META-INF/services/io.ebean.plugin.Plugin @@ -0,0 +1 @@ +io.ebeaninternal.dbmigration.DbMigrationPlugin diff --git a/ebean-ddl-generator/src/test/resources/application-test.properties b/ebean-ddl-generator/src/test/resources/application-test.properties index dfcb052ab0..64e7f78869 100644 --- a/ebean-ddl-generator/src/test/resources/application-test.properties +++ b/ebean-ddl-generator/src/test/resources/application-test.properties @@ -10,27 +10,3 @@ datasource.h2.url=jdbc:h2:mem:h2AutoTune datasource.pg.username=sa datasource.pg.password= datasource.pg.url=jdbc:h2:mem:h2AutoTune - -# parameters for migration test -datasource.migrationtest.username=SA -datasource.migrationtest.password=SA -datasource.migrationtest.url=jdbc:h2:mem:migration -ebean.migrationtest.applyPrefix=V -ebean.migrationtest.ddl.generate=false -ebean.migrationtest.ddl.run=false -ebean.migrationtest.ddl.header=-- Migrationscripts for ebean unittest -ebean.migrationtest.migration.appName=migrationtest -ebean.migrationtest.migration.migrationPath=dbmigration/migrationtest -ebean.migrationtest.migration.strict=true - -# parameters for migration test -datasource.migrationtest-history.username=SA -datasource.migrationtest-history.password=SA -datasource.migrationtest-history.url=jdbc:h2:mem:migration -ebean.migrationtest-history.applyPrefix=V -ebean.migrationtest-history.ddl.generate=false -ebean.migrationtest-history.ddl.run=false -ebean.migrationtest-history.ddl.header=-- Migrationscripts for ebean unittest DbMigrationDropHistoryTest -ebean.migrationtest-history.migration.appName=migrationtest-history -ebean.migrationtest-history.migration.migrationPath=dbmigration/migrationtest-history -ebean.migrationtest-history.migration.strict=true diff --git a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java index 4f5471c62c..df9850d57f 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationDropHistoryTest.java @@ -79,13 +79,11 @@ public static void main(String[] args) throws IOException { List pendingDrops = migration.getPendingDrops(); assertThat(pendingDrops).contains("1.1"); - //System.setProperty("ddl.migration.pendingDropsFor", "1.1"); migration.setGeneratePendingDrop("1.1"); assertThat(migration.generateMigration()).isEqualTo("1.2__dropsFor_1.1"); assertThatThrownBy(()->migration.generateMigration()) .isInstanceOf(IllegalArgumentException.class) .hasMessageContaining("No 'pendingDrops'"); // subsequent call - System.clearProperty("ddl.migration.pendingDropsFor"); server.shutdown(); logger.info("end"); diff --git a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java index df70742162..40706eb8b3 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/dbmigration/DbMigrationGenerateTest.java @@ -4,6 +4,8 @@ import io.ebean.DatabaseFactory; import io.ebean.annotation.Platform; import io.ebean.config.DatabaseConfig; +import io.ebeaninternal.api.DbOffline; + import io.ebean.dbmigration.DbMigration; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -17,7 +19,6 @@ import java.util.Arrays; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; /** @@ -96,7 +97,7 @@ public static void run(String pathToResources) throws IOException { config.getProperties().put("ebean.hana.generateUniqueDdl", "true"); // need to generate unique statements to prevent them from being filtered out as duplicates by the DdlRunner config.setPackages(Arrays.asList("misc.migration.v1_0")); - Database server = DatabaseFactory.create(config); + Database server = createServer(config); migration.setServer(server); // then we generate migration scripts for v1_0 @@ -107,43 +108,28 @@ public static void run(String pathToResources) throws IOException { // and now for v1_1 config.setPackages(Arrays.asList("misc.migration.v1_1")); server.shutdown(); - server = DatabaseFactory.create(config); + server = createServer(config); migration.setServer(server); - assertThat(migration.generateMigration()).isEqualTo("1.1"); - assertThat(migration.generateMigration()).isNull(); // subsequent call - - - - System.setProperty("ddl.migration.pendingDropsFor", "1.1"); - assertThat(migration.generateMigration()).isEqualTo("1.2__dropsFor_1.1"); - - assertThatThrownBy(()->migration.generateMigration()) - .isInstanceOf(IllegalArgumentException.class) - .hasMessageContaining("No 'pendingDrops'"); // subsequent call - - System.clearProperty("ddl.migration.pendingDropsFor"); + assertThat(migration.generateMigration()).isEqualTo("1.1,1.2__dropsFor_1.1"); assertThat(migration.generateMigration()).isNull(); // subsequent call // and now for v1_2 with config.setPackages(Arrays.asList("misc.migration.v1_2")); server.shutdown(); - server = DatabaseFactory.create(config); + server = createServer(config); migration.setServer(server); - assertThat(migration.generateMigration()).isEqualTo("1.3"); - assertThat(migration.generateMigration()).isNull(); // subsequent call - - - System.setProperty("ddl.migration.pendingDropsFor", "1.3"); - assertThat(migration.generateMigration()).isEqualTo("1.4__dropsFor_1.3"); - assertThatThrownBy(migration::generateMigration) - .isInstanceOf(IllegalArgumentException.class) - .hasMessageContaining("No 'pendingDrops'"); // subsequent call - - System.clearProperty("ddl.migration.pendingDropsFor"); + assertThat(migration.generateMigration()).isEqualTo("1.3,1.4__dropsFor_1.3"); assertThat(migration.generateMigration()).isNull(); // subsequent call server.shutdown(); logger.info("end"); } + private static Database createServer(DatabaseConfig config) { + DbOffline.setGenerateMigration(); + Database server = DatabaseFactory.create(config); + DbOffline.reset(); + return server; + } + } diff --git a/ebean-test/src/test/resources/ebean.properties b/ebean-test/src/test/resources/ebean.properties index 9dec823eed..7567ec8dbe 100644 --- a/ebean-test/src/test/resources/ebean.properties +++ b/ebean-test/src/test/resources/ebean.properties @@ -196,6 +196,7 @@ datasource.hana.username=EBEAN_TEST datasource.hana.password=Eb3an_test datasource.hana.url=jdbc:sap://hxehost:39013/?databaseName=HXE #datasource.hana.driver=com.sap.db.jdbc.Driver +# # parameters for migration test datasource.migrationtest.username=SA @@ -207,6 +208,21 @@ ebean.migrationtest.ddl.run=false ebean.migrationtest.ddl.header=-- Migrationscripts for ebean unittest ebean.migrationtest.migration.appName=migrationtest ebean.migrationtest.migration.migrationPath=migrationtest/dbmigration +ebean.migrationtest.migration.migrationInitPath=migrationtest/dbinit +ebean.migrationtest.migration.strict=true +ebean.migrationtest.migration.generate=true +ebean.migrationtest.migration.run=false +ebean.migrationtest.migration.includeIndex=true +ebean.migrationtest.migration.generateInit=true +ebean.migrationtest.migration.generatePendingDrop=auto +ebean.migrationtest.migration.platforms=db2luw,h2,hsqldb,mysql,mysql55,mariadb,postgres,oracle,sqlite,sqlserver17,hana,yugabyte +#migration.migrationtest.db2luw.prefix=db2 +#migration.migrationtest.sqlserver17.prefix=sqlserver +dbmigration.platform.mariadb.useMigrationStoredProcedures=true +dbmigration.platform.mysql.useMigrationStoredProcedures=true + + + ebean.migrationtest.migration.strict=true # enable stored procedures f dbmigration.platform.mariadb.useMigrationStoredProcedures=true @@ -222,4 +238,5 @@ ebean.migrationtest-history.ddl.run=false ebean.migrationtest-history.ddl.header=-- Migrationscripts for ebean unittest DbMigrationDropHistoryTest ebean.migrationtest-history.migration.appName=migrationtest-history ebean.migrationtest-history.migration.migrationPath=migrationtest-history/dbmigration +ebean.migrationtest-history.migration.migrationInitPath=migrationtest-history/dbinit ebean.migrationtest-history.migration.strict=true From d607ab8dcc66c4e5a689f57a704b0de64df09c7c Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:50:59 +0200 Subject: [PATCH 018/123] PR #3153 - TEST: TestServerOffline --- .../ebean/test/config/TestServerOffline.java | 154 ++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java diff --git a/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java b/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java new file mode 100644 index 0000000000..950fbc57dc --- /dev/null +++ b/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java @@ -0,0 +1,154 @@ +package io.ebean.test.config; + + +import io.ebean.Database; +import io.ebean.DatabaseFactory; +import io.ebean.annotation.Platform; +import io.ebean.config.DatabaseConfig; +import io.ebean.datasource.DataSourceAlert; +import io.ebean.datasource.DataSourceInitialiseException; +import io.ebean.xtest.ForPlatform; + +import io.ebean.xtest.base.PlatformCondition; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.tests.model.basic.EBasicVer; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Properties; + +import javax.persistence.PersistenceException; +import javax.sql.DataSource; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +@ExtendWith(PlatformCondition.class) +public class TestServerOffline { + + @Test + @ForPlatform({Platform.H2}) + public void testOffline_default() throws SQLException { + + String url = "jdbc:h2:mem:testoffline1"; + try (Connection bootup = DriverManager.getConnection(url, "sa", "secret")) { + Properties props = props(url); + DatabaseConfig config = config(props); + + assertThatThrownBy(() -> DatabaseFactory.create(config)) + .isInstanceOf(DataSourceInitialiseException.class); + } + + } + + private static class LazyDatasourceInitializer implements DataSourceAlert { + + public Database server; + + private boolean initialized; + + @Override + public void dataSourceUp(DataSource dataSource) { + if (!initialized) { + initDatabase(); + } + } + + public synchronized void initDatabase() { + if (!initialized) { + server.runDdl(); + initialized = true; + } + } + + @Override + public void dataSourceDown(DataSource dataSource, SQLException reason) {} + + @Override + public void dataSourceWarning(DataSource dataSource, String msg) {} + + } + + @Test + @ForPlatform({Platform.H2}) + public void testOffline_recovery() throws SQLException { + + String url = "jdbc:h2:mem:testoffline3"; + try (Connection bootup = DriverManager.getConnection(url, "sa", "secret")) { + + Properties props = props(url); + + // to bring up ebean without a database, we must disable various things + // that happen on startup + props.setProperty("datasource.h2_offline.failOnStart", "false"); + props.setProperty("ebean.h2_offline.skipDataSourceCheck", "true"); + props.setProperty("ebean.h2_offline.ddl.run", "false"); + DatabaseConfig config = config(props); + + LazyDatasourceInitializer alert = new LazyDatasourceInitializer() ; + config.getDataSourceConfig().setAlert(alert); + config.getDataSourceConfig().setHeartbeatFreqSecs(1); + + Database h2Offline = DatabaseFactory.create(config); + alert.server = h2Offline; + assertThat(h2Offline).isNotNull(); + // DB is online now in offline mode + + // Accessing the DB will throw a PE + assertThatThrownBy(() -> alert.initDatabase()) + .isInstanceOf(PersistenceException.class) + .hasMessageContaining("Failed to obtain connection to run DDL"); + + assertThatThrownBy(() -> h2Offline.find(EBasicVer.class).findCount()).isInstanceOf(PersistenceException.class); + + // so - reset the password so that the server can reconnect + try (Statement stmt = bootup.createStatement()) { + stmt.execute("alter user sa set password 'sa'"); + } + + assertThat(alert.initialized).isFalse(); + + // next access to ebean should bring DS online + h2Offline.find(EBasicVer.class).findCount(); + assertThat(alert.initialized).isTrue(); + + // check if server is working (ie ddl was run) + EBasicVer bean = new EBasicVer("foo"); + h2Offline.save(bean); + assertThat(h2Offline.find(EBasicVer.class).findCount()).isEqualTo(1); + h2Offline.delete(bean); + } + } + + private Properties props(String url) { + + Properties props = new Properties(); + + props.setProperty("datasource.h2_offline.username", "sa"); + props.setProperty("datasource.h2_offline.password", "sa"); + props.setProperty("datasource.h2_offline.url", url); + props.setProperty("datasource.h2_offline.driver", "org.h2.Driver"); + + props.setProperty("ebean.h2_offline.databasePlatformName", "h2"); + props.setProperty("ebean.h2_offline.ddl.extra", "false"); + + props.setProperty("ebean.h2_offline.ddl.generate", "true"); + props.setProperty("ebean.h2_offline.ddl.run", "true"); + + return props; + } + + private DatabaseConfig config(Properties props) { + DatabaseConfig config = new DatabaseConfig(); + config.setName("h2_offline"); + config.loadFromProperties(props); + config.setDefaultServer(false); + config.setRegister(false); + config.getClasses().add(EBasicVer.class); + return config; + } + +} From b2c2f00914e3c593f503f8b5aae3577aae1bde32 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 11:54:24 +0200 Subject: [PATCH 019/123] NOPR - Do not throw BeanHasBeenDeleted on PrimaryKeyJoinColumn --- .../server/deploy/BeanProperty.java | 7 + .../server/deploy/BeanPropertyAssocOne.java | 20 +- .../server/persist/DefaultPersister.java | 5 +- .../org/tests/model/onetoone/OtoBMaster.java | 2 +- .../org/tests/model/onetoone/OtoUBPrime.java | 7 +- .../tests/model/onetoone/OtoUBPrimeExtra.java | 2 +- .../org/tests/model/onetoone/OtoUPrime.java | 24 ++- .../tests/model/onetoone/OtoUPrimeExtra.java | 9 +- .../OtoUPrimeExtraWithConstraint.java | 52 +++++ .../onetoone/OtoUPrimeOptionalExtra.java | 61 ++++++ .../onetoone/OtoUPrimeWithConstraint.java | 63 ++++++ .../TestOneToOneImportedPkNative.java | 2 +- .../TestOneToOnePrimaryKeyJoinBidi.java | 2 +- .../TestOneToOnePrimaryKeyJoinOptional.java | 204 ++++++++++++++++-- 14 files changed, 425 insertions(+), 35 deletions(-) create mode 100644 ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtraWithConstraint.java create mode 100644 ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeOptionalExtra.java create mode 100644 ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeWithConstraint.java diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index a439e73794..423d612307 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -884,6 +884,13 @@ public boolean isImportedPrimaryKey() { return importedPrimaryKey; } + /** + * If true, this property references O2O with its primary key. + */ + public boolean isPrimaryKeyExport() { + return false; + } + @Override public boolean isAssocMany() { // Returns false - override in BeanPropertyAssocMany. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index ef05929f7f..1b99bb213e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -365,6 +365,11 @@ public boolean isOrphanRemoval() { return orphanRemoval; } + @Override + public boolean isPrimaryKeyExport() { + return primaryKeyExport; + } + @Override public void diff(String prefix, Map map, EntityBean newBean, EntityBean oldBean) { Object newEmb = (newBean == null) ? null : getValue(newBean); @@ -602,13 +607,20 @@ private ExportedProperty findMatch(boolean embeddedProp, BeanProperty prop) { return findMatch(embeddedProp, prop, prop.dbColumn(), tableJoin); } + /** + * If column is a primaryKeyExport colum, we can directly use our own ID and do not need to add a join if the relation is not optional + */ + boolean requiresJoin() { + return !primaryKeyExport || isNullable(); + } + @Override public void appendSelect(DbSqlContext ctx, boolean subQuery) { if (!isTransient) { - if (primaryKeyExport) { - descriptor.idProperty().appendSelect(ctx, subQuery); - } else { + if (requiresJoin()) { localHelp.appendSelect(ctx, subQuery); + } else { + descriptor.idProperty().appendSelect(ctx, subQuery); } } } @@ -626,7 +638,7 @@ public SqlJoinType addJoin(SqlJoinType joinType, String a1, String a2, DbSqlCont @Override public void appendFrom(DbSqlContext ctx, SqlJoinType joinType, String manyWhere) { - if (!isTransient && !primaryKeyExport) { + if (!isTransient && requiresJoin()) { localHelp.appendFrom(ctx, joinType); if (sqlFormulaJoin != null) { String alias = ctx.tableAliasManyWhere(manyWhere); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 4d3efd92e8..8c81147ea6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -939,7 +939,10 @@ private void deleteAssocMany(PersistRequestBean request) { for (BeanPropertyAssocOne prop : expOnes) { // for soft delete check cascade type also supports soft delete if (deleteMode.isHard() || prop.isTargetSoftDelete()) { - if (request.isLoadedProperty(prop)) { + if (prop.isPrimaryKeyExport()) { + // we can delete by id, neither if property loaded or not + delete(prop.targetDescriptor(), prop.descriptor().id(parentBean), null, t, deleteMode); + } else if (request.isLoadedProperty(prop)) { Object detailBean = prop.getValue(parentBean); if (detailBean != null) { deleteRecurse((EntityBean) detailBean, t, deleteMode); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java index d9a6944765..d7b5d39f62 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java @@ -10,7 +10,7 @@ public class OtoBMaster { String name; - @OneToOne(cascade = CascadeType.ALL, mappedBy = "master", fetch = FetchType.LAZY) + @OneToOne(cascade = CascadeType.ALL, mappedBy = "master", fetch = FetchType.LAZY, optional = false) OtoBChild child; public Long getId() { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java index 36d7104c2d..afc224ab45 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java @@ -1,9 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import javax.persistence.*; import java.util.UUID; @Entity @@ -17,7 +14,7 @@ public class OtoUBPrime { /** * Master side of bi-directional PrimaryJoinColumn. */ - @OneToOne(mappedBy = "prime") + @OneToOne(mappedBy = "prime", optional = false) OtoUBPrimeExtra extra; @Version diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java index df14dee017..ef8532a15f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java @@ -14,7 +14,7 @@ public class OtoUBPrimeExtra { /** * Child side of bi-directional PrimaryJoinColumn. */ - @OneToOne + @OneToOne(optional = false) @PrimaryKeyJoinColumn OtoUBPrime prime; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java index e4371304fa..f8ad34b0fd 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java @@ -13,15 +13,27 @@ public class OtoUPrime { String name; + /** * Effectively Ebean automatically sets Cascade PERSIST and mapped by for PrimaryKeyJoinColumn. - * This OneToOne is optional so left join to extra. + * This OneToOne is not optional so use inner join to extra (unless DbForeignkey(noConstraint = true) is set) + * Note: Violating the contract (Storing OtoUPrime without extra) may cause problems: + * - due the inner join, you might not get results from the query + * - you might get a "Beah has been deleted" if lazy load occurs on 'extra' */ - @OneToOne + @OneToOne(orphanRemoval = true, optional = false) @PrimaryKeyJoinColumn + // enforcing left join - without 'noConstraint = true', an inner join is used @DbForeignKey(noConstraint = true) OtoUPrimeExtra extra; + /** + * This OneToOne is optional so left join to extra. + * Setting FetchType.LAZY will NOT add the left join by default to the query. + */ + @OneToOne(mappedBy = "prime", fetch = FetchType.LAZY, orphanRemoval = true, optional = true) + OtoUPrimeOptionalExtra optionalExtra; + @Version Long version; @@ -65,4 +77,12 @@ public Long getVersion() { public void setVersion(Long version) { this.version = version; } + + public OtoUPrimeOptionalExtra getOptionalExtra() { + return optionalExtra; + } + + public void setOptionalExtra(OtoUPrimeOptionalExtra optionalExtra) { + this.optionalExtra = optionalExtra; + } } diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java index edd72b0ae3..311a4f6dbe 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import io.ebean.annotation.Formula; + +import javax.persistence.*; import java.util.UUID; @Entity @@ -22,7 +22,7 @@ public OtoUPrimeExtra(String extra) { @Override public String toString() { - return "exId:"+ eid +" "+extra; + return "exId:" + eid + " " + extra; } public UUID getEid() { @@ -48,4 +48,5 @@ public Long getVersion() { public void setVersion(Long version) { this.version = version; } + } diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtraWithConstraint.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtraWithConstraint.java new file mode 100644 index 0000000000..9b69a3e7c7 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtraWithConstraint.java @@ -0,0 +1,52 @@ +package org.tests.model.onetoone; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Version; +import java.util.UUID; + +@Entity +public class OtoUPrimeExtraWithConstraint { + + @Id + UUID eid; + + String extra; + + @Version + Long version; + + public OtoUPrimeExtraWithConstraint(String extra) { + this.extra = extra; + } + + @Override + public String toString() { + return "exId:" + eid + " " + extra; + } + + public UUID getEid() { + return eid; + } + + public void setEid(UUID eid) { + this.eid = eid; + } + + public String getExtra() { + return extra; + } + + public void setExtra(String extra) { + this.extra = extra; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + +} diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeOptionalExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeOptionalExtra.java new file mode 100644 index 0000000000..7ec0d0f1e3 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeOptionalExtra.java @@ -0,0 +1,61 @@ +package org.tests.model.onetoone; + +import javax.persistence.*; +import java.util.UUID; + +@Entity +public class OtoUPrimeOptionalExtra { + + @Id + UUID eid; + + String extra; + + @OneToOne(optional = false) + @PrimaryKeyJoinColumn + private OtoUPrime prime; + + @Version + Long version; + + public OtoUPrimeOptionalExtra(String extra) { + this.extra = extra; + } + + @Override + public String toString() { + return "exId:" + eid + " " + extra; + } + + public UUID getEid() { + return eid; + } + + public void setEid(UUID eid) { + this.eid = eid; + } + + public String getExtra() { + return extra; + } + + public void setExtra(String extra) { + this.extra = extra; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + + public OtoUPrime getPrime() { + return prime; + } + + public void setPrime(OtoUPrime prime) { + this.prime = prime; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeWithConstraint.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeWithConstraint.java new file mode 100644 index 0000000000..29babe5685 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeWithConstraint.java @@ -0,0 +1,63 @@ +package org.tests.model.onetoone; + +import javax.persistence.*; +import java.util.UUID; + +@Entity +public class OtoUPrimeWithConstraint { + + @Id + UUID pid; + + String name; + + @OneToOne(orphanRemoval = true, optional = false) + // @DbForeignKey(noConstraint = true) see OtoUPrime + @PrimaryKeyJoinColumn + OtoUPrimeExtraWithConstraint extra; + + @Version + Long version; + + public OtoUPrimeWithConstraint(String name) { + this.name = name; + } + + @Override + public String toString() { + return "id:" + pid + " name:" + name + " extra:" + extra; + } + + public UUID getPid() { + return pid; + } + + public void setPid(UUID pid) { + this.pid = pid; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public OtoUPrimeExtraWithConstraint getExtra() { + return extra; + } + + public void setExtra(OtoUPrimeExtraWithConstraint extra) { + this.extra = extra; + } + + public Long getVersion() { + return version; + } + + public void setVersion(Long version) { + this.version = version; + } + +} diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java index 122e298e93..1aa765092e 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOneImportedPkNative.java @@ -34,7 +34,7 @@ public void findWithLazyOneToOne() { String sql = sqlOf(query); assertThat(sql).contains("select t0.id, t0.name from oto_bmaster t0 where t0.id "); - assertThat(sql).doesNotContain("left join oto_bchild"); + assertThat(sql).doesNotContain("join oto_bchild"); assertThat(one).isNotNull(); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java index 81e8905ed7..63dd38bdde 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinBidi.java @@ -45,7 +45,7 @@ public void insertUpdateDelete() { OtoUBPrime oneWith = queryWithFetch.findOne(); assertThat(oneWith).isNotNull(); - assertThat(sqlOf(queryWithFetch, 10)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version, t1.eid from oto_ubprime t0 left join oto_ubprime_extra t1 on t1.eid = t0.pid where t0.pid = ?") + assertThat(sqlOf(queryWithFetch, 10)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version, t1.eid from oto_ubprime t0 join oto_ubprime_extra t1 on t1.eid = t0.pid where t0.pid = ?") .as("we join to oto_prime_extra"); assertThat(oneWith.getExtra().getExtra()).isEqualTo("v" + desc); diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index 39cbfa7309..3a9a4d6df2 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -1,14 +1,21 @@ package org.tests.model.onetoone; -import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.Query; +import io.ebean.plugin.Property; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import javax.persistence.EntityNotFoundException; +import javax.persistence.PersistenceException; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; -import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.*; public class TestOneToOnePrimaryKeyJoinOptional extends BaseTestCase { @@ -21,23 +28,120 @@ private OtoUPrime insert(String desc) { return prime; } - @Test - public void insertWithoutExtra() { + @BeforeEach + void prepare() { + OtoUPrime p1Single = new OtoUPrime("Prime without optional"); + p1Single.setExtra(new OtoUPrimeExtra("Non optional prime required")); + DB.save(p1Single); + + OtoUPrimeExtra p2 = new OtoUPrimeExtra("SinglePrimeExtra"); + try { + DB.save(p2); + fail("PrimExtra cannot exist without Prime"); + } catch (PersistenceException pe) { + + } String desc = "" + System.currentTimeMillis(); OtoUPrime p1 = new OtoUPrime("u" + desc); + p1.setExtra(new OtoUPrimeExtra("u" + desc)); + p1.setOptionalExtra(new OtoUPrimeOptionalExtra("This one has also an optional")); DB.save(p1); + } - Query query = DB.find(OtoUPrime.class) - .setId(p1.getPid()) - .fetch("extra", "eid"); + @AfterEach + void cleanup() { + DB.find(OtoUPrime.class).delete(); + assertThat(DB.find(OtoUPrimeExtra.class).findList()).isEmpty(); + assertThat(DB.find(OtoUPrimeOptionalExtra.class).findList()).isEmpty(); + } - OtoUPrime found = query.findOne(); + public void doTest1(boolean extraFetch, boolean optionalFetch) { + + // Query for "fetch" case - extra bean joined by left join + + Query query1 = DB.find(OtoUPrime.class); + if (extraFetch) { + query1.fetch("extra"); + } + if (optionalFetch) { + query1.fetch("optionalExtra"); + } + List primes = query1.findList(); + if (extraFetch && optionalFetch) { + assertThat(query1.getGeneratedSql()).isEqualTo("select t0.pid, t0.name, t0.version, " + + "t1.eid, t1.extra, t1.version, " + + "t2.eid, t2.extra, t2.version, t2.eid " + + "from oto_uprime t0 " + + "left join oto_uprime_extra t1 on t1.eid = t0.pid " + // left join on non-optional, because DbForeignKey(noConstraint=true) is set + "left join oto_uprime_optional_extra t2 on t2.eid = t0.pid"); // left join on optional + } else if (extraFetch) { + assertThat(query1.getGeneratedSql()).isEqualTo("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_uprime t0 left join oto_uprime_extra t1 on t1.eid = t0.pid"); + } else if (optionalFetch) { + assertThat(query1.getGeneratedSql()).isEqualTo("select t0.pid, t0.name, t0.pid, t0.version, t1.eid, t1.extra, t1.version, t1.eid from oto_uprime t0 left join oto_uprime_optional_extra t1 on t1.eid = t0.pid"); + + } else { + assertThat(query1.getGeneratedSql()).isEqualTo("select t0.pid, t0.name, t0.pid, t0.version from oto_uprime t0"); + } - if (found.getExtra() != null) { - found.getExtra().getExtra(); // fails here, because getExtra should be null + List versions = new ArrayList<>(); + for (OtoUPrime prime : primes) { + if (prime.getOptionalExtra() != null) { + versions.add(prime.getOptionalExtra().getVersion()); + } } - assertThat(found.getExtra()).isNull(); + assertThat(primes).hasSize(2); + assertThat(versions).containsExactly(1L); + } + + public void doTest2(boolean withFetch) { + + Query query2 = DB.find(OtoUPrimeOptionalExtra.class); + if (withFetch) { + query2.fetch("prime"); + } + List extraPrimes = query2.findList(); + if (withFetch) { + assertThat(query2.getGeneratedSql()).isEqualTo("select t0.eid, t0.extra, t0.version, t1.pid, t1.name, t1.pid, t1.version from oto_uprime_optional_extra t0 join oto_uprime t1 on t1.pid = t0.eid"); + } else { + assertThat(query2.getGeneratedSql()).isEqualTo("select t0.eid, t0.extra, t0.version, t0.eid from oto_uprime_optional_extra t0"); + } + List versions = new ArrayList<>(); + for (OtoUPrimeOptionalExtra extraPrime : extraPrimes) { + versions.add(extraPrime.getPrime().getVersion()); + } + assertThat(extraPrimes).hasSize(1); + assertThat(versions).containsExactly(1L); + } + + @Test + void testWithExtraFetch1() { + doTest1(true, false); + } + + @Test + void testWithOptionalFetch1() { + doTest1(false, true); + } + + @Test + void testWithBothFetch1() { + doTest1(true, true); + } + + @Test + void testWithoutFetch1() { + doTest1(false, false); + } + + @Test + void testWithFetch2() { + doTest2(true); + } + + @Test + void testWithoutFetch2() { + doTest2(false); } @Test @@ -54,7 +158,7 @@ public void insertUpdateDelete() { OtoUPrime found = query.findOne(); assertThat(found).isNotNull(); - assertThat(sqlOf(query, 4)).contains("select t0.pid, t0.name, t0.version, t0.pid from oto_uprime t0 where t0.pid = ?") + assertThat(sqlOf(query, 4)).contains("select t0.pid, t0.name, t0.pid, t0.version from oto_uprime t0 where t0.pid = ?") .as("we don't join to oto_uprime_extra"); assertThat(found.getName()).isEqualTo("u" + desc); @@ -66,7 +170,8 @@ public void insertUpdateDelete() { OtoUPrime oneWith = queryWithFetch.findOne(); assertThat(oneWith).isNotNull(); - assertThat(sqlOf(queryWithFetch, 6)).contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_uprime t0 left join oto_uprime_extra t1 on t1.eid = t0.pid where t0.pid = ?") + assertThat(sqlOf(queryWithFetch, 6)) + .contains("select t0.pid, t0.name, t0.version, t1.eid, t1.extra, t1.version from oto_uprime t0 left join oto_uprime_extra t1 on t1.eid = t0.pid where t0.pid = ?") .as("we join to oto_prime_extra"); @@ -98,8 +203,77 @@ private void thenDelete(OtoUPrime found) { DB.delete(bean); List sql = LoggedSql.stop(); - assertThat(sql).hasSize(2); + + assertThat(sql).hasSize(3); assertSql(sql.get(0)).contains("delete from oto_uprime_extra where"); - assertSql(sql.get(1)).contains("delete from oto_uprime where"); + assertSql(sql.get(1)).contains("delete from oto_uprime_optional_extra where"); + assertSql(sql.get(2)).contains("delete from oto_uprime where"); + } + + @Test + void testDdl() { + Collection props = DB.getDefault().pluginApi().beanType(OtoUPrime.class).allProperties(); + + for (Property prop : props) { + System.out.println(prop); + } + } + + @Test + void testContractViolation1() { + + OtoUPrime p1 = new OtoUPrime("Prime having no extra"); + // extra is "optional=false" - and this is a violating of the contract + DB.save(p1); + + Query query = DB.find(OtoUPrime.class).setId(p1.pid); + + OtoUPrime found1 = query.findOne(); + assertThat(query.getGeneratedSql()).doesNotContain("join"); + + assertThat(found1.getExtra()).isNotNull(); + assertThatThrownBy(() -> found1.getExtra().getVersion()).isInstanceOf(EntityNotFoundException.class); + + query.fetch("extra"); + OtoUPrime found2 = query.findOne(); + // Note: We use "left join" here, because 'DbForeignKey(noConstraint=true)' is set oh the property + // if this annotation is not preset, an inner join would be used and 'found2' would be 'null' then + assertThat(query.getGeneratedSql()).contains("from oto_uprime t0 left join oto_uprime_extra"); + assertThat(found2.getExtra()).isNull(); + + } + + @Test + void testContractViolation2() { + + OtoUPrimeExtraWithConstraint p1Const = new OtoUPrimeExtraWithConstraint("test"); + try { + // a foreign key prevents from saving + DB.save(p1Const); + fail("PrimExtra cannot exist without Prime"); + } catch (PersistenceException pe) { + // OK + } + + OtoUPrimeWithConstraint p1 = new OtoUPrimeWithConstraint("Prime having no extra"); + // extra is "optional=false" - and this is a violating of the contract + // Note there is no real foreign key in the database, that would prevent saving this entity + DB.save(p1); + + Query query = DB.find(OtoUPrimeWithConstraint.class).setId(p1.pid); + + OtoUPrimeWithConstraint found1 = query.findOne(); + assertThat(query.getGeneratedSql()).doesNotContain("join"); + + assertThat(found1.getExtra()).isNotNull(); + assertThatThrownBy(() -> found1.getExtra().getVersion()).isInstanceOf(EntityNotFoundException.class); + + query.fetch("extra"); + OtoUPrimeWithConstraint found2 = query.findOne(); + // Note: We use "left join" here, because 'DbForeignKey(noConstraint=true)' is set oh the property + // if this annotation is not preset, an inner join would be used and 'found2' would be 'null' then + assertThat(query.getGeneratedSql()).contains("from oto_uprime_with_constraint t0 join oto_uprime_extra_with_constraint"); + assertThat(found2).isNull(); + } } From 6ae19f031846673c0702c41d16b8750481ff44c2 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 12:02:58 +0200 Subject: [PATCH 020/123] NOPR - NEW: QueryCache support for DTO queries --- .../java/io/ebeaninternal/api/HashQuery.java | 7 ++- .../java/io/ebeaninternal/api/SpiQuery.java | 5 ++ .../server/core/AbstractSqlQueryRequest.java | 2 +- .../server/core/DefaultServer.java | 35 ++++++++---- .../server/core/DtoQueryRequest.java | 37 +++++++----- .../query/DefaultRelationalQueryEngine.java | 15 +++-- .../server/query/DtoQueryEngine.java | 11 ++-- .../server/querydefn/DefaultOrmQuery.java | 8 ++- .../ebean/xtest/base/DtoQueryFromOrmTest.java | 57 ++++++++++++++++++- .../java/org/tests/model/basic/Contact.java | 2 +- 10 files changed, 134 insertions(+), 45 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java index a207f3c573..9f77331016 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/HashQuery.java @@ -7,13 +7,15 @@ public final class HashQuery { private final CQueryPlanKey planHash; private final BindValuesKey bindValuesKey; + private final Class dtoType; /** * Create the HashQuery. */ - public HashQuery(CQueryPlanKey planHash, BindValuesKey bindValuesKey) { + public HashQuery(CQueryPlanKey planHash, BindValuesKey bindValuesKey, Class dtoType) { this.planHash = planHash; this.bindValuesKey = bindValuesKey; + this.dtoType = dtoType; } @Override @@ -25,6 +27,7 @@ public String toString() { public int hashCode() { int hc = 92821 * planHash.hashCode(); hc = 92821 * hc + bindValuesKey.hashCode(); + hc = 92821 * hc + dtoType.hashCode(); return hc; } @@ -37,6 +40,6 @@ public boolean equals(Object obj) { return false; } HashQuery e = (HashQuery) obj; - return e.bindValuesKey.equals(bindValuesKey) && e.planHash.equals(planHash); + return e.bindValuesKey.equals(bindValuesKey) && e.planHash.equals(planHash) && e.dtoType.equals(dtoType); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java index 315658492f..998c1eafd5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiQuery.java @@ -847,6 +847,11 @@ public static TemporalMode of(SpiQuery query) { */ void setManualId(); + /** + * Set the DTO type, that should be part of the queryHash. + */ + void setDtoType(Class dtoType); + /** * Set default select clauses where none have been explicitly defined. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java index 591fc39f26..f429d4047e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/AbstractSqlQueryRequest.java @@ -126,7 +126,7 @@ private String limitOffset(String sql) { /** * Prepare and execute the SQL using the Binder. */ - public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException { + public void executeSql(Binder binder) throws SQLException { startNano = System.nanoTime(); executeAsSql(binder); } 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 65c916243e..c838cbd34c 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 @@ -899,6 +899,7 @@ public DtoQuery createNamedDtoQuery(Class dtoType, String namedQuery) @Override public DtoQuery findDto(Class dtoType, SpiQuery ormQuery) { DtoBeanDescriptor descriptor = dtoBeanManager.descriptor(dtoType); + ormQuery.setDtoType(dtoType); return new DefaultDtoQuery<>(this, descriptor, ormQuery); } @@ -939,6 +940,18 @@ public T find(Class beanType, Object id, @Nullable Transaction transactio return findId(query, transaction); } + DtoQueryRequest createDtoQueryRequest(Type type, SpiDtoQuery query) { + SpiQuery ormQuery = query.ormQuery(); + if (ormQuery != null) { + ormQuery.setType(type); + ormQuery.setManualId(); + SpiOrmQueryRequest ormRequest = createQueryRequest(type, ormQuery, query.transaction()); + return new DtoQueryRequest<>(this, dtoQueryEngine, query, ormRequest); + } else { + return new DtoQueryRequest<>(this, dtoQueryEngine, query, null); + } + } + SpiOrmQueryRequest createQueryRequest(Type type, Query query, @Nullable Transaction transaction) { SpiOrmQueryRequest request = buildQueryRequest(type, query, transaction); request.prepareQuery(); @@ -1519,7 +1532,7 @@ public T findSingleAttribute(SpiSqlQuery query, Class cls) { @Override public void findDtoEach(SpiDtoQuery query, Consumer consumer) { - DtoQueryRequest request = new DtoQueryRequest<>(this, dtoQueryEngine, query); + DtoQueryRequest request = createDtoQueryRequest(Type.ITERATE, query); try { request.initTransIfRequired(); request.findEach(consumer); @@ -1530,7 +1543,7 @@ public void findDtoEach(SpiDtoQuery query, Consumer consumer) { @Override public void findDtoEach(SpiDtoQuery query, int batch, Consumer> consumer) { - DtoQueryRequest request = new DtoQueryRequest<>(this, dtoQueryEngine, query); + DtoQueryRequest request = createDtoQueryRequest(Type.ITERATE, query); try { request.initTransIfRequired(); request.findEach(batch, consumer); @@ -1541,7 +1554,7 @@ public void findDtoEach(SpiDtoQuery query, int batch, Consumer> c @Override public void findDtoEachWhile(SpiDtoQuery query, Predicate consumer) { - DtoQueryRequest request = new DtoQueryRequest<>(this, dtoQueryEngine, query); + DtoQueryRequest request = createDtoQueryRequest(Type.ITERATE, query); try { request.initTransIfRequired(); request.findEachWhile(consumer); @@ -1552,7 +1565,7 @@ public void findDtoEachWhile(SpiDtoQuery query, Predicate consumer) { @Override public QueryIterator findDtoIterate(SpiDtoQuery query) { - DtoQueryRequest request = new DtoQueryRequest<>(this, dtoQueryEngine, query); + DtoQueryRequest request = createDtoQueryRequest(Type.ITERATE, query); try { request.initTransIfRequired(); return request.findIterate(); @@ -1569,7 +1582,11 @@ public Stream findDtoStream(SpiDtoQuery query) { @Override public List findDtoList(SpiDtoQuery query) { - DtoQueryRequest request = new DtoQueryRequest<>(this, dtoQueryEngine, query); + DtoQueryRequest request = createDtoQueryRequest(Type.LIST, query); + List ret = request.getFromQueryCache(); + if (ret != null) { + return ret; + } try { request.initTransIfRequired(); return request.findList(); @@ -1581,13 +1598,7 @@ public List findDtoList(SpiDtoQuery query) { @Nullable @Override public T findDtoOne(SpiDtoQuery query) { - DtoQueryRequest request = new DtoQueryRequest<>(this, dtoQueryEngine, query); - try { - request.initTransIfRequired(); - return extractUnique(request.findList()); - } finally { - request.endTransIfRequired(); - } + return extractUnique(findDtoList(query)); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java index 413074c493..b22858a4ec 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DtoQueryRequest.java @@ -4,7 +4,6 @@ import io.ebean.core.type.DataReader; import io.ebeaninternal.api.SpiDtoQuery; import io.ebeaninternal.api.SpiEbeanServer; -import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.dto.DtoColumn; import io.ebeaninternal.server.dto.DtoMappingRequest; import io.ebeaninternal.server.dto.DtoQueryPlan; @@ -31,11 +30,13 @@ public final class DtoQueryRequest extends AbstractSqlQueryRequest { private final DtoQueryEngine queryEngine; private DtoQueryPlan plan; private DataReader dataReader; + private SpiOrmQueryRequest ormRequest; - DtoQueryRequest(SpiEbeanServer server, DtoQueryEngine engine, SpiDtoQuery query) { + DtoQueryRequest(SpiEbeanServer server, DtoQueryEngine engine, SpiDtoQuery query, SpiOrmQueryRequest ormRequest) { super(server, query, query.transaction()); this.queryEngine = engine; this.query = query; + this.ormRequest = ormRequest; query.obtainLocation(); } @@ -43,20 +44,16 @@ public final class DtoQueryRequest extends AbstractSqlQueryRequest { * Prepare and execute the SQL using the Binder. */ @Override - public void executeSql(Binder binder, SpiQuery.Type type) throws SQLException { + public void executeSql(Binder binder) throws SQLException { startNano = System.nanoTime(); - SpiQuery ormQuery = query.ormQuery(); - if (ormQuery != null) { - ormQuery.setType(type); - ormQuery.setManualId(); - - query.setCancelableQuery(ormQuery); + if (ormRequest != null) { // execute the underlying ORM query returning the ResultSet - SpiResultSet result = server.findResultSet(ormQuery, transaction); + query.setCancelableQuery(query.ormQuery()); + ormRequest.transaction(transaction); + SpiResultSet result = ormRequest.findResultSet(); this.pstmt = result.statement(); - this.sql = ormQuery.getGeneratedSql(); - setResultSet(result.resultSet(), ormQuery.queryPlanKey()); - + this.sql = ormRequest.query().getGeneratedSql(); + setResultSet(result.resultSet(), ormRequest.query().queryPlanKey()); } else { // native SQL query execution executeAsSql(binder); @@ -155,4 +152,18 @@ static String parseColumn(String columnLabel) { return columnLabel; } + public List getFromQueryCache() { + if (ormRequest != null) { + return ormRequest.getFromQueryCache(); + } else { + return null; + } + } + + public void putToQueryCache(List result) { + if (ormRequest != null && ormRequest.isQueryCachePut()) { + ormRequest.putToQueryCache(result); + } + } + } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java index 3ffb1ae6ba..10713ff7a4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java @@ -8,7 +8,6 @@ import io.ebean.meta.MetricVisitor; import io.ebean.metric.MetricFactory; import io.ebean.metric.TimedMetricMap; -import io.ebeaninternal.api.SpiQuery; import io.ebeaninternal.server.core.RelationalQueryEngine; import io.ebeaninternal.server.core.RelationalQueryRequest; import io.ebeaninternal.server.core.RowReader; @@ -59,7 +58,7 @@ private String errMsg(String msg, String sql) { @Override public void findEach(RelationalQueryRequest request, RowConsumer consumer) { try { - request.executeSql(binder, SpiQuery.Type.ITERATE); + request.executeSql(binder); request.mapEach(consumer); request.logSummary(); @@ -74,7 +73,7 @@ public void findEach(RelationalQueryRequest request, RowConsumer consumer) { @Override public void findEach(RelationalQueryRequest request, RowReader reader, Predicate consumer) { try { - request.executeSql(binder, SpiQuery.Type.ITERATE); + request.executeSql(binder); while (request.next()) { if (!consumer.test(reader.read())) { break; @@ -93,7 +92,7 @@ public void findEach(RelationalQueryRequest request, RowReader reader, Pr @Override public T findOne(RelationalQueryRequest request, RowMapper mapper) { try { - request.executeSql(binder, SpiQuery.Type.BEAN); + request.executeSql(binder); T value = request.mapOne(mapper); request.logSummary(); return value; @@ -109,7 +108,7 @@ public T findOne(RelationalQueryRequest request, RowMapper mapper) { @Override public List findList(RelationalQueryRequest request, RowReader reader) { try { - request.executeSql(binder, SpiQuery.Type.LIST); + request.executeSql(binder); List rows = new ArrayList<>(); while (request.next()) { rows.add(reader.read()); @@ -129,7 +128,7 @@ public List findList(RelationalQueryRequest request, RowReader reader) public T findSingleAttribute(RelationalQueryRequest request, Class cls) { ScalarType scalarType = (ScalarType) binder.getScalarType(cls); try { - request.executeSql(binder, SpiQuery.Type.ATTRIBUTE); + request.executeSql(binder); final DataReader dataReader = binder.createDataReader(request.resultSet()); T value = null; if (dataReader.next()) { @@ -151,7 +150,7 @@ public T findSingleAttribute(RelationalQueryRequest request, Class cls) { public List findSingleAttributeList(RelationalQueryRequest request, Class cls) { ScalarType scalarType = (ScalarType) binder.getScalarType(cls); try { - request.executeSql(binder, SpiQuery.Type.ATTRIBUTE); + request.executeSql(binder); final DataReader dataReader = binder.createDataReader(request.resultSet()); List rows = new ArrayList<>(); while (dataReader.next()) { @@ -173,7 +172,7 @@ public List findSingleAttributeList(RelationalQueryRequest request, Class public void findSingleAttributeEach(RelationalQueryRequest request, Class cls, Consumer consumer) { ScalarType scalarType = (ScalarType) binder.getScalarType(cls); try { - request.executeSql(binder, SpiQuery.Type.ATTRIBUTE); + request.executeSql(binder); final DataReader dataReader = binder.createDataReader(request.resultSet()); while (dataReader.next()) { consumer.accept(scalarType.read(dataReader)); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java index 39588b7337..24ce404732 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java @@ -22,11 +22,12 @@ public DtoQueryEngine(Binder binder) { public List findList(DtoQueryRequest request) { try { - request.executeSql(binder, SpiQuery.Type.LIST); + request.executeSql(binder); List rows = new ArrayList<>(); while (request.next()) { rows.add(request.readNextBean()); } + request.putToQueryCache(rows); return rows; } catch (SQLException e) { @@ -38,7 +39,7 @@ public List findList(DtoQueryRequest request) { public QueryIterator findIterate(DtoQueryRequest request) { try { - request.executeSql(binder, SpiQuery.Type.ITERATE); + request.executeSql(binder); return new DtoQueryIterator<>(request); } catch (SQLException e) { throw new PersistenceException(errMsg(e.getMessage(), request.getSql()), e); @@ -47,7 +48,7 @@ public QueryIterator findIterate(DtoQueryRequest request) { public void findEach(DtoQueryRequest request, Consumer consumer) { try { - request.executeSql(binder, SpiQuery.Type.ITERATE); + request.executeSql(binder); while (request.next()) { consumer.accept(request.readNextBean()); } @@ -61,7 +62,7 @@ public void findEach(DtoQueryRequest request, Consumer consumer) { public void findEach(DtoQueryRequest request, int batchSize, Consumer> consumer) { try { List buffer = new ArrayList<>(); - request.executeSql(binder, SpiQuery.Type.ITERATE); + request.executeSql(binder); while (request.next()) { buffer.add(request.readNextBean()); if (buffer.size() >= batchSize) { @@ -82,7 +83,7 @@ public void findEach(DtoQueryRequest request, int batchSize, Consumer void findEachWhile(DtoQueryRequest request, Predicate consumer) { try { - request.executeSql(binder, SpiQuery.Type.ITERATE); + request.executeSql(binder); while (request.next()) { if (!consumer.test(request.readNextBean())) { break; 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 9e8a412254..7aaafeade4 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 @@ -163,6 +163,7 @@ public class DefaultOrmQuery extends AbstractQuery implements SpiQuery { private String nativeSql; private boolean orderById; private ProfileLocation profileLocation; + private Class dtoType = Object.class; // default: Object saves some null-checks. public DefaultOrmQuery(BeanDescriptor desc, SpiEbeanServer server, ExpressionFactory expressionFactory) { this.beanDescriptor = desc; @@ -1186,7 +1187,7 @@ public final HashQuery queryHash() { // so queryPlanHash is calculated well before this method is called BindValuesKey bindKey = new BindValuesKey(); queryBindKey(bindKey); - return new HashQuery(queryPlanKey, bindKey); + return new HashQuery(queryPlanKey, bindKey, dtoType); } @Override @@ -1654,6 +1655,11 @@ public final void setManualId() { } } + @Override + public void setDtoType(Class dtoType) { + this.dtoType = dtoType; + } + /** * return true if user specified to use SQL DISTINCT (effectively excludes id property). */ diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java index 6505e120d7..db61b6aaec 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryFromOrmTest.java @@ -1,15 +1,15 @@ package io.ebean.xtest.base; -import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.DtoQuery; import io.ebean.ProfileLocation; -import io.ebean.xtest.ForPlatform; import io.ebean.annotation.Platform; import io.ebean.meta.MetaQueryMetric; import io.ebean.meta.MetaTimedMetric; import io.ebean.meta.ServerMetrics; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; +import io.ebean.xtest.ForPlatform; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @@ -367,6 +367,37 @@ public void toDto_fromExpressionList() { assertThat(contactDtos).isNotEmpty(); } + @Test + public void toDto_withQueryCache() { + + ResetBasicData.reset(); + LoggedSql.start(); + List contactDtos1 = DB.find(Contact.class) + .setUseQueryCache(true) + .select("lastName, count(*) as totalCount").where() + .isNotNull("lastName").asDto(ContactTotals.class).findList(); + assertThat(LoggedSql.stop()).hasSize(1); + + + LoggedSql.start(); + List contactDtos2 = DB.find(Contact.class) + .setUseQueryCache(true) + .select("lastName, count(*) as totalCount").where() + .isNotNull("lastName").asDto(ContactTotals.class).findList(); + assertThat(LoggedSql.stop()).isEmpty(); + assertThat(contactDtos1).isNotEmpty().isSameAs(contactDtos2); + assertThat(contactDtos1.get(0)).isInstanceOf(ContactTotals.class); + + List contactDtos3 = DB.find(Contact.class) + .setUseQueryCache(true) + .select("lastName, count(*) as totalCount").where() + .isNotNull("lastName").asDto(ContactTotalsInt.class).findList(); + + assertThat(contactDtos3).isNotEmpty(); + assertThat(contactDtos3.get(0)).isInstanceOf(ContactTotalsInt.class); + + } + public static class ContactTotals { String lastName; @@ -394,6 +425,28 @@ public void setTotalCount(Long totalCount) { } } + public static class ContactTotalsInt { + + String lastName; + int totalCount; + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public int getTotalCount() { + return totalCount; + } + + public void setTotalCount(int totalCount) { + this.totalCount = totalCount; + } + } + public static class ContactDto2 { int id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Contact.java b/ebean-test/src/test/java/org/tests/model/basic/Contact.java index a4d6700714..2d2f639c8d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Contact.java @@ -12,7 +12,7 @@ @Index(columnNames = {"last_name", "first_name"}) @ChangeLog @Entity -@Cache(naturalKey = "email") +@Cache(naturalKey = "email", enableQueryCache = true) public class Contact { @Id @GeneratedValue From e3f1cb903665de5db4e0bd339efa0438a637aea6 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 12:04:08 +0200 Subject: [PATCH 021/123] NOPR - CustomDeployParser base code --- .../java/io/ebean/config/DatabaseConfig.java | 13 ++++ .../io/ebean/plugin/CustomDeployParser.java | 15 +++++ .../plugin/DeployBeanDescriptorMeta.java | 36 +++++++++++ .../plugin/DeployBeanPropertyAssocMeta.java | 23 +++++++ .../ebean/plugin/DeployBeanPropertyMeta.java | 37 +++++++++++ .../server/core/DefaultContainer.java | 1 + .../server/core/bootup/BootupClasses.java | 16 +++++ .../server/deploy/BeanDescriptorManager.java | 3 + .../deploy/CustomDeployParserManager.java | 23 +++++++ .../deploy/meta/DeployBeanDescriptor.java | 18 +++++- .../deploy/meta/DeployBeanProperty.java | 9 ++- .../deploy/meta/DeployBeanPropertyAssoc.java | 9 ++- .../tevent/CustomFormulaAnnotationParser.java | 61 +++++++++++++++++++ .../org/tests/model/tevent/TEventOne.java | 9 +++ .../aggregation/TestAggregationCount.java | 2 +- 15 files changed, 270 insertions(+), 5 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/plugin/CustomDeployParser.java create mode 100644 ebean-api/src/main/java/io/ebean/plugin/DeployBeanDescriptorMeta.java create mode 100644 ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyAssocMeta.java create mode 100644 ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyMeta.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/CustomDeployParserManager.java create mode 100644 ebean-test/src/test/java/org/tests/model/tevent/CustomFormulaAnnotationParser.java diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index 2062c0f65c..063d9c13eb 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -17,6 +17,7 @@ import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.meta.MetricNamingMatch; +import io.ebean.plugin.CustomDeployParser; import io.ebean.util.StringHelper; import javax.persistence.EnumType; @@ -406,6 +407,7 @@ public class DatabaseConfig { private List queryAdapters = new ArrayList<>(); private final List bulkTableEventListeners = new ArrayList<>(); private final List configStartupListeners = new ArrayList<>(); + private final List customDeployParsers = new ArrayList<>(); /** * By default inserts are included in the change log. @@ -2713,6 +2715,17 @@ public List getServerConfigStartupListeners() { return configStartupListeners; } + /** + * Add a CustomDeployParser. + */ + public void addCustomDeployParser(CustomDeployParser customDeployParser) { + customDeployParsers.add(customDeployParser); + } + + public List getCustomDeployParsers() { + return customDeployParsers; + } + /** * Register all the BeanPersistListener instances. *

diff --git a/ebean-api/src/main/java/io/ebean/plugin/CustomDeployParser.java b/ebean-api/src/main/java/io/ebean/plugin/CustomDeployParser.java new file mode 100644 index 0000000000..4c854f2f1e --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/plugin/CustomDeployParser.java @@ -0,0 +1,15 @@ +package io.ebean.plugin; + +import io.ebean.config.dbplatform.DatabasePlatform; + +/** + * Fired after all beans are parsed. You may implement own parsers to handle custom annotations. + * (See test case for example) + * + * @author Roland Praml, FOCONIS AG + */ +@FunctionalInterface +public interface CustomDeployParser { + + void parse(DeployBeanDescriptorMeta descriptor, DatabasePlatform databasePlatform); +} diff --git a/ebean-api/src/main/java/io/ebean/plugin/DeployBeanDescriptorMeta.java b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanDescriptorMeta.java new file mode 100644 index 0000000000..4347a5057c --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanDescriptorMeta.java @@ -0,0 +1,36 @@ +package io.ebean.plugin; + +import java.util.Collection; + +/** + * General deployment information. This is used in {@link CustomDeployParser}. + * + * @author Roland Praml, FOCONIS AG + */ +public interface DeployBeanDescriptorMeta { + + /** + * Return a collection of all BeanProperty deployment information. + */ + public Collection propertiesAll(); + + /** + * Get a BeanProperty by its name. + */ + public DeployBeanPropertyMeta getBeanProperty(String secondaryBeanName); + + /** + * Return the DeployBeanDescriptorMeta for the given bean class. + */ + public DeployBeanDescriptorMeta getDeployBeanDescriptorMeta(Class propertyType); + + /** + * Returns the discriminator column, if any. + * @return + */ + public String getDiscriminatorColumn(); + + public String getBaseTable(); + + DeployBeanPropertyMeta idProperty(); +} diff --git a/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyAssocMeta.java b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyAssocMeta.java new file mode 100644 index 0000000000..d7d1d637a3 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyAssocMeta.java @@ -0,0 +1,23 @@ +package io.ebean.plugin; + +public interface DeployBeanPropertyAssocMeta extends DeployBeanPropertyMeta { + + /** + * Return the mappedBy deployment attribute. + *

+ * This is the name of the property in the 'detail' bean that maps back to + * this 'master' bean. + *

+ */ + String getMappedBy(); + + /** + * Return the base table for this association. + *

+ * This has the table name which is used to determine the relationship for + * this association. + *

+ */ + String getBaseTable(); + +} diff --git a/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyMeta.java b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyMeta.java new file mode 100644 index 0000000000..4ba2d3e2a1 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/plugin/DeployBeanPropertyMeta.java @@ -0,0 +1,37 @@ +package io.ebean.plugin; + +import java.lang.reflect.Field; + +public interface DeployBeanPropertyMeta { + + /** + * Return the name of the property. + */ + String getName(); + + /** + * The database column name this is mapped to. + */ + String getDbColumn(); + + /** + * Return the bean Field associated with this property. + */ + Field getField(); + + /** + * The property is based on a formula. + */ + void setSqlFormula(String sqlSelect, String sqlJoin); + + /** + * Return the bean type. + */ + Class getOwningType(); + + /** + * Return the property type. + */ + Class getPropertyType(); + +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index d90cb0f089..3fab82bd09 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java @@ -169,6 +169,7 @@ private BootupClasses bootupClasses(DatabaseConfig config) { bootup.addFindControllers(config.getFindControllers()); bootup.addPersistListeners(config.getPersistListeners()); bootup.addQueryAdapters(config.getQueryAdapters()); + bootup.addCustomDeployParser(config.getCustomDeployParsers()); bootup.addChangeLogInstances(config); return bootup; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java index 9ab9ae4b5f..342264fb9a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java @@ -11,6 +11,7 @@ import io.ebean.event.changelog.ChangeLogRegister; import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; +import io.ebean.plugin.CustomDeployParser; import io.ebean.util.AnnotationUtil; import io.ebeaninternal.api.CoreLog; @@ -54,6 +55,7 @@ public class BootupClasses implements Predicate> { private final List> beanPersistListenerCandidates = new ArrayList<>(); private final List> beanQueryAdapterCandidates = new ArrayList<>(); private final List> serverConfigStartupCandidates = new ArrayList<>(); + private final List> customDeployParserCandidates = new ArrayList<>(); private final List idGeneratorInstances = new ArrayList<>(); private final List beanPersistControllerInstances = new ArrayList<>(); @@ -63,6 +65,7 @@ public class BootupClasses implements Predicate> { private final List beanPersistListenerInstances = new ArrayList<>(); private final List beanQueryAdapterInstances = new ArrayList<>(); private final List serverConfigStartupInstances = new ArrayList<>(); + private final List customDeployParserInstances = new ArrayList<>(); // single objects private Class changeLogPrepareClass; @@ -172,6 +175,10 @@ public void addServerConfigStartup(List startupInstances) { add(startupInstances, serverConfigStartupInstances, serverConfigStartupCandidates); } + public void addCustomDeployParser(List customDeployParser) { + add(customDeployParser, customDeployParserInstances, customDeployParserCandidates); + } + public void addChangeLogInstances(DatabaseConfig config) { readAuditPrepare = config.getReadAuditPrepare(); readAuditLogger = config.getReadAuditLogger(); @@ -288,6 +295,10 @@ public List getBeanQueryAdapters() { return createAdd(beanQueryAdapterInstances, beanQueryAdapterCandidates); } + public List getCustomDeployParsers() { + return createAdd(customDeployParserInstances, customDeployParserCandidates); + } + /** * Return the list of Embeddable classes. */ @@ -408,6 +419,11 @@ private boolean isInterestingInterface(Class cls) { interesting = true; } + if (CustomDeployParser.class.isAssignableFrom(cls)) { + customDeployParserCandidates.add((Class) cls); + interesting = true; + } + // single instances, last assigned wins if (ChangeLogListener.class.isAssignableFrom(cls)) { changeLogListenerClass = (Class) cls; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 7e73a5a94c..6d3fe8828e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -75,6 +75,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy private final BeanFinderManager beanFinderManager; private final PersistListenerManager persistListenerManager; private final BeanQueryAdapterManager beanQueryAdapterManager; + private final CustomDeployParserManager customDeployParserManager; private final NamingConvention namingConvention; private final DeployCreateProperties createProperties; private final BeanManagerFactory beanManagerFactory; @@ -154,6 +155,7 @@ public BeanDescriptorManager(InternalConfiguration config) { this.persistListenerManager = new PersistListenerManager(bootupClasses); this.beanQueryAdapterManager = new BeanQueryAdapterManager(bootupClasses); this.beanFinderManager = new BeanFinderManager(bootupClasses); + this.customDeployParserManager = new CustomDeployParserManager(bootupClasses); this.transientProperties = new TransientProperties(); this.changeLogPrepare = config.changeLogPrepare(bootupClasses.getChangeLogPrepare()); this.changeLogListener = config.changeLogListener(bootupClasses.getChangeLogListener()); @@ -292,6 +294,7 @@ public Map deploy(List mappings) { readEntityBeanTable(); readEntityDeploymentAssociations(); readInheritedIdGenerators(); + deployInfoMap.values().forEach(customDeployParserManager::parse); // creates the BeanDescriptors readEntityRelationships(); List> list = new ArrayList<>(descMap.values()); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/CustomDeployParserManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/CustomDeployParserManager.java new file mode 100644 index 0000000000..93a86d98b7 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/CustomDeployParserManager.java @@ -0,0 +1,23 @@ +package io.ebeaninternal.server.deploy; + +import java.util.List; + +import io.ebean.plugin.CustomDeployParser; +import io.ebeaninternal.server.core.bootup.BootupClasses; +import io.ebeaninternal.server.deploy.parse.DeployBeanInfo; + +public class CustomDeployParserManager { + + private final List parsers; + + public CustomDeployParserManager(BootupClasses bootupClasses) { + parsers = bootupClasses.getCustomDeployParsers(); + } + + public void parse(DeployBeanInfo value) { + for (CustomDeployParser parser : parsers) { + parser.parse(value.getDescriptor(), value.getUtil().dbPlatform()); + } + } + +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 97df0a16d4..41719fa28f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -10,6 +10,7 @@ import io.ebean.config.dbplatform.PlatformIdGenerator; import io.ebean.event.*; import io.ebean.event.changelog.ChangeLogFilter; +import io.ebean.plugin.DeployBeanDescriptorMeta; import io.ebean.text.PathProperties; import io.ebean.util.SplitName; import io.ebeaninternal.api.ConcurrencyMode; @@ -29,7 +30,7 @@ /** * Describes Beans including their deployment information. */ -public class DeployBeanDescriptor { +public class DeployBeanDescriptor implements DeployBeanDescriptorMeta { private static final Map EMPTY_NAMED_QUERY = new HashMap<>(); @@ -169,7 +170,7 @@ public TableJoin getPrimaryKeyJoin() { /** * Return the DeployBeanInfo for the given bean class. */ - DeployBeanInfo getDeploy(Class cls) { + public DeployBeanInfo getDeploy(Class cls) { return manager.deploy(cls); } @@ -597,6 +598,7 @@ public String[] getDependentTables() { * Return the base table. Only properties mapped to the base table are by * default persisted. */ + @Override public String getBaseTable() { return baseTable; } @@ -674,6 +676,7 @@ public Collection properties() { /** * Get a BeanProperty by its name. */ + @Override public DeployBeanProperty getBeanProperty(String propName) { return propMap.get(propName); } @@ -793,6 +796,7 @@ public String toString() { /** * Return a collection of all BeanProperty deployment information. */ + @Override public Collection propertiesAll() { return propMap.values(); } @@ -862,6 +866,7 @@ public String getSinglePrimaryKeyColumn() { /** * Return the BeanProperty that is the Id. */ + @Override public DeployBeanProperty idProperty() { if (idProperty != null) { return idProperty; @@ -1106,4 +1111,13 @@ private String getDeployWord(String expression) { } } + @Override + public String getDiscriminatorColumn() { + return inheritInfo == null ? null : inheritInfo.getDiscriminatorColumn(); + } + + @Override + public DeployBeanDescriptorMeta getDeployBeanDescriptorMeta(Class propertyType) { + return getDeploy(propertyType).getDescriptor(); + } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 4a1499138a..4881c12afc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -6,6 +6,7 @@ import io.ebean.config.dbplatform.DbEncrypt; import io.ebean.config.dbplatform.DbEncryptFunction; import io.ebean.core.type.ScalarType; +import io.ebean.plugin.DeployBeanPropertyMeta; import io.ebean.util.AnnotationUtil; import io.ebeaninternal.server.core.InternString; import io.ebeaninternal.server.deploy.BeanProperty; @@ -35,7 +36,7 @@ * Description of a property of a bean. Includes its deployment information such * as database column mapping information. */ -public class DeployBeanProperty implements DeployProperty { +public class DeployBeanProperty implements DeployProperty, DeployBeanPropertyMeta { private static final int ID_ORDER = 1000000; private static final int UNIDIRECTIONAL_ORDER = 100000; @@ -407,6 +408,7 @@ public void setOwningType(Class owningType) { this.owningType = owningType; } + @Override public Class getOwningType() { return owningType; } @@ -435,6 +437,7 @@ public void setSetter(BeanPropertySetter setter) { /** * Return the name of the property. */ + @Override public String getName() { return name; } @@ -449,6 +452,7 @@ public void setName(String name) { /** * Return the bean Field associated with this property. */ + @Override public Field getField() { return field; } @@ -553,6 +557,7 @@ public String getSqlFormulaJoin() { /** * The property is based on a formula. */ + @Override public void setSqlFormula(String formulaSelect, String formulaJoin) { this.sqlFormulaSelect = formulaSelect; this.sqlFormulaJoin = formulaJoin.isEmpty() ? null : formulaJoin; @@ -656,6 +661,7 @@ public String getElPlaceHolder() { /** * The database column name this is mapped to. */ + @Override public String getDbColumn() { if (sqlFormulaSelect != null) { return sqlFormulaSelect; @@ -849,6 +855,7 @@ public void setTransient() { /** * Return the property type. */ + @Override public Class getPropertyType() { return propertyType; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java index 3461be3bd8..123972cb0d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssoc.java @@ -1,5 +1,6 @@ package io.ebeaninternal.server.deploy.meta; +import io.ebean.plugin.DeployBeanPropertyAssocMeta; import io.ebeaninternal.server.deploy.BeanCascadeInfo; import io.ebeaninternal.server.deploy.BeanTable; import io.ebeaninternal.server.deploy.PropertyForeignKey; @@ -7,7 +8,7 @@ /** * Abstract base for properties mapped to an associated bean, list, set or map. */ -public abstract class DeployBeanPropertyAssoc extends DeployBeanProperty { +public abstract class DeployBeanPropertyAssoc extends DeployBeanProperty implements DeployBeanPropertyAssocMeta { /** * The type of the joined bean. @@ -129,6 +130,7 @@ public PropertyForeignKey getForeignKey() { * this 'master' bean. *

*/ + @Override public String getMappedBy() { return mappedBy; } @@ -173,4 +175,9 @@ public void setFetchPreference(int fetchPreference) { public void setTargetType(Class targetType) { this.targetType = (Class)targetType; } + + @Override + public String getBaseTable() { + return getBeanTable().getBaseTable(); + } } diff --git a/ebean-test/src/test/java/org/tests/model/tevent/CustomFormulaAnnotationParser.java b/ebean-test/src/test/java/org/tests/model/tevent/CustomFormulaAnnotationParser.java new file mode 100644 index 0000000000..3f392aed06 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/tevent/CustomFormulaAnnotationParser.java @@ -0,0 +1,61 @@ +package org.tests.model.tevent; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import io.ebean.annotation.Formula; +import io.ebean.config.dbplatform.DatabasePlatform; +import io.ebean.plugin.CustomDeployParser; +import io.ebean.plugin.DeployBeanDescriptorMeta; +import io.ebean.plugin.DeployBeanPropertyMeta; +import io.ebean.util.AnnotationUtil; +import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; + +/** + * Custom Annotation parser which parses @Count annotation + * + * @author Roland Praml, FOCONIS AG + */ +public class CustomFormulaAnnotationParser implements CustomDeployParser { + + private int counter; + + + @Target(FIELD) + @Retention(RUNTIME) + @Formula(select="TODO", join = "TODO") // meta-formula + public @interface Count { + String value(); + } + + + + @Override + public void parse(final DeployBeanDescriptorMeta descriptor, final DatabasePlatform databasePlatform) { + for (DeployBeanPropertyMeta prop : descriptor.propertiesAll()) { + readField(descriptor, prop); + } + } + + private void readField(DeployBeanDescriptorMeta descriptor, DeployBeanPropertyMeta prop) { + Count countAnnot = AnnotationUtil.get(prop.getField(), Count.class); + if (countAnnot != null) { + // @Count found, so build the (complex) count formula + DeployBeanPropertyAssocMany countProp = (DeployBeanPropertyAssocMany) descriptor.getBeanProperty(countAnnot.value()); + counter++; + String tmpTable = "f"+counter; + String sqlSelect = "coalesce(" + tmpTable + ".child_count, 0)"; + String parentId = countProp.getMappedBy() + "_id"; + String tableName = countProp.getBeanTable().getBaseTable(); + String sqlJoin = "left join (select " + parentId +", count(*) as child_count from " + tableName + " GROUP BY " + parentId + " )" + + " " + tmpTable + " on " + tmpTable + "." +parentId + " = ${ta}." + descriptor.idProperty().getDbColumn(); + prop.setSqlFormula(sqlSelect, sqlJoin); +// prop.setSqlFormula("f1.child_count", +// "join (select parent_id, count(*) as child_count from child_entity GROUP BY parent_id) f1 on f1.parent_id = ${ta}.id"); + } + } + +} diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java index bcbad8ef2e..678ca9677c 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java @@ -42,6 +42,11 @@ public enum Status { @OneToMany(mappedBy = "event", cascade = CascadeType.ALL) List logs; + @CustomFormulaAnnotationParser.Count("logs") + //@Formula(select = "f1.child_count", + //join = "left join (select event_id, count(*) as child_count from tevent_many GROUP BY event_id ) as f1 on f1.event_id = ${ta}.id") + Long customFormula; + public TEventOne(String name, Status status) { this.name = name; this.status = status; @@ -64,6 +69,10 @@ public Long getCount() { return count; } + public Long getCustomFormula() { + return customFormula; + } + public BigDecimal getTotalUnits() { return totalUnits; } diff --git a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java index 7d2bc67791..52e7d2237a 100644 --- a/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java +++ b/ebean-test/src/test/java/org/tests/query/aggregation/TestAggregationCount.java @@ -49,7 +49,7 @@ public void testBaseSelect() { List list = query.findList(); String sql = sqlOf(query, 5); - assertThat(sql).contains("select t0.id, t0.name, t0.status, t0.version, t0.event_id from tevent_one t0"); + assertThat(sql).contains("select t0.id, t0.name, t0.status, coalesce(f1.child_count, 0), t0.version, t0.event_id from tevent_one t0"); for (TEventOne eventOne : list) { // lazy loading on Aggregation properties From 7c63c756198ee8021ade752a5fc0702a6b6f5b6f Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 12:06:09 +0200 Subject: [PATCH 022/123] NOPR - make BeanProperty.field public --- .../main/java/io/ebeaninternal/server/deploy/BeanProperty.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 423d612307..a3a013af59 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -1022,7 +1022,7 @@ public List dbMigrationInfos() { /** * Return the bean Field associated with this property. */ - private Field field() { + public Field field() { return field; } From 4a1d010ed0b4605e72adcd406e597417c4040749 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 12:09:27 +0200 Subject: [PATCH 023/123] NOPR - additional test for Multi-Tenant-With-Master --- .../EbeanServerFactory_MultiTenancy_Test.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java index 0dcc4afc28..55919e615b 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServerFactory_MultiTenancy_Test.java @@ -49,6 +49,39 @@ public void create_new_server_with_multi_tenancy_db() { + /** + * Tests using multi tenancy per schema + */ + @Test + public void create_new_server_with_multi_tenancy_db_with_master() { + + String tenant = "customer"; + CurrentTenantProvider tenantProvider = Mockito.mock(CurrentTenantProvider.class); + Mockito.doReturn(tenant).when(tenantProvider).currentId(); + + TenantDataSourceProvider dataSourceProvider = Mockito.mock(TenantDataSourceProvider.class); + + DatabaseConfig config = new DatabaseConfig(); + + config.setName("h2"); + config.loadFromProperties(); + config.setRegister(false); + config.setDefaultServer(false); + config.setDdlGenerate(false); + config.setDdlRun(false); + + config.setTenantMode(TenantMode.DB_WITH_MASTER); + config.setCurrentTenantProvider(tenantProvider); + config.setTenantDataSourceProvider(dataSourceProvider); + + Mockito.doReturn(config.getDataSource()).when(dataSourceProvider).dataSource(tenant); + + config.setDatabasePlatform(new PostgresPlatform()); + + final Database database = DatabaseFactory.create(config); + database.shutdown(); + } + /** * Tests using multi tenancy per schema */ From 2d0cc45b419f4797d64a2d6c04910a643c6d2a6c Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 15:51:32 +0200 Subject: [PATCH 024/123] NOPR - EntityExtension base code --- .../src/main/java/io/ebean/EbeanVersion.java | 4 +- .../main/java/io/ebean/bean/EntityBean.java | 22 + .../io/ebean/bean/EntityBeanIntercept.java | 20 + .../ebean/bean/EntityExtensionIntercept.java | 562 ++++++++++++++++++ .../java/io/ebean/bean/ExtensionAccessor.java | 34 ++ .../io/ebean/bean/ExtensionAccessors.java | 264 ++++++++ .../java/io/ebean/bean/InterceptBase.java | 116 ++++ .../java/io/ebean/bean/InterceptReadOnly.java | 20 +- .../io/ebean/bean/InterceptReadWrite.java | 73 ++- .../io/ebean/bean/extend/EntityExtension.java | 70 +++ .../extend/EntityExtensionSuperclass.java | 10 + .../io/ebean/bean/extend/ExtendableBean.java | 20 + ebean-api/src/main/java/module-info.java | 1 + .../test/java/io/ebean/EbeanVersionTest.java | 6 +- .../server/core/bootup/BootupClasses.java | 15 + .../server/deploy/BeanDescriptorManager.java | 11 +- .../meta/BeanPropertyElementSetter.java | 2 +- .../deploy/parse/DeployCreateProperties.java | 11 + .../properties/BeanPropertiesReader.java | 17 +- .../properties/EnhanceBeanPropertyAccess.java | 8 +- ebean-test/pom.xml | 28 +- .../virtualprop/AbstractVirtualBase.java | 22 + .../tests/model/virtualprop/VirtualBase.java | 17 + .../tests/model/virtualprop/VirtualBaseA.java | 19 + .../tests/model/virtualprop/VirtualBaseB.java | 19 + .../model/virtualprop/VirtualBaseInherit.java | 23 + .../model/virtualprop/ext/Extension1.java | 31 + .../model/virtualprop/ext/Extension2.java | 32 + .../model/virtualprop/ext/Extension3.java | 45 ++ .../model/virtualprop/ext/Extension4.java | 26 + .../model/virtualprop/ext/Extension5.java | 23 + .../model/virtualprop/ext/Extension6.java | 31 + .../virtualprop/ext/TestVirtualProps.java | 190 ++++++ .../virtualprop/ext/VirtualAExtendOne.java | 44 ++ .../ext/VirtualExtendManyToMany.java | 43 ++ .../virtualprop/ext/VirtualExtendOne.java | 46 ++ pom.xml | 62 +- 37 files changed, 1916 insertions(+), 71 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/bean/EntityExtensionIntercept.java create mode 100644 ebean-api/src/main/java/io/ebean/bean/ExtensionAccessor.java create mode 100644 ebean-api/src/main/java/io/ebean/bean/ExtensionAccessors.java create mode 100644 ebean-api/src/main/java/io/ebean/bean/InterceptBase.java create mode 100644 ebean-api/src/main/java/io/ebean/bean/extend/EntityExtension.java create mode 100644 ebean-api/src/main/java/io/ebean/bean/extend/EntityExtensionSuperclass.java create mode 100644 ebean-api/src/main/java/io/ebean/bean/extend/ExtendableBean.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/AbstractVirtualBase.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBase.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseA.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseB.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseInherit.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension1.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension2.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension3.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension4.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension5.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension6.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/TestVirtualProps.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualAExtendOne.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendManyToMany.java create mode 100644 ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendOne.java diff --git a/ebean-api/src/main/java/io/ebean/EbeanVersion.java b/ebean-api/src/main/java/io/ebean/EbeanVersion.java index aeb855efce..8c543e3fe4 100644 --- a/ebean-api/src/main/java/io/ebean/EbeanVersion.java +++ b/ebean-api/src/main/java/io/ebean/EbeanVersion.java @@ -22,8 +22,8 @@ public final class EbeanVersion { /** * Maintain the minimum ebean-agent version manually based on required ebean-agent bug fixes. */ - private static final int MIN_AGENT_MAJOR_VERSION = 12; - private static final int MIN_AGENT_MINOR_VERSION = 12; + private static final int MIN_AGENT_MAJOR_VERSION = 13; + private static final int MIN_AGENT_MINOR_VERSION = 10; private static String version = "unknown"; static { diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBean.java b/ebean-api/src/main/java/io/ebean/bean/EntityBean.java index 53bfc9ba49..1a70a68571 100644 --- a/ebean-api/src/main/java/io/ebean/bean/EntityBean.java +++ b/ebean-api/src/main/java/io/ebean/bean/EntityBean.java @@ -41,6 +41,13 @@ default Object _ebean_newInstanceReadOnly() { throw new NotEnhancedException(); } + /** + * Creates a new instance and uses the provided intercept. (For EntityExtension) + */ + default Object _ebean_newExtendedInstance(int offset, EntityBean base) { + throw new NotEnhancedException(); + } + /** * Generated method that sets the loaded state on all the embedded beans on * this entity bean by using EntityBeanIntercept.setEmbeddedLoaded(Object o); @@ -120,4 +127,19 @@ default Object _ebean_getFieldIntercept(int fieldIndex) { default void toString(ToStringBuilder builder) { throw new NotEnhancedException(); } + + /** + * Returns the ExtensionAccessors, this is always NONE for non extendable beans. + */ + default ExtensionAccessors _ebean_getExtensionAccessors() { + return ExtensionAccessors.NONE; + } + + /** + * Returns the extension bean for an accessor. This will throw NotEnhancedException for non extendable beans. + * (It is not intended to call this method here) + */ + default EntityBean _ebean_getExtension(ExtensionAccessor accessor) { + throw new NotEnhancedException(); // not an extendableBean + } } diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java index 1127c02b25..120068ad34 100644 --- a/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java +++ b/ebean-api/src/main/java/io/ebean/bean/EntityBeanIntercept.java @@ -552,4 +552,24 @@ public interface EntityBeanIntercept extends Serializable { * Update the 'next' mutable info returning the content that was obtained via dirty detection. */ String mutableNext(int propertyIndex); + + /** + * Returns the value of the property. Can also return virtual properties. + */ + Object value(int propertyIndex); + + /** + * Returns the value of the property with intercept access. Can also return virtual properties. + */ + Object valueIntercept(int propertyIndex); + + /** + * Writes the value to the property. Can also write virtual properties. + */ + void setValue(int propertyIndex, Object value); + + /** + * Writes the value to the property with intercept access. Can also write virtual properties. + */ + void setValueIntercept(int propertyIndex, Object value); } diff --git a/ebean-api/src/main/java/io/ebean/bean/EntityExtensionIntercept.java b/ebean-api/src/main/java/io/ebean/bean/EntityExtensionIntercept.java new file mode 100644 index 0000000000..9efdd8ee07 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/bean/EntityExtensionIntercept.java @@ -0,0 +1,562 @@ +package io.ebean.bean; + +import io.ebean.ValuePair; + +import java.util.Map; +import java.util.Set; + +/** + * Intercept for classes annotated with @EntityExtension. The intercept will delegate all calls to the base intercept of the + * ExtendableBean and adds given offset to all field operations. + * + * @author Roland Praml, FOCONIS AG + */ +public class EntityExtensionIntercept implements EntityBeanIntercept { + private final EntityBeanIntercept base; + private final int offset; + + public EntityExtensionIntercept(Object ownerBean, int offset, EntityBean base) { + this.base = base._ebean_getIntercept(); + this.offset = offset; + } + + @Override + public EntityBean owner() { + return base.owner(); + } + + @Override + public PersistenceContext persistenceContext() { + return base.persistenceContext(); + } + + @Override + public void setPersistenceContext(PersistenceContext persistenceContext) { + base.setPersistenceContext(persistenceContext); + } + + @Override + public void setNodeUsageCollector(NodeUsageCollector usageCollector) { + base.setNodeUsageCollector(usageCollector); + } + + @Override + public Object ownerId() { + return base.ownerId(); + } + + @Override + public void setOwnerId(Object ownerId) { + base.setOwnerId(ownerId); + } + + @Override + public Object embeddedOwner() { + return base.embeddedOwner(); + } + + @Override + public int embeddedOwnerIndex() { + return base.embeddedOwnerIndex(); + } + + @Override + public void clearGetterCallback() { + base.clearGetterCallback(); + } + + @Override + public void registerGetterCallback(PreGetterCallback getterCallback) { + base.registerGetterCallback(getterCallback); + } + + @Override + public void setEmbeddedOwner(EntityBean parentBean, int embeddedOwnerIndex) { + base.setEmbeddedOwner(parentBean, embeddedOwnerIndex); + } + + @Override + public void setBeanLoader(BeanLoader beanLoader, PersistenceContext ctx) { + base.setBeanLoader(beanLoader, ctx); + } + + @Override + public void setBeanLoader(BeanLoader beanLoader) { + base.setBeanLoader(beanLoader); + } + + @Override + public boolean isFullyLoadedBean() { + return base.isFullyLoadedBean(); + } + + @Override + public void setFullyLoadedBean(boolean fullyLoadedBean) { + base.setFullyLoadedBean(fullyLoadedBean); + } + + @Override + public boolean isPartial() { + return base.isPartial(); + } + + @Override + public boolean isDirty() { + return base.isDirty(); + } + + @Override + public void setEmbeddedDirty(int embeddedProperty) { + base.setEmbeddedDirty(embeddedProperty + offset); + } + + @Override + public void setDirty(boolean dirty) { + base.setDirty(dirty); + } + + @Override + public boolean isNew() { + return base.isNew(); + } + + @Override + public boolean isNewOrDirty() { + return base.isNewOrDirty(); + } + + @Override + public boolean hasIdOnly(int idIndex) { + return base.hasIdOnly(idIndex + offset); + } + + @Override + public boolean isReference() { + return base.isReference(); + } + + @Override + public void setReference(int idPos) { + base.setReference(idPos + offset); + } + + @Override + public void setLoadedFromCache(boolean loadedFromCache) { + base.setLoadedFromCache(loadedFromCache); + } + + @Override + public boolean isLoadedFromCache() { + return base.isLoadedFromCache(); + } + + @Override + public boolean isReadOnly() { + return base.isReadOnly(); + } + + @Override + public void setReadOnly(boolean readOnly) { + base.setReadOnly(readOnly); + } + + @Override + public void setForceUpdate(boolean forceUpdate) { + base.setForceUpdate(forceUpdate); + } + + @Override + public boolean isUpdate() { + return base.isUpdate(); + } + + @Override + public boolean isLoaded() { + return base.isLoaded(); + } + + @Override + public void setNew() { + base.setNew(); + } + + @Override + public void setLoaded() { + base.setLoaded(); + } + + @Override + public void setLoadedLazy() { + base.setLoadedLazy(); + } + + @Override + public void setLazyLoadFailure(Object ownerId) { + base.setLazyLoadFailure(ownerId); + } + + @Override + public boolean isLazyLoadFailure() { + return base.isLazyLoadFailure(); + } + + @Override + public boolean isDisableLazyLoad() { + return base.isDisableLazyLoad(); + } + + @Override + public void setDisableLazyLoad(boolean disableLazyLoad) { + base.setDisableLazyLoad(disableLazyLoad); + } + + @Override + public void setEmbeddedLoaded(Object embeddedBean) { + base.setEmbeddedLoaded(embeddedBean); + } + + @Override + public boolean isEmbeddedNewOrDirty(Object embeddedBean) { + return base.isEmbeddedNewOrDirty(embeddedBean); + } + + @Override + public Object origValue(int propertyIndex) { + return base.origValue(propertyIndex + offset); + } + + @Override + public int findProperty(String propertyName) { + return base.findProperty(propertyName); + } + + @Override + public String property(int propertyIndex) { + return base.property(propertyIndex + offset); + } + + @Override + public int propertyLength() { + return base.propertyLength(); + } + + @Override + public void setPropertyLoaded(String propertyName, boolean loaded) { + base.setPropertyLoaded(propertyName, loaded); + } + + @Override + public void setPropertyUnloaded(int propertyIndex) { + base.setPropertyUnloaded(propertyIndex + offset); + } + + @Override + public void setLoadedProperty(int propertyIndex) { + base.setLoadedProperty(propertyIndex + offset); + } + + @Override + public void setLoadedPropertyAll() { + base.setLoadedPropertyAll(); + } + + @Override + public boolean isLoadedProperty(int propertyIndex) { + return base.isLoadedProperty(propertyIndex + offset); + } + + @Override + public boolean isChangedProperty(int propertyIndex) { + return base.isChangedProperty(propertyIndex + offset); + } + + @Override + public boolean isDirtyProperty(int propertyIndex) { + return base.isDirtyProperty(propertyIndex + offset); + } + + @Override + public void markPropertyAsChanged(int propertyIndex) { + base.markPropertyAsChanged(propertyIndex + offset); + } + + @Override + public void setChangedProperty(int propertyIndex) { + base.setChangedProperty(propertyIndex + offset); + } + + @Override + public void setChangeLoaded(int propertyIndex) { + base.setChangeLoaded(propertyIndex + offset); + } + + @Override + public void setEmbeddedPropertyDirty(int propertyIndex) { + base.setEmbeddedPropertyDirty(propertyIndex + offset); + } + + @Override + public void setOriginalValue(int propertyIndex, Object value) { + base.setOriginalValue(propertyIndex + offset, value); + } + + @Override + public void setOriginalValueForce(int propertyIndex, Object value) { + base.setOriginalValueForce(propertyIndex + offset, value); + } + + @Override + public void setNewBeanForUpdate() { + base.setNewBeanForUpdate(); + } + + @Override + public Set loadedPropertyNames() { + return base.loadedPropertyNames(); + } + + @Override + public boolean[] dirtyProperties() { + return base.dirtyProperties(); + } + + @Override + public Set dirtyPropertyNames() { + return base.dirtyPropertyNames(); + } + + @Override + public void addDirtyPropertyNames(Set props, String prefix) { + base.addDirtyPropertyNames(props, prefix); + } + + @Override + public boolean hasDirtyProperty(Set propertyNames) { + return base.hasDirtyProperty(propertyNames); + } + + @Override + public Map dirtyValues() { + return base.dirtyValues(); + } + + @Override + public void addDirtyPropertyValues(Map dirtyValues, String prefix) { + base.addDirtyPropertyValues(dirtyValues, prefix); + } + + @Override + public void addDirtyPropertyValues(BeanDiffVisitor visitor) { + base.addDirtyPropertyValues(visitor); + } + + @Override + public StringBuilder dirtyPropertyKey() { + return base.dirtyPropertyKey(); + } + + @Override + public void addDirtyPropertyKey(StringBuilder sb) { + base.addDirtyPropertyKey(sb); + } + + @Override + public StringBuilder loadedPropertyKey() { + return base.loadedPropertyKey(); + } + + @Override + public boolean[] loaded() { + return base.loaded(); + } + + @Override + public int lazyLoadPropertyIndex() { + return base.lazyLoadPropertyIndex() - offset; + } + + @Override + public String lazyLoadProperty() { + return base.lazyLoadProperty(); + } + + @Override + public void loadBean(int loadProperty) { + base.loadBean(loadProperty); + } + + @Override + public void loadBeanInternal(int loadProperty, BeanLoader loader) { + base.loadBeanInternal(loadProperty + offset, loader); + } + + @Override + public void initialisedMany(int propertyIndex) { + base.initialisedMany(propertyIndex + offset); + } + + @Override + public void preGetterCallback(int propertyIndex) { + base.preGetterCallback(propertyIndex + offset); + } + + @Override + public void preGetId() { + base.preGetId(); + } + + @Override + public void preGetter(int propertyIndex) { + base.preGetter(propertyIndex + offset); + } + + @Override + public void preSetterMany(boolean interceptField, int propertyIndex, Object oldValue, Object newValue) { + base.preSetterMany(interceptField, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void setChangedPropertyValue(int propertyIndex, boolean setDirtyState, Object origValue) { + base.setChangedPropertyValue(propertyIndex + offset, setDirtyState, origValue); + } + + @Override + public void setDirtyStatus() { + base.setDirtyStatus(); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, Object oldValue, Object newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, boolean oldValue, boolean newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, int oldValue, int newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, long oldValue, long newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, double oldValue, double newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, float oldValue, float newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, short oldValue, short newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, char oldValue, char newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, byte oldValue, byte newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, char[] oldValue, char[] newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void preSetter(boolean intercept, int propertyIndex, byte[] oldValue, byte[] newValue) { + base.preSetter(intercept, propertyIndex + offset, oldValue, newValue); + } + + @Override + public void setOldValue(int propertyIndex, Object oldValue) { + base.setOldValue(propertyIndex + offset, oldValue); + } + + @Override + public int sortOrder() { + return base.sortOrder(); + } + + @Override + public void setSortOrder(int sortOrder) { + base.setSortOrder(sortOrder); + } + + @Override + public void setDeletedFromCollection(boolean deletedFromCollection) { + base.setDeletedFromCollection(deletedFromCollection); + } + + @Override + public boolean isOrphanDelete() { + return base.isOrphanDelete(); + } + + @Override + public void setLoadError(int propertyIndex, Exception t) { + base.setLoadError(propertyIndex + offset, t); + } + + @Override + public Map loadErrors() { + return base.loadErrors(); + } + + @Override + public boolean isChangedProp(int propertyIndex) { + return base.isChangedProp(propertyIndex + offset); + } + + @Override + public MutableValueInfo mutableInfo(int propertyIndex) { + return base.mutableInfo(propertyIndex + offset); + } + + @Override + public void mutableInfo(int propertyIndex, MutableValueInfo info) { + base.mutableInfo(propertyIndex + offset, info); + } + + @Override + public void mutableNext(int propertyIndex, MutableValueNext next) { + base.mutableNext(propertyIndex + offset, next); + } + + @Override + public String mutableNext(int propertyIndex) { + return base.mutableNext(propertyIndex + offset); + } + + @Override + public Object value(int propertyIndex) { + return base.value(propertyIndex + offset); + } + + @Override + public Object valueIntercept(int propertyIndex) { + return base.valueIntercept(propertyIndex + offset); + } + + @Override + public void setValue(int propertyIndex, Object value) { + base.setValue(propertyIndex + offset, value); + } + + @Override + public void setValueIntercept(int propertyIndex, Object value) { + base.setValueIntercept(propertyIndex + offset, value); + } +} diff --git a/ebean-api/src/main/java/io/ebean/bean/ExtensionAccessor.java b/ebean-api/src/main/java/io/ebean/bean/ExtensionAccessor.java new file mode 100644 index 0000000000..cfea5db354 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/bean/ExtensionAccessor.java @@ -0,0 +1,34 @@ +package io.ebean.bean; + +import io.ebean.bean.extend.ExtendableBean; + +/** + * Provides access to the EntityExtensions. Each ExtendableBean may have multiple Extension-Accessors stored in the static + * {@link ExtensionAccessors} per class level. + *

+ * This interface is internally used by the enhancer. + * + * @author Roland Praml, FOCONIS AG + */ +public interface ExtensionAccessor { + + /* + * Returns the extension for a given bean. + */ + EntityBean getExtension(ExtendableBean bean); + + /** + * Returns the index of this extension. + */ + int getIndex(); + + /** + * Return the type of this extension. + */ + Class getType(); + + /** + * Returns the additional properties of this extension. + */ + String[] getProperties(); +} diff --git a/ebean-api/src/main/java/io/ebean/bean/ExtensionAccessors.java b/ebean-api/src/main/java/io/ebean/bean/ExtensionAccessors.java new file mode 100644 index 0000000000..341f3b4c31 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/bean/ExtensionAccessors.java @@ -0,0 +1,264 @@ +package io.ebean.bean; + +import io.ebean.bean.extend.EntityExtension; +import io.ebean.bean.extend.ExtendableBean; + +import java.util.*; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +/** + * Each ExtendableBean has one static member defined as + * 

+ * private static ExtensionAccessors _ebean_extension_accessors =
+ *   new ExtensionAccessors(thisClass._ebeanProps, superClass._ebean_extension_accessors | null)
+ *
+ * The ExtensionAccessors class is used to compute the additional space, that has to be reserved + * in the descriptor and the virtual properties, that will be added to the bean descriptor. + * The following class structure: + * 
+ *   @Entity
+ *   class Base extends ExtendableBean {
+ *     String prop0;
+ *     String prop1;
+ *     String prop2;
+ *   }
+ *   @EntityExtends(Base.class)
+ *   class Ext1 {
+ *     String prop3;
+ *     String prop4;
+ *   }
+ *   @EntityExtends(Base.class)
+ *   class Ext2 {
+ *     String prop5;
+ *     String prop6;
+ *   }
+ *
+ * will create an EntityBeanIntercept for "Base" holding up to 7 fields. Writing to fields 0..2 with ebi.setValue will modify + * the fields in Base, the r/w accesses to fields 3..4 are routed to Ext1 and 5..6 to Ext2. + *

+ * Note about offset and index: + *

+ *

+ * When you have subclasses (class Child extends Base) the extensions have all the same index in the parent and in + * the subclass, but may have different offsets, as the Child-class will provide additional fields. + *

+ * + * @author Roland Praml, FOCONIS AG + */ +public class ExtensionAccessors implements Iterable { + + /** + * Default extension info for beans, that have no extension. + */ + public static ExtensionAccessors NONE = new ExtensionAccessors(); + + /** + * The start offset specifies the offset where the first extension will start + */ + private final int startOffset; + + /** + * The entries. + */ + private List accessors = new ArrayList<>(); + + /** + * If we inherit from a class that has extensions, we have to inherit also all extensions from here + */ + private final ExtensionAccessors parent; + + /** + * The total property length of all extensions. This will be initialized once and cannot be changed any more + */ + private volatile int propertyLength = -1; + + /** + * The offsets where the extensions will start for effective binary search. + */ + private int[] offsets; + + /** + * Lock for synchronizing the initialization. + */ + private static final Lock lock = new ReentrantLock(); + + /** + * Constructor for ExtensionInfo.NONE. + */ + private ExtensionAccessors() { + this.startOffset = Integer.MAX_VALUE; + this.propertyLength = 0; + this.parent = null; + } + + /** + * Called from enhancer. Each entity has a static field initialized with + * _ebean_extensions = new ExtensonInfo(thisClass._ebeanProps, superClass._ebean_extensions | null) + */ + public ExtensionAccessors(String[] props, ExtensionAccessors parent) { + this.startOffset = props.length; + this.parent = parent; + } + + /** + * Called from enhancer. Each class annotated with {@link EntityExtension} will show up here. + * + * @param prototype instance of the class that is annotated with {@link EntityExtension} + */ + public ExtensionAccessor add(EntityBean prototype) { + if (propertyLength != -1) { + throw new UnsupportedOperationException("The extension is already in use and cannot be extended anymore"); + } + Entry entry = new Entry(prototype); + lock.lock(); + try { + accessors.add(entry); + } finally { + lock.unlock(); + } + return entry; + } + + /** + * returns how many extensions are registered. + */ + public int size() { + init(); + return accessors.size(); + } + + /** + * Returns the additional properties, that have been added by extensions. + */ + public int getPropertyLength() { + init(); + return propertyLength; + } + + /** + * Copies parent extensions and initializes the offsets. This will be done once only. + */ + private void init() { + if (propertyLength != -1) { + return; + } + lock.lock(); + try { + if (propertyLength != -1) { + return; + } + // sort the accessors, so they are "stable" + if (parent != null) { + parent.init(); + accessors.sort(Comparator.comparing(e -> e.getType().getName())); + if (accessors.isEmpty()) { + accessors = parent.accessors; + } else { + accessors.addAll(0, parent.accessors); + } + } + int length = 0; + offsets = new int[accessors.size()]; + for (int i = 0; i < accessors.size(); i++) { + Entry entry = (Entry) accessors.get(i); + entry.index = i; + offsets[i] = startOffset + length; + length += entry.getProperties().length; + } + propertyLength = length; + } finally { + lock.unlock(); + } + } + + /** + * Returns the offset of this extension accessor. + * Note: The offset may vary on subclasses + */ + int getOffset(ExtensionAccessor accessor) { + return offsets[accessor.getIndex()]; + } + + /** + * Finds the accessor for a given property. If the propertyIndex is lower than startOffset, no accessor will be returned, + * as this means that we try to access a property in the base-entity. + */ + ExtensionAccessor findAccessor(int propertyIndex) { + init(); + if (propertyIndex < startOffset) { + return null; + } + int pos = Arrays.binarySearch(offsets, propertyIndex); + if (pos == -1) { + return null; + } + if (pos < 0) { + pos = -2 - pos; + } + return accessors.get(pos); + } + + @Override + public Iterator iterator() { + init(); + return accessors.iterator(); + } + + /** + * Invoked by enhancer. + */ + public EntityBean createInstance(ExtensionAccessor accessor, EntityBean base) { + int offset = getOffset(accessor); + return ((Entry) accessor).createInstance(offset, base); + } + + static class Entry implements ExtensionAccessor { + private int index; + private final EntityBean prototype; + + private Entry(EntityBean prototype) { + this.prototype = prototype; + } + + @Override + public String[] getProperties() { + return prototype._ebean_getPropertyNames(); + } + + @Override + public int getIndex() { + return index; + } + + @Override + public Class getType() { + return prototype.getClass(); + } + + EntityBean createInstance(int offset, EntityBean base) { + return (EntityBean) prototype._ebean_newExtendedInstance(offset, base); + } + + @Override + public EntityBean getExtension(ExtendableBean bean) { + EntityBean eb = (EntityBean) bean; + return eb._ebean_getExtension(Entry.this); + } + } + + /** + * Reads the extension accessors for a given class. If the provided type is not an ExtenadableBean, the + * ExtensionAccessors.NONE is returned. + */ + public static ExtensionAccessors read(Class type) { + if (ExtendableBean.class.isAssignableFrom(type)) { + try { + return (ExtensionAccessors) type.getField("_ebean_extension_accessors").get(null); + } catch (ReflectiveOperationException e) { + throw new RuntimeException("Could not read extension info from " + type, e); + } + } + return ExtensionAccessors.NONE; + } +} diff --git a/ebean-api/src/main/java/io/ebean/bean/InterceptBase.java b/ebean-api/src/main/java/io/ebean/bean/InterceptBase.java new file mode 100644 index 0000000000..a38655100b --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/bean/InterceptBase.java @@ -0,0 +1,116 @@ +package io.ebean.bean; + +/** + * Base class for InterceptReadOnly / InterceptReadWrite. This class should contain only the essential member variables to keep + * the memory footprint low. + * + * @author Roland Praml, FOCONIS AG + */ +public abstract class InterceptBase implements EntityBeanIntercept { + + /** + * The actual entity bean that 'owns' this intercept. + */ + protected final EntityBean owner; + + protected InterceptBase(EntityBean owner) { + this.owner = owner; + } + + protected ExtensionAccessor findAccessor(int index) { + return owner._ebean_getExtensionAccessors().findAccessor(index); + } + + private int getOffset(ExtensionAccessor accessor) { + return owner._ebean_getExtensionAccessors().getOffset(accessor); + } + + protected EntityBean getExtensionBean(ExtensionAccessor accessor) { + return owner._ebean_getExtension(accessor); + } + + @Override + public int findProperty(String propertyName) { + String[] names = owner._ebean_getPropertyNames(); + int i; + for (i = 0; i < names.length; i++) { + if (names[i].equals(propertyName)) { + return i; + } + } + for (ExtensionAccessor acc : owner._ebean_getExtensionAccessors()) { + names = acc.getProperties(); + for (int j = 0; j < names.length; j++) { + if (names[j].equals(propertyName)) { + return i; + } + i++; + } + } + return -1; + } + + @Override + public String property(int propertyIndex) { + if (propertyIndex == -1) { + return null; + } + ExtensionAccessor accessor = findAccessor(propertyIndex); + if (accessor == null) { + return owner._ebean_getPropertyName(propertyIndex); + } else { + int offset = getOffset(accessor); + return getExtensionBean(accessor)._ebean_getPropertyName(propertyIndex - offset); + } + } + + @Override + public int propertyLength() { + return owner._ebean_getPropertyNames().length + + owner._ebean_getExtensionAccessors().getPropertyLength(); + } + + @Override + public Object value(int index) { + ExtensionAccessor accessor = findAccessor(index); + if (accessor == null) { + return owner._ebean_getField(index); + } else { + int offset = getOffset(accessor); + return getExtensionBean(accessor)._ebean_getField(index - offset); + } + } + + @Override + public Object valueIntercept(int index) { + ExtensionAccessor accessor = findAccessor(index); + if (accessor == null) { + return owner._ebean_getFieldIntercept(index); + } else { + int offset = getOffset(accessor); + return getExtensionBean(accessor)._ebean_getFieldIntercept(index - offset); + } + } + + @Override + public void setValue(int index, Object value) { + ExtensionAccessor accessor = findAccessor(index); + if (accessor == null) { + owner._ebean_setField(index, value); + } else { + int offset = getOffset(accessor); + getExtensionBean(accessor)._ebean_setField(index - offset, value); + } + } + + @Override + public void setValueIntercept(int index, Object value) { + ExtensionAccessor accessor = findAccessor(index); + if (accessor == null) { + owner._ebean_setFieldIntercept(index, value); + } else { + int offset = getOffset(accessor); + getExtensionBean(accessor)._ebean_setFieldIntercept(index - offset, value); + } + } +} diff --git a/ebean-api/src/main/java/io/ebean/bean/InterceptReadOnly.java b/ebean-api/src/main/java/io/ebean/bean/InterceptReadOnly.java index 26f5faf8d5..da37254e2c 100644 --- a/ebean-api/src/main/java/io/ebean/bean/InterceptReadOnly.java +++ b/ebean-api/src/main/java/io/ebean/bean/InterceptReadOnly.java @@ -13,15 +13,14 @@ * required for updates such as per property changed, loaded, dirty state, original values * bean state etc. */ -public class InterceptReadOnly implements EntityBeanIntercept { +public class InterceptReadOnly extends InterceptBase implements EntityBeanIntercept { - private final EntityBean owner; /** * Create with a given entity. */ public InterceptReadOnly(Object ownerBean) { - this.owner = (EntityBean) ownerBean; + super((EntityBean) ownerBean); } @Override @@ -234,21 +233,6 @@ public Object origValue(int propertyIndex) { return null; } - @Override - public int findProperty(String propertyName) { - return 0; - } - - @Override - public String property(int propertyIndex) { - return null; - } - - @Override - public int propertyLength() { - return 0; - } - @Override public void setPropertyLoaded(String propertyName, boolean loaded) { diff --git a/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java b/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java index c760ca10b4..b08d310683 100644 --- a/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java +++ b/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java @@ -12,7 +12,12 @@ import java.io.InputStream; import java.math.BigDecimal; import java.net.URL; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -22,9 +27,8 @@ * This provides the mechanisms to support deferred fetching of reference beans * and oldValues generation for concurrency checking. */ -public final class InterceptReadWrite implements EntityBeanIntercept { - - private static final long serialVersionUID = -3664031775464862649L; +public final class InterceptReadWrite extends InterceptBase implements EntityBeanIntercept { + private static final long serialVersionUID = 1834735632647183821L; private static final int STATE_NEW = 0; private static final int STATE_REFERENCE = 1; @@ -55,11 +59,6 @@ public final class InterceptReadWrite implements EntityBeanIntercept { private String ebeanServerName; private boolean deletedFromCollection; - - /** - * The actual entity bean that 'owns' this intercept. - */ - private final EntityBean owner; private EntityBean embeddedOwner; private int embeddedOwnerIndex; /** @@ -101,15 +100,15 @@ public final class InterceptReadWrite implements EntityBeanIntercept { * Create with a given entity. */ public InterceptReadWrite(Object ownerBean) { - this.owner = (EntityBean) ownerBean; - this.flags = new byte[owner._ebean_getPropertyNames().length]; + super((EntityBean) ownerBean); + this.flags = new byte[super.propertyLength()]; } /** * EXPERIMENTAL - Constructor only for use by serialization frameworks. */ public InterceptReadWrite() { - this.owner = null; + super(null); this.flags = null; } @@ -227,7 +226,7 @@ public boolean isDirty() { } if (mutableInfo != null) { for (int i = 0; i < mutableInfo.length; i++) { - if (mutableInfo[i] != null && !mutableInfo[i].isEqualToObject(owner._ebean_getField(i))) { + if (mutableInfo[i] != null && !mutableInfo[i].isEqualToObject(value(i))) { dirty = true; break; } @@ -411,25 +410,6 @@ public Object origValue(int propertyIndex) { return origValues[propertyIndex]; } - @Override - public int findProperty(String propertyName) { - final String[] names = owner._ebean_getPropertyNames(); - for (int i = 0; i < names.length; i++) { - if (names[i].equals(propertyName)) { - return i; - } - } - return -1; - } - - @Override - public String property(int propertyIndex) { - if (propertyIndex == -1) { - return null; - } - return owner._ebean_getPropertyName(propertyIndex); - } - @Override public int propertyLength() { return flags.length; @@ -571,7 +551,7 @@ public void addDirtyPropertyNames(Set props, String prefix) { props.add((prefix == null ? property(i) : prefix + property(i))); } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) { // an embedded property has been changed - recurse - final EntityBean embeddedBean = (EntityBean) owner._ebean_getField(i); + final EntityBean embeddedBean = (EntityBean) value(i); embeddedBean._ebean_getIntercept().addDirtyPropertyNames(props, property(i) + "."); } } @@ -579,9 +559,10 @@ public void addDirtyPropertyNames(Set props, String prefix) { @Override public boolean hasDirtyProperty(Set propertyNames) { - final String[] names = owner._ebean_getPropertyNames(); + String[] names = owner._ebean_getPropertyNames(); final int len = propertyLength(); - for (int i = 0; i < len; i++) { + int i; + for (i = 0; i < len; i++) { if (isChangedProp(i)) { if (propertyNames.contains(names[i])) { return true; @@ -592,6 +573,22 @@ public boolean hasDirtyProperty(Set propertyNames) { } } } + for (ExtensionAccessor acc : owner._ebean_getExtensionAccessors()) { + names = acc.getProperties(); + for (int j = 0; j < names.length; j++) { + if (isChangedProp(i)) { + if (propertyNames.contains(names[j])) { + return true; + } + } else if ((flags[i] & FLAG_EMBEDDED_DIRTY) != 0) { + if (propertyNames.contains(names[j])) { + return true; + } + } + i++; + } + } + return false; } @@ -609,7 +606,7 @@ public void addDirtyPropertyValues(Map dirtyValues, String pr if (isChangedProp(i)) { // the property has been changed on this bean final String propName = (prefix == null ? property(i) : prefix + property(i)); - final Object newVal = owner._ebean_getField(i); + final Object newVal = value(i); final Object oldVal = origValue(i); if (notEqual(oldVal, newVal)) { dirtyValues.put(propName, new ValuePair(newVal, oldVal)); @@ -628,7 +625,7 @@ public void addDirtyPropertyValues(BeanDiffVisitor visitor) { for (int i = 0; i < len; i++) { if (isChangedProp(i)) { // the property has been changed on this bean - final Object newVal = owner._ebean_getField(i); + final Object newVal = value(i); final Object oldVal = origValue(i); if (notEqual(oldVal, newVal)) { visitor.visit(i, newVal, oldVal); @@ -1036,7 +1033,7 @@ public Map loadErrors() { public boolean isChangedProp(int i) { if ((flags[i] & FLAG_CHANGED_PROP) != 0) { return true; - } else if (mutableInfo == null || mutableInfo[i] == null || mutableInfo[i].isEqualToObject(owner._ebean_getField(i))) { + } else if (mutableInfo == null || mutableInfo[i] == null || mutableInfo[i].isEqualToObject(value(i))) { return false; } else { // mark for change diff --git a/ebean-api/src/main/java/io/ebean/bean/extend/EntityExtension.java b/ebean-api/src/main/java/io/ebean/bean/extend/EntityExtension.java new file mode 100644 index 0000000000..c62d099a4e --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/bean/extend/EntityExtension.java @@ -0,0 +1,70 @@ +package io.ebean.bean.extend; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Annotation for a class to extend an existing class. + *

+ * Normally, you would have annotated like the following example + * + * 

+ *   package basePkg;
+ *   import extPkg.MyExtEntity;
+ *   class MyBaseEntity {
+ *     // this line is mandatory, to allow deletion of MyBaseEntity
+ *     @OneToOne(optional = true, cascade = Cascade.ALL)
+ *     private MyExtEntity
+ *   }
+ *
+ *   package extPkg;
+ *   import basePkg.myBaseEntity;
+ *   class MyExtEntity {
+ *     @OneToOne(optional = false)
+ *     private MyBaseEntity
+ *   }
+ *
+ *

+ * If you spread your code over different packages or (especially in different maven modules), you'll get problems, because you'll get cyclic depencencies. + *

+ * To break up these dependencies, you can annotate 'MyExtEntity' + * + * 

+ *   package extPkg;
+ *   import basePkg.myBaseEntity;
+ *   @EntityExtension(MyBaseEntity.class)
+ *   class MyExtEntity {
+ *     @OneToOne(optional = false)
+ *     private MyBaseEntity
+ *
+ *     private String someField;
+ *   }
+ *
+ * This will create a virtual property in the MyBaseEntity without adding a dependency to MyExtEntity. + *

+ * You may add a + * 

+ *   public static MyExtEntity get(MyBaseEntity base) {
+ *     throw new NotEnhancedException();
+ *   }
+ *
+ * This getter will be replaced by the enhancer, so that you can easily get it with + * MyExtEntiy.get(base).getSomeField(). + *
+ * Technically, the instance of MyExtEntiy is stored in the _ebean_extension_storage array of + * MyBaseEntity. + *

+ * If you save the MyBaseEntity, it will also save the data stored in MyExtEntity. + * + * @author Alexander Wagner, FOCONIS AG + */ +@Documented +@Target(TYPE) +@Retention(RUNTIME) +public @interface EntityExtension { + Class[] value(); +} diff --git a/ebean-api/src/main/java/io/ebean/bean/extend/EntityExtensionSuperclass.java b/ebean-api/src/main/java/io/ebean/bean/extend/EntityExtensionSuperclass.java new file mode 100644 index 0000000000..cb491c3508 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/bean/extend/EntityExtensionSuperclass.java @@ -0,0 +1,10 @@ +package io.ebean.bean.extend; + +/** + * Marker for EntityExtension superclass. + * + * @author Noemi Praml, FOCONIS AG + */ +public @interface EntityExtensionSuperclass { + +} diff --git a/ebean-api/src/main/java/io/ebean/bean/extend/ExtendableBean.java b/ebean-api/src/main/java/io/ebean/bean/extend/ExtendableBean.java new file mode 100644 index 0000000000..1f4f4b7de1 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/bean/extend/ExtendableBean.java @@ -0,0 +1,20 @@ +package io.ebean.bean.extend; + +import io.ebean.bean.EntityBean; +import io.ebean.bean.NotEnhancedException; + +/** + * Marker interface for beans that can be extended with @EntityExtension. + * + * @author Roland Praml, FOCONIS AG + */ +public interface ExtendableBean { + + /** + * Returns an array of registered extensions. This may be useful for bean validation. + * NOTE: The passed array should NOT be modified. + */ + default EntityBean[] _ebean_getExtensions() { + throw new NotEnhancedException(); + } +} diff --git a/ebean-api/src/main/java/module-info.java b/ebean-api/src/main/java/module-info.java index a8fb4ea387..81c0c6b142 100644 --- a/ebean-api/src/main/java/module-info.java +++ b/ebean-api/src/main/java/module-info.java @@ -25,6 +25,7 @@ exports io.ebean; exports io.ebean.bean; + exports io.ebean.bean.extend; exports io.ebean.cache; exports io.ebean.meta; exports io.ebean.config; diff --git a/ebean-api/src/test/java/io/ebean/EbeanVersionTest.java b/ebean-api/src/test/java/io/ebean/EbeanVersionTest.java index 5eb17bbe87..5b78dbbe15 100644 --- a/ebean-api/src/test/java/io/ebean/EbeanVersionTest.java +++ b/ebean-api/src/test/java/io/ebean/EbeanVersionTest.java @@ -9,9 +9,9 @@ class EbeanVersionTest { @Test void checkMinAgentVersion_ok() { - assertFalse(EbeanVersion.checkMinAgentVersion("12.12.0")); - assertFalse(EbeanVersion.checkMinAgentVersion("12.12.99")); - assertFalse(EbeanVersion.checkMinAgentVersion("13.1.0")); + assertFalse(EbeanVersion.checkMinAgentVersion("13.10.0")); + assertFalse(EbeanVersion.checkMinAgentVersion("13.10.99")); + assertFalse(EbeanVersion.checkMinAgentVersion("14.1.0")); } @Test diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java index 342264fb9a..660644512e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java @@ -1,6 +1,7 @@ package io.ebeaninternal.server.core.bootup; import io.ebean.annotation.DocStore; +import io.ebean.bean.extend.EntityExtension; import io.ebean.config.DatabaseConfig; import io.ebean.config.IdGenerator; import io.ebean.config.ScalarTypeConverter; @@ -39,6 +40,7 @@ public class BootupClasses implements Predicate> { private final List> embeddableList = new ArrayList<>(); private final List> entityList = new ArrayList<>(); + private final List> entityExtensionList = new ArrayList<>(); private final List>> scalarTypeList = new ArrayList<>(); private final List>> scalarConverterList = new ArrayList<>(); private final List>> attributeConverterList = new ArrayList<>(); @@ -313,6 +315,13 @@ public List> getEntities() { return entityList; } + /** + * Return the list of entity extension classes. + */ + public List> getEntityExtensionList() { + return entityExtensionList; + } + /** * Return the list of ScalarTypes found. */ @@ -340,6 +349,8 @@ public boolean test(Class cls) { embeddableList.add(cls); } else if (isEntity(cls)) { entityList.add(cls); + } else if (isEntityExtension(cls)) { + entityExtensionList.add(cls); } else { return isInterestingInterface(cls); } @@ -456,6 +467,10 @@ private boolean isEntity(Class cls) { return has(cls, Entity.class) || has(cls, Table.class) || has(cls, DocStore.class); } + private boolean isEntityExtension(Class cls) { + return has(cls, EntityExtension.class); + } + private boolean isEmbeddable(Class cls) { return has(cls, Embeddable.class); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 6d3fe8828e..9bf7f874ac 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -640,6 +640,14 @@ private void registerDescriptor(DeployBeanInfo info) { * BeanTables have all been created. */ private void readEntityDeploymentInitial() { + for (Class extensionClass : bootupClasses.getEntityExtensionList()) { + try { + // TODO: load class in an early stage + extensionClass.getField("_ebean_props").get(null); + } catch (Exception e) { + throw new RuntimeException(e); + } + } for (Class entityClass : bootupClasses.getEntities()) { DeployBeanInfo info = createDeployBeanInfo(entityClass); deployInfoMap.put(entityClass, info); @@ -1164,11 +1172,12 @@ private DeployBeanInfo createDeployBeanInfo(Class beanClass) { // set bean controller, finder and listener setBeanControllerFinderListener(desc); deplyInherit.process(desc); - desc.checkInheritanceMapping(); createProperties.createProperties(desc); DeployBeanInfo info = new DeployBeanInfo<>(deployUtil, desc); readAnnotations.readInitial(info); + + desc.checkInheritanceMapping(); return info; } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java index c8a362b602..fcb34d0e07 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/BeanPropertyElementSetter.java @@ -16,7 +16,7 @@ final class BeanPropertyElementSetter implements BeanPropertySetter { @Override public void set(EntityBean bean, Object value) { - bean._ebean_setField(pos, value); + bean._ebean_getIntercept().setValue(pos, value); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java index 5fc1381096..d54a972be6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java @@ -2,6 +2,8 @@ import io.ebean.Model; import io.ebean.annotation.*; +import io.ebean.bean.ExtensionAccessor; +import io.ebean.bean.ExtensionAccessors; import io.ebean.core.type.ScalarType; import io.ebean.util.AnnotationUtil; import io.ebeaninternal.api.CoreLog; @@ -36,6 +38,15 @@ public DeployCreateProperties(TypeManager typeManager) { */ public void createProperties(DeployBeanDescriptor desc) { createProperties(desc, desc.getBeanType(), 0); + for (ExtensionAccessor info : ExtensionAccessors.read(desc.getBeanType())) { + createProperties(desc, info.getType(), 0); + for (DeployBeanProperty prop : desc.propertiesAll()) { + if (prop.getOwningType() == info.getType()) { + prop.setOwningType(desc.getBeanType()); + } + } + } + desc.sortProperties(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java index ec56da19de..251e113ba6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/properties/BeanPropertiesReader.java @@ -1,5 +1,8 @@ package io.ebeaninternal.server.properties; +import io.ebean.bean.ExtensionAccessor; +import io.ebean.bean.ExtensionAccessors; + import java.lang.reflect.Field; import java.util.Arrays; import java.util.HashMap; @@ -33,10 +36,22 @@ public Integer getPropertyIndex(String property) { return propertyIndexMap.get(property); } + private String[] concat(String[] arr1, String[] arr2) { + String[] ret = new String[arr1.length + arr2.length]; + System.arraycopy(arr1, 0, ret, 0, arr1.length); + System.arraycopy(arr2, 0, ret, arr1.length, arr2.length); + return ret; + } + private String[] getProperties(Class clazz) { try { Field field = clazz.getField("_ebean_props"); - return (String[]) field.get(null); + String[] props = (String[]) field.get(null); + + for (ExtensionAccessor extension : ExtensionAccessors.read(clazz)) { + props = concat(props, extension.getProperties()); + } + return props; } catch (Exception e) { throw new IllegalStateException("Error getting _ebean_props field on type " + clazz, e); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java b/ebean-core/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java index e7e48b6f03..ce42a69873 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/properties/EnhanceBeanPropertyAccess.java @@ -54,12 +54,12 @@ private static final class Getter implements BeanPropertyGetter { @Override public Object get(EntityBean bean) { - return bean._ebean_getField(fieldIndex); + return bean._ebean_intercept().value(fieldIndex); } @Override public Object getIntercept(EntityBean bean) { - return bean._ebean_getFieldIntercept(fieldIndex); + return bean._ebean_intercept().valueIntercept(fieldIndex); } } @@ -73,12 +73,12 @@ private static final class Setter implements BeanPropertySetter { @Override public void set(EntityBean bean, Object value) { - bean._ebean_setField(fieldIndex, value); + bean._ebean_intercept().setValue(fieldIndex, value); } @Override public void setIntercept(EntityBean bean, Object value) { - bean._ebean_setFieldIntercept(fieldIndex, value); + bean._ebean_intercept().setValueIntercept(fieldIndex, value); } } diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 691ba718c9..b0d81c4ef7 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -292,7 +292,7 @@ - + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + test + process-test-classes + + debug=0 + + + testEnhance + + + + + + + io.ebean + ebean-agent + ${ebean-agent.version} + + - diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/AbstractVirtualBase.java b/ebean-test/src/test/java/org/tests/model/virtualprop/AbstractVirtualBase.java new file mode 100644 index 0000000000..7842cd0bb0 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/AbstractVirtualBase.java @@ -0,0 +1,22 @@ +package org.tests.model.virtualprop; + +import io.ebean.bean.extend.ExtendableBean; + +import javax.persistence.Id; +import javax.persistence.MappedSuperclass; + +@MappedSuperclass +public class AbstractVirtualBase implements ExtendableBean { + + @Id + private int id; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBase.java b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBase.java new file mode 100644 index 0000000000..9912949766 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBase.java @@ -0,0 +1,17 @@ +package org.tests.model.virtualprop; + +import javax.persistence.Entity; + +@Entity +public class VirtualBase extends AbstractVirtualBase { + + private String data; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseA.java b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseA.java new file mode 100644 index 0000000000..4e3b2d2b76 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseA.java @@ -0,0 +1,19 @@ +package org.tests.model.virtualprop; + +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; + +@Entity +@DiscriminatorValue("A") +public class VirtualBaseA extends VirtualBaseInherit { + + private Integer num; + + public Integer getNum() { + return num; + } + + public void setNum(Integer num) { + this.num = num; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseB.java b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseB.java new file mode 100644 index 0000000000..17c86f2936 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseB.java @@ -0,0 +1,19 @@ +package org.tests.model.virtualprop; + +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; + +@Entity +@DiscriminatorValue("B") +public class VirtualBaseB extends VirtualBaseInherit { + + private String text; + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseInherit.java b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseInherit.java new file mode 100644 index 0000000000..9dce83fc60 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseInherit.java @@ -0,0 +1,23 @@ +package org.tests.model.virtualprop; + +import javax.persistence.DiscriminatorColumn; +import javax.persistence.Entity; +import javax.persistence.Inheritance; +import javax.persistence.InheritanceType; + +@Entity +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(name = "kind") +public class VirtualBaseInherit extends AbstractVirtualBase { + + private String data; + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension1.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension1.java new file mode 100644 index 0000000000..fbf1f11685 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension1.java @@ -0,0 +1,31 @@ +package org.tests.model.virtualprop.ext; + +import io.ebean.bean.NotEnhancedException; +import io.ebean.bean.extend.EntityExtension; +import org.tests.model.virtualprop.AbstractVirtualBase; + +/** + * This class will add the field 'ext' to 'VirtualBaseA' by EntityExtension + */ +@EntityExtension(AbstractVirtualBase.class) +public class Extension1 { + + + public static String foo() { + return "foo"; + } + + private String ext; + + public String getExt() { + return ext; + } + + public void setExt(String ext) { + this.ext = ext; + } + + public static Extension1 get(AbstractVirtualBase base) { + throw new NotEnhancedException(); + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension2.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension2.java new file mode 100644 index 0000000000..0681c3f5b2 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension2.java @@ -0,0 +1,32 @@ +package org.tests.model.virtualprop.ext; + +import io.ebean.bean.NotEnhancedException; +import io.ebean.bean.extend.EntityExtension; +import org.tests.model.virtualprop.VirtualBase; + +import javax.persistence.JoinTable; +import javax.persistence.ManyToMany; +import java.util.List; + +/** + * This class will add the fields 'virtualExtendManyToManys' to 'AbstractVirtualBase' by EntityExtension + */ +@EntityExtension(VirtualBase.class) +public class Extension2 { + + public static String foo() { + return "foo"; + } + + @ManyToMany + @JoinTable(name = "kreuztabelle") + private List virtualExtendManyToManys; + + public List getVirtualExtendManyToManys() { + return virtualExtendManyToManys; + } + + public static Extension2 get(VirtualBase found) { + throw new NotEnhancedException(); + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension3.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension3.java new file mode 100644 index 0000000000..2f0826b303 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension3.java @@ -0,0 +1,45 @@ +package org.tests.model.virtualprop.ext; + +import io.ebean.annotation.Formula; +import io.ebean.bean.NotEnhancedException; +import io.ebean.bean.extend.EntityExtension; +import org.tests.model.virtualprop.VirtualBase; + +import javax.persistence.OneToOne; + +/** + * This class will add the fields 'virtualExtendOne' and 'firstName' to 'VirtualBase' by EntityExtension + */ +@EntityExtension(VirtualBase.class) +public class Extension3 { + + public static String foo() { + return "foo"; + } + + @OneToOne(mappedBy = "base") + private VirtualExtendOne virtualExtendOne; + + @Formula(select = "concat('Your name is ', ${ta}.data)") + private String firstName; + + public static Extension3 get(VirtualBase found) { + throw new NotEnhancedException(); + } + + public VirtualExtendOne getVirtualExtendOne() { + return virtualExtendOne; + } + + public void setVirtualExtendOne(VirtualExtendOne virtualExtendOne) { + this.virtualExtendOne = virtualExtendOne; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension4.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension4.java new file mode 100644 index 0000000000..8b8ee66cbc --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension4.java @@ -0,0 +1,26 @@ +package org.tests.model.virtualprop.ext; + +import io.ebean.bean.NotEnhancedException; +import io.ebean.bean.extend.EntityExtension; +import org.tests.model.virtualprop.VirtualBaseA; + +/** + * This class will add the field 'ext' to 'VirtualBaseA' by EntityExtension + */ +@EntityExtension(VirtualBaseA.class) +public class Extension4 { + + private String extA; + + public String getExtA() { + return extA; + } + + public void setExtA(String extA) { + this.extA = extA; + } + + public static Extension4 get(VirtualBaseA base) { + throw new NotEnhancedException(); + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension5.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension5.java new file mode 100644 index 0000000000..4f7be500e5 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension5.java @@ -0,0 +1,23 @@ +package org.tests.model.virtualprop.ext; + +import io.ebean.bean.NotEnhancedException; +import io.ebean.bean.extend.EntityExtension; +import org.tests.model.virtualprop.VirtualBaseA; + +import javax.persistence.OneToMany; +import java.util.ArrayList; +import java.util.List; + +/** + * This class will add the field 'ext' to 'VirtualBaseA' by EntityExtension + */ +@EntityExtension(VirtualBaseA.class) +public class Extension5 { + + @OneToMany + private List virtualExtends = new ArrayList<>(); + + public static Extension5 get(VirtualBaseA base) { + throw new NotEnhancedException(); + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension6.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension6.java new file mode 100644 index 0000000000..b96c49e50a --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension6.java @@ -0,0 +1,31 @@ +package org.tests.model.virtualprop.ext; + +import io.ebean.annotation.DbJson; +import io.ebean.bean.NotEnhancedException; +import io.ebean.bean.extend.EntityExtension; +import org.tests.model.virtualprop.VirtualBaseA; + +import java.util.LinkedHashSet; +import java.util.Set; + +/** + * This class will add the field 'nums' to 'VirtualBaseA' by EntityExtension + */ +@EntityExtension(VirtualBaseA.class) +public class Extension6 { + + @DbJson + private Set nums = new LinkedHashSet<>(); + + public Set getNums() { + return nums; + } + + public void setNums(Set nums) { + this.nums = nums; + } + + public static Extension6 get(VirtualBaseA base) { + throw new NotEnhancedException(); + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/TestVirtualProps.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/TestVirtualProps.java new file mode 100644 index 0000000000..40398e2e6b --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/TestVirtualProps.java @@ -0,0 +1,190 @@ +package org.tests.model.virtualprop.ext; + +import io.ebean.DB; +import io.ebean.Database; +import io.ebean.bean.EntityBean; +import io.ebean.plugin.BeanType; +import io.ebean.test.LoggedSql; +import io.ebeaninternal.server.deploy.BeanProperty; +import org.junit.jupiter.api.Test; +import org.tests.model.virtualprop.AbstractVirtualBase; +import org.tests.model.virtualprop.VirtualBase; +import org.tests.model.virtualprop.VirtualBaseA; + +import java.lang.reflect.Field; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + + +/** + * Demo, how to use virtual properties. Note: that there is + * + * @author Roland Praml, FOCONIS AG + */ +public class TestVirtualProps { + + // must be called BEFORE DB-Init. + static String e2 = Extension3.foo() + Extension2.foo() + Extension1.foo(); + static Database db = DB.getDefault(); + + /* + private static Database createDb() { + DatabaseConfig config = new DatabaseConfig(); + config.setName("h2"); + config.loadFromProperties(); + config.setDdlExtra(false); + config.setPackages(List.of("org.tests.model.virtualprop")); + return DatabaseFactory.create(config); + }*/ + + @Test + void testCreate() throws NoSuchFieldException, IllegalAccessException { + System.out.println(e2); + //DB.getDefault(); // Init database to start parser + VirtualBase base = new VirtualBase(); + base.setData("Foo"); + + db.save(base); + + Field f = AbstractVirtualBase.class.getDeclaredField("_ebean_extension_storage"); + f.setAccessible(true); + EntityBean[] extension_storage = (EntityBean[]) f.get(base); + assertThat(extension_storage[0]).isInstanceOf(Extension1.class); + assertThat(extension_storage[1]).isInstanceOf(Extension2.class); + assertThat(extension_storage[2]).isInstanceOf(Extension3.class); + + VirtualBase found = db.find(VirtualBase.class).where().isNull("virtualExtendOne").findOne(); + assertThat(found).isNotNull(); + + found = db.find(VirtualBase.class).where().isNotNull("virtualExtendOne").findOne(); + assertThat(found).isNull(); + + BeanType bt = db.pluginApi().beanType(VirtualBase.class); + BeanProperty prop = (BeanProperty) bt.property("virtualExtendOne"); + + + found = db.find(VirtualBase.class).where().isNull("virtualExtendOne").findOne(); + VirtualExtendOne ext = new VirtualExtendOne(); + ext.setData("bar"); + + prop.pathSet(found, ext); + db.save(found); + + Extension3 other = Extension3.get(found); + assertThat(other.getVirtualExtendOne().getData()).isEqualTo("bar"); + other.setFirstName("test"); + + Extension2 many = Extension2.get(found); + assertThat(many.getVirtualExtendManyToManys()).isEmpty(); + other.getVirtualExtendOne().setData("faz"); + db.save(found); + + found = db.find(VirtualBase.class).where().eq("virtualExtendOne.data", "faz").findOne(); + assertThat(found).isNotNull(); + + List attr = db.find(VirtualBase.class).fetch("virtualExtendOne", "data").findSingleAttributeList(); + assertThat(attr).containsExactly("faz"); + + attr = db.find(VirtualBase.class).select("firstName").findSingleAttributeList(); + assertThat(attr).containsExactly("Your name is Foo"); + VirtualExtendOne oneFound = (VirtualExtendOne) prop.pathGet(found); + assertThat(oneFound.getData()).isEqualTo("faz"); + + db.delete(oneFound); // cleanup + } + + @Test + void testCreateMany() { + + VirtualBase base1 = new VirtualBase(); + base1.setData("Foo"); + db.save(base1); + + VirtualBase base2 = new VirtualBase(); + base2.setData("Bar"); + db.save(base2); + + VirtualExtendManyToMany many1 = new VirtualExtendManyToMany(); + many1.setData("Alex"); + db.save(many1); + + VirtualExtendManyToMany many2 = new VirtualExtendManyToMany(); + many2.setData("Roland"); + db.save(many2); + + BeanType bt = db.pluginApi().beanType(VirtualBase.class); + BeanProperty prop = (BeanProperty) bt.property("virtualExtendManyToManys"); + List list = (List) prop.pathGet(base1); + assertThat(list).isEmpty(); + list.add(many1); + LoggedSql.start(); + db.save(base1); + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + assertThat(sql.get(0)).contains("insert into kreuztabelle (virtual_base_id, virtual_extend_many_to_many_id) values (?, ?)"); + assertThat(sql.get(1)).contains("-- bind"); + + many2.getBases().add(base1); + LoggedSql.start(); + db.save(many2); + sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + + + LoggedSql.start(); + VirtualBase found = db.find(VirtualBase.class, base1.getId()); + list = (List) prop.pathGet(found); + assertThat(list).hasSize(2).containsExactlyInAnyOrder(many1, many2); + sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); +// assertThat(sql.get(0)).contains("select t0.id, t0.data, concat('Your name is ', t0.data), t1.id from virtual_base t0 left join virtual_extend_one t1 on t1.id = t0.id where t0.id = ?"); + assertThat(sql.get(1)).startsWith("select int_.virtual_base_id, t0.id, t0.data from virtual_extend_many_to_many t0 left join kreuztabelle int_ on int_.virtual_extend_many_to_many_id = t0.id where (int_.virtual_base_id) "); + DB.find(VirtualBase.class).delete(); + DB.find(VirtualExtendManyToMany.class).delete(); + } + + @Test + void testCreateDelete() { + + VirtualBase base = new VirtualBase(); + base.setData("Master"); + db.save(base); + + VirtualExtendOne extendOne = new VirtualExtendOne(); + extendOne.setBase(base); + extendOne.setData("Extended"); + db.save(extendOne); + + VirtualBase found = db.find(VirtualBase.class, base.getId()); + + LoggedSql.start(); + db.delete(found); + List sql = LoggedSql.stop(); + + assertThat(sql).hasSize(3); + assertThat(sql.get(0)).contains("delete from virtual_extend_one where id = ?"); // delete OneToOne - why 'id=?' and not 'id = ?' + assertThat(sql.get(1)).contains("delete from kreuztabelle where virtual_base_id = ?"); // intersection table + assertThat(sql.get(2)).contains("delete from virtual_base where id=?"); // delete entity itself + + } + + @Test + void testInheritance() { + + VirtualBaseA base = new VirtualBaseA(); + base.setData("Master"); + Extension1.get(base).setExt("ext"); + //db.save(base); + + Extension4.get(base).setExtA("extA"); + db.save(base); + + LoggedSql.start(); + VirtualBaseA found = db.find(VirtualBaseA.class).where().eq("extA", "extA").findOne(); + List sql = LoggedSql.stop(); + + assertThat(sql).hasSize(1); + assertThat(sql.get(0)).contains("select t0.kind, t0.id, t0.data, t0.num, t0.ext, t0.ext_a, t0.nums from virtual_base_inherit t0 where t0.kind = 'A' and t0.ext_a = ?"); + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualAExtendOne.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualAExtendOne.java new file mode 100644 index 0000000000..6bc41a156a --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualAExtendOne.java @@ -0,0 +1,44 @@ +package org.tests.model.virtualprop.ext; + +import org.tests.model.virtualprop.VirtualBaseA; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; + +@Entity +public class VirtualAExtendOne { + + @Id + private int id; + + private String data; + + @ManyToOne + private VirtualBaseA base; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public VirtualBaseA getBase() { + return base; + } + + public void setBase(VirtualBaseA base) { + this.base = base; + this.id = base == null ? 0 : base.getId(); + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendManyToMany.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendManyToMany.java new file mode 100644 index 0000000000..ae0573e1b2 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendManyToMany.java @@ -0,0 +1,43 @@ +package org.tests.model.virtualprop.ext; + +import org.tests.model.virtualprop.VirtualBase; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToMany; +import java.util.List; + +@Entity +public class VirtualExtendManyToMany { + @Id + private int id; + + private String data; + + @ManyToMany(mappedBy = "virtualExtendManyToManys") + private List bases; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public List getBases() { + return bases; + } + + public void setBases(List bases) { + this.bases = bases; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendOne.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendOne.java new file mode 100644 index 0000000000..28c16e4ba6 --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendOne.java @@ -0,0 +1,46 @@ +package org.tests.model.virtualprop.ext; + +import org.tests.model.virtualprop.VirtualBase; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.OneToOne; +import javax.persistence.PrimaryKeyJoinColumn; + +@Entity +public class VirtualExtendOne { + + @Id + private int id; + + private String data; + + @PrimaryKeyJoinColumn + @OneToOne(optional = false) + private VirtualBase base; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getData() { + return data; + } + + public void setData(String data) { + this.data = data; + } + + public VirtualBase getBase() { + return base; + } + + public void setBase(VirtualBase base) { + this.base = base; + this.id = base == null ? 0 : base.getId(); + } +} diff --git a/pom.xml b/pom.xml index 51c82d6d39..047a36bc4c 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 13.9.0 7.1 8.6 - 13.20.1 + 13.20.1-FOC1 13.20.1 false @@ -96,6 +96,66 @@ + + foconis + + true + + + + foconis-release + FOCONIS Release Repository + https://mvnrepo.foconis.de/repository/release/ + + + foconis-snapshot + FOCONIS Snapshot Repository + https://mvnrepo.foconis.de/repository/snapshot/ + + + + + foconis-release + https://mvnrepo.foconis.de/repository/release/ + + + foconis-snapshot + https://mvnrepo.foconis.de/repository/snapshot/ + + + + + foconis-release + https://mvnrepo.foconis.de/repository/release/ + + + foconis-snapshot + https://mvnrepo.foconis.de/repository/snapshot/ + + + + + github + + + github-release + FOCONIS Github Release Repository + https://maven.pkg.github.com/foconis/ebean + + + + + github-release + https://maven.pkg.github.com/foconis/ebean-agent + + + + + github-release + https://maven.pkg.github.com/foconis/ebean-agent + + + central From 61efc543a376c5a70910b9ad7b3a8b964844cf73 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 16:09:08 +0200 Subject: [PATCH 025/123] NOPR - NEW: MergeBeans function instead of updating existing bean from json --- .../main/java/io/ebean/BeanMergeOptions.java | 126 ++++++++++++ ebean-api/src/main/java/io/ebean/DB.java | 5 +- .../src/main/java/io/ebean/Database.java | 6 + .../java/io/ebean/bean/BeanCollection.java | 10 +- .../main/java/io/ebean/common/BeanList.java | 5 +- .../main/java/io/ebean/common/BeanMap.java | 5 +- .../main/java/io/ebean/common/BeanSet.java | 5 +- .../io/ebean/text/json/JsonBeanReader.java | 11 +- .../java/io/ebean/text/json/JsonContext.java | 13 ++ .../ebeaninternal/api/json/SpiJsonReader.java | 1 - .../server/core/DefaultServer.java | 6 + .../server/deploy/BeanDescriptor.java | 38 ++-- .../deploy/BeanDescriptorElementEmbedded.java | 8 +- .../BeanDescriptorElementEmbeddedMap.java | 4 +- .../server/deploy/BeanDescriptorJsonHelp.java | 26 +-- .../server/deploy/BeanMergeHelp.java | 192 ++++++++++++++++++ .../server/deploy/BeanProperty.java | 18 +- .../server/deploy/BeanPropertyAssocMany.java | 110 ++++------ .../deploy/BeanPropertyAssocManyJsonHelp.java | 7 +- .../server/deploy/BeanPropertyAssocOne.java | 42 ++-- .../deploy/BeanPropertySimpleCollection.java | 2 +- .../server/json/DJsonBeanReader.java | 4 +- .../server/json/DJsonContext.java | 52 ++--- .../ebeaninternal/server/json/ReadJson.java | 25 +-- .../ebeaninternal/server/query/STreeType.java | 2 +- .../server/query/SqlTreeLoadBean.java | 2 +- .../server/deploy/BeanDescriptorTest.java | 2 +- .../xtest/internal/api/TDSpiEbeanServer.java | 6 + .../ebean/xtest/internal/api/TDSpiServer.java | 6 + .../java/org/tests/model/basic/Customer.java | 2 +- .../json/TestJsonBeanDescriptorParse.java | 120 +++++++++-- .../text/json/TestTextJsonInheritance.java | 77 ++++++- 32 files changed, 702 insertions(+), 236 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/BeanMergeOptions.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMergeHelp.java diff --git a/ebean-api/src/main/java/io/ebean/BeanMergeOptions.java b/ebean-api/src/main/java/io/ebean/BeanMergeOptions.java new file mode 100644 index 0000000000..daa8dd2657 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/BeanMergeOptions.java @@ -0,0 +1,126 @@ +package io.ebean; + +import io.ebean.bean.PersistenceContext; +import io.ebean.plugin.Property; + +/** + * Merge options, when merging two beans. You can fine tune, how the merge should happen. + * For example you can exclude some special properties or write your custom merge handler. + * + * @author Roland Praml, FOCONIS AG + */ +public class BeanMergeOptions { + + /** + * Interface to write your own merge handler. + * + * @param + */ + @FunctionalInterface + public interface MergeHandler { + /** + * The new bean and the existing is passed. Together with property + * and path, you can decide, if you want to continue with merge or not. + */ + boolean mergeBeans(T bean, T existing, Property property, String path); + + } + + private PersistenceContext persistenceContext; + + private MergeHandler mergeHandler; + + private boolean mergeId = true; + + private boolean mergeVersion = false; + + private boolean clearCollections = true; + + private boolean addExistingToPersistenceContext = true; + + /** + * Return the persistence context, that is used during merge. + * If no one is specified, the persistence context of the bean will be used + */ + public PersistenceContext getPersistenceContext() { + return persistenceContext; + } + + /** + * Sets the persistence context, that is used during merge. + * * If no one is specified, the persistence context of the bean will be used + */ + public void setPersistenceContext(PersistenceContext persistenceContext) { + this.persistenceContext = persistenceContext; + } + + /** + * Returns the merge handler, if you want to do special handling for some properties. + */ + public MergeHandler getMergeHandler() { + return mergeHandler; + } + + /** + * Sets the merge handler, if you want to do special handling for some properties. + */ + public void setMergeHandler(MergeHandler mergeHandler) { + this.mergeHandler = mergeHandler; + } + + /** + * Returns if we should merge the ID property (default=true). + */ + public boolean isMergeId() { + return mergeId; + } + + /** + * Should we merge the ID property (default=true). + */ + public void setMergeId(boolean mergeId) { + this.mergeId = mergeId; + } + + /** + * Returns if we should merge the version property (default=false). + */ + public boolean isMergeVersion() { + return mergeVersion; + } + + /** + * Should we merge the version property (default=false). + */ + public void setMergeVersion(boolean mergeVersion) { + this.mergeVersion = mergeVersion; + } + + /** + * Returns if we should clear/replace beanCollections (default=true). + */ + public boolean isClearCollections() { + return clearCollections; + } + + /** + * Should we clear/replace beanCollections (default=true). + */ + public void setClearCollections(boolean clearCollections) { + this.clearCollections = clearCollections; + } + + /** + * Returns if we should add existing beans to the persistenceContext (default=true). + */ + public boolean isAddExistingToPersistenceContext() { + return addExistingToPersistenceContext; + } + + /** + * Should we add existing beans to the persistenceContext (default=true). + */ + public void setAddExistingToPersistenceContext(boolean addExistingToPersistenceContext) { + this.addExistingToPersistenceContext = addExistingToPersistenceContext; + } +} diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index 4109291fd0..d885fb5150 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -9,10 +9,7 @@ import javax.persistence.OptimisticLockException; import javax.persistence.PersistenceException; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.concurrent.Callable; /** diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index c61c60a7ef..710cfb7caa 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -1204,6 +1204,12 @@ default Set checkUniqueness(Object bean, Transaction transaction) { */ void merge(Object bean, MergeOptions options, Transaction transaction); + /** + * Merges two beans (without saving them). All modified properties from bean are copied to existing. + * Returns existing bean. If null is passed, a new instance of bean is retuned. + */ + T mergeBeans(T bean, T existing, BeanMergeOptions options); + /** * Insert the bean. *

diff --git a/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java b/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java index 4c07e9da45..dcb002266f 100644 --- a/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java +++ b/ebean-api/src/main/java/io/ebean/bean/BeanCollection.java @@ -162,8 +162,11 @@ enum ModifyListenMode { *

* For maps this returns the entrySet as we need the keys of the map. */ - Collection actualEntries(); + Collection actualEntries(boolean load); + default Collection actualEntries() { + return actualEntries(false); + } /** * Returns entries, that were lazily added at the end of the list. Might be null. */ @@ -247,4 +250,9 @@ default Collection getLazyAddedEntries(boolean reset) { * Return a shallow copy of this collection that is modifiable. */ BeanCollection shallowCopy(); + + /** + * Clears the underlying collection. + */ + void clear(); } diff --git a/ebean-api/src/main/java/io/ebean/common/BeanList.java b/ebean-api/src/main/java/io/ebean/common/BeanList.java index a1ecb1d4ec..8fa03659fb 100644 --- a/ebean-api/src/main/java/io/ebean/common/BeanList.java +++ b/ebean-api/src/main/java/io/ebean/common/BeanList.java @@ -164,7 +164,10 @@ public Collection actualDetails() { } @Override - public Collection actualEntries() { + public Collection actualEntries(boolean load) { + if (load) { + init(); + } return list; } diff --git a/ebean-api/src/main/java/io/ebean/common/BeanMap.java b/ebean-api/src/main/java/io/ebean/common/BeanMap.java index fe959c22c0..d1c5801e38 100644 --- a/ebean-api/src/main/java/io/ebean/common/BeanMap.java +++ b/ebean-api/src/main/java/io/ebean/common/BeanMap.java @@ -187,7 +187,10 @@ public Collection actualDetails() { * Returns the map entrySet. */ @Override - public Collection actualEntries() { + public Collection actualEntries(boolean load) { + if (load) { + init(); + } return map.entrySet(); } diff --git a/ebean-api/src/main/java/io/ebean/common/BeanSet.java b/ebean-api/src/main/java/io/ebean/common/BeanSet.java index 81d72284b8..05451657f4 100644 --- a/ebean-api/src/main/java/io/ebean/common/BeanSet.java +++ b/ebean-api/src/main/java/io/ebean/common/BeanSet.java @@ -165,7 +165,10 @@ public Collection actualDetails() { } @Override - public Collection actualEntries() { + public Collection actualEntries(boolean load) { + if (load) { + init(); + } return set; } diff --git a/ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java b/ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java index 935b788600..7acdb976f1 100644 --- a/ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java +++ b/ebean-api/src/main/java/io/ebean/text/json/JsonBeanReader.java @@ -12,18 +12,11 @@ */ public interface JsonBeanReader { - /** - * Read the JSON into given bean. Will update existing properties. - */ - T read(T target); - /** * Read the JSON returning a bean. */ - default T read() { - return read(null); - } - + T read(); + /** * Create a new reader taking the context from the existing one but using a new JsonParser. */ diff --git a/ebean-api/src/main/java/io/ebean/text/json/JsonContext.java b/ebean-api/src/main/java/io/ebean/text/json/JsonContext.java index d2c0df822b..3c31f11667 100644 --- a/ebean-api/src/main/java/io/ebean/text/json/JsonContext.java +++ b/ebean-api/src/main/java/io/ebean/text/json/JsonContext.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; +import io.ebean.BeanMergeOptions; import io.ebean.FetchPath; import io.ebean.plugin.BeanType; @@ -64,7 +65,9 @@ public interface JsonContext { * instances, so the object identity will not be preserved here. * * @throws JsonIOException When IOException occurs + * @deprecated use {@link #toBean(Class, JsonParser)} and {@link io.ebean.Database#mergeBeans(Object, Object, BeanMergeOptions)} */ + @Deprecated void toBean(T target, JsonParser parser) throws JsonIOException; /** @@ -72,7 +75,9 @@ public interface JsonContext { * See {@link #toBean(Class, JsonParser)} for details modified. * * @throws JsonIOException When IOException occurs + * @deprecated use {@link #toBean(Class, JsonParser, JsonReadOptions)} and {@link io.ebean.Database#mergeBeans(Object, Object, BeanMergeOptions)} */ + @Deprecated void toBean(T target, JsonParser parser, JsonReadOptions options) throws JsonIOException; /** @@ -80,7 +85,9 @@ public interface JsonContext { * See {@link #toBean(Class, JsonParser)} for details * * @throws JsonIOException When IOException occurs + * @deprecated use {@link #toBean(Class, Reader)} and {@link io.ebean.Database#mergeBeans(Object, Object, BeanMergeOptions)} */ + @Deprecated void toBean(T target, Reader json) throws JsonIOException; /** @@ -88,7 +95,9 @@ public interface JsonContext { * See {@link #toBean(Class, JsonParser)} for details modified. * * @throws JsonIOException When IOException occurs + * @deprecated use {@link #toBean(Class, Reader, JsonReadOptions)} and {@link io.ebean.Database#mergeBeans(Object, Object, BeanMergeOptions)} */ + @Deprecated void toBean(T target, Reader json, JsonReadOptions options) throws JsonIOException; /** @@ -96,7 +105,9 @@ public interface JsonContext { * See {@link #toBean(Class, JsonParser)} for details * * @throws JsonIOException When IOException occurs + * @deprecated use {@link #toBean(Class, String)} and {@link io.ebean.Database#mergeBeans(Object, Object, BeanMergeOptions)} */ + @Deprecated void toBean(T target, String json) throws JsonIOException; /** @@ -104,7 +115,9 @@ public interface JsonContext { * See {@link #toBean(Class, JsonParser)} for details * * @throws JsonIOException When IOException occurs + * @deprecated use {@link #toBean(Class, String, JsonReadOptions)} and {@link io.ebean.Database#mergeBeans(Object, Object, BeanMergeOptions)} */ + @Deprecated void toBean(T target, String json, JsonReadOptions options) throws JsonIOException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java b/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java index 613b105cc6..4ed612defc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/json/SpiJsonReader.java @@ -34,5 +34,4 @@ public interface SpiJsonReader { Object readValueUsingObjectMapper(Class propertyType) throws IOException; - boolean update(); } 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 c838cbd34c..31f7ad7b6d 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 @@ -824,6 +824,12 @@ public void merge(Object bean, MergeOptions options, @Nullable Transaction trans executeInTrans((txn) -> persister.merge(desc, checkEntityBean(bean), options, txn), transaction); } + @Override + public T mergeBeans(T bean, T existing, BeanMergeOptions options) { + BeanDescriptor desc = desc(bean.getClass()); + return (T) desc.mergeBeans(checkEntityBean(bean), (EntityBean) existing, options); + } + @Override public void lock(Object bean) { BeanDescriptor desc = desc(bean.getClass()); 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 d138861a9f..e302571e83 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 @@ -708,22 +708,15 @@ public void metricPersistNoBatch(PersistRequest.Type type, long startNanos) { iudMetrics.addNoBatch(type, startNanos); } - public void merge(EntityBean bean, EntityBean existing) { - EntityBeanIntercept fromEbi = bean._ebean_getIntercept(); - EntityBeanIntercept toEbi = existing._ebean_getIntercept(); - int propertyLength = toEbi.propertyLength(); - String[] names = properties(); - for (int i = 0; i < propertyLength; i++) { - if (fromEbi.isLoadedProperty(i)) { - BeanProperty property = beanProperty(names[i]); - if (!toEbi.isLoadedProperty(i)) { - Object val = property.getValue(bean); - property.setValue(existing, val); - } else if (property.isMany()) { - property.merge(bean, existing); - } - } + /** + * Copies all modified fields from bean to existing. + * It returns normally the existing bean (or a new instance, if it was null) + */ + public EntityBean mergeBeans(EntityBean bean, EntityBean existing, BeanMergeOptions options) { + if (existing == null) { + existing = createEntityBean(); } + return new BeanMergeHelp(existing, options).mergeBeans(this, bean, existing); } /** @@ -1781,7 +1774,7 @@ public EntityBean createEntityBeanForJson() { /** * We actually need to do a query because we don't know the type without the discriminator value. */ - private T findReferenceBean(Object id, PersistenceContext pc) { + public T findReferenceBean(Object id, PersistenceContext pc) { DefaultOrmQuery query = new DefaultOrmQuery<>(this, ebeanServer, ebeanServer.expressionFactory()); query.setPersistenceContext(pc); return query.setId(id).findOne(); @@ -2051,8 +2044,8 @@ public void contextPut(PersistenceContext pc, Object id, Object bean) { * Put the bean into the persistence context if it is absent. */ @Override - public Object contextPutIfAbsent(PersistenceContext pc, Object id, EntityBean localBean) { - return pc.putIfAbsent(rootBeanType, id, localBean); + public EntityBean contextPutIfAbsent(PersistenceContext pc, Object id, EntityBean localBean) { + return (EntityBean) pc.putIfAbsent(rootBeanType, id, localBean); } /** @@ -3398,12 +3391,13 @@ void jsonWriteProperties(SpiJsonWriter writeJson, EntityBean bean) { jsonHelp.jsonWriteProperties(writeJson, bean); } - public T jsonRead(SpiJsonReader jsonRead, String path, T target) throws IOException { - return jsonHelp.jsonRead(jsonRead, path, true, target); + public T jsonRead(SpiJsonReader jsonRead, String path) throws IOException { + return jsonHelp.jsonRead(jsonRead, path, true); } - T jsonReadObject(SpiJsonReader jsonRead, String path, T target) throws IOException { - return jsonHelp.jsonRead(jsonRead, path, false, target); + + T jsonReadObject(SpiJsonReader jsonRead, String path) throws IOException { + return jsonHelp.jsonRead(jsonRead, path, false); } public List uniqueProps() { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java index 71d79b9dce..6a4517fd72 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbedded.java @@ -61,13 +61,13 @@ public void jsonWriteElement(SpiJsonWriter ctx, Object element) { } @Override - public T jsonRead(SpiJsonReader jsonRead, String path, T target) throws IOException { - return readJsonElement(jsonRead, path, target); + public T jsonRead(SpiJsonReader jsonRead, String path) throws IOException { + return readJsonElement(jsonRead, path); } @SuppressWarnings("unchecked") - T readJsonElement(SpiJsonReader jsonRead, String path, T target) throws IOException { - return (T)targetDescriptor.jsonRead(jsonRead, path, target); + T readJsonElement(SpiJsonReader jsonRead, String path) throws IOException { + return (T)targetDescriptor.jsonRead(jsonRead, path); } void writeJsonElement(SpiJsonWriter ctx, Object element) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java index ecb283e5c2..2021a43cc9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorElementEmbeddedMap.java @@ -58,13 +58,13 @@ public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) } if (stringKey) { parser.nextToken(); - Object val = readJsonElement(readJson, null, null); // CHECKME: Update existing map entry here? + Object val = readJsonElement(readJson, null); add.addKeyValue(fieldName, val); } else { parser.nextFieldName(); Object key = scalarTypeKey.jsonRead(parser); parser.nextFieldName(); - Object val = readJsonElement(readJson, null, null); // CHECKME: Update existing map entry here? + Object val = readJsonElement(readJson, null); add.addKeyValue(key, val); } } while (true); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java index 720ef92caa..31c5e787b2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java @@ -65,7 +65,7 @@ void jsonWriteDirtyProperties(SpiJsonWriter writeJson, EntityBean bean, boolean[ } @SuppressWarnings("unchecked") - T jsonRead(SpiJsonReader jsonRead, String path, boolean withInheritance, T target) throws IOException { + T jsonRead(SpiJsonReader jsonRead, String path, boolean withInheritance) throws IOException { JsonParser parser = jsonRead.parser(); //noinspection StatementWithEmptyBody if (parser.getCurrentToken() == JsonToken.START_OBJECT) { @@ -82,7 +82,7 @@ T jsonRead(SpiJsonReader jsonRead, String path, boolean withInheritance, T targe } if (desc.inheritInfo == null || !withInheritance) { - return jsonReadObject(jsonRead, path, target); + return jsonReadObject(jsonRead, path); } ObjectNode node = jsonRead.mapper().readTree(parser); @@ -97,25 +97,18 @@ T jsonRead(SpiJsonReader jsonRead, String path, boolean withInheritance, T targe JsonNode discNode = node.get(discColumn); if (discNode == null || discNode.isNull()) { if (!desc.isAbstractType()) { - return desc.jsonReadObject(newReader, path, target); + return desc.jsonReadObject(newReader, path); } String msg = "Error reading inheritance discriminator - expected [" + discColumn + "] but no json key?"; throw new JsonParseException(newParser, msg, parser.getCurrentLocation()); } BeanDescriptor inheritDesc = (BeanDescriptor) inheritInfo.readType(discNode.asText()).desc(); - return inheritDesc.jsonReadObject(newReader, path, target); + return inheritDesc.jsonReadObject(newReader, path); } - private T jsonReadObject(SpiJsonReader readJson, String path, T target) throws IOException { - EntityBean bean; - if (target == null) { - bean = desc.createEntityBeanForJson(); - } else if (desc.beanType.isInstance(target)) { - bean = (EntityBean) target; - } else { - throw new ClassCastException(target.getClass().getName() + " provided, but " + desc.beanType.getClass().getName() + " expected"); - } + private T jsonReadObject(SpiJsonReader readJson, String path) throws IOException { + EntityBean bean = desc.createEntityBeanForJson(); return jsonReadProperties(readJson, bean, path); } @@ -133,12 +126,7 @@ private T jsonReadProperties(SpiJsonReader readJson, EntityBean bean, String pat String key = parser.getCurrentName(); BeanProperty p = desc.beanProperty(key); if (p != null) { - if (p.isVersion() && readJson.update() ) { - // skip version prop during update - p.jsonRead(readJson); - } else { - p.jsonRead(readJson, bean); - } + p.jsonRead(readJson, bean); } else { // read an unmapped property if (unmappedProperties == null) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMergeHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMergeHelp.java new file mode 100644 index 0000000000..af187729cc --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanMergeHelp.java @@ -0,0 +1,192 @@ +package io.ebeaninternal.server.deploy; + +import io.ebean.BeanMergeOptions; +import io.ebean.bean.EntityBean; +import io.ebean.bean.PersistenceContext; +import io.ebeaninternal.server.json.PathStack; +import io.ebeaninternal.server.transaction.DefaultPersistenceContext; + +import java.util.IdentityHashMap; +import java.util.Map; + +import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero; + +/** + * Helper class to control the merge process of two beans. + *

+ * It holds the persistence context used during merge and various options to fine tune the merge. + * + * @author Roland Praml, FOCONIS AG + */ +class BeanMergeHelp { + + private static final Object DUMMY = new Object(); + private final PersistenceContext persistenceContext; + private final Map processedBeans = new IdentityHashMap<>(); + private final PathStack pathStack; + private final boolean mergeId; + private final boolean mergeVersion; + private final boolean clearCollections; + private final boolean addExistingToPersistenceContext; + private final BeanMergeOptions.MergeHandler mergeHandler; + + + public BeanMergeHelp(EntityBean rootBean, BeanMergeOptions options) { + this.persistenceContext = extractPersistenceContext(rootBean, options); + if (options == null) { + this.mergeHandler = null; + this.pathStack = null; + this.mergeId = true; + this.mergeVersion = false; + this.clearCollections = true; + this.addExistingToPersistenceContext = true; + } else { + this.mergeHandler = options.getMergeHandler(); + this.pathStack = mergeHandler == null ? null : new PathStack(); + this.mergeId = options.isMergeId(); + this.mergeVersion = options.isMergeVersion(); + this.clearCollections = options.isClearCollections(); + this.addExistingToPersistenceContext = true; + } + } + + private PersistenceContext extractPersistenceContext(EntityBean rootBean, BeanMergeOptions options) { + PersistenceContext pc = options == null ? null : options.getPersistenceContext(); + if (pc == null && rootBean != null) { + pc = rootBean._ebean_getIntercept().persistenceContext(); + } + if (pc == null) { + pc = new DefaultPersistenceContext(); + } + return pc; + } + + /** + * Returns, if this bean is already processed. This is to avoid cycles. Internally we use an IdentityHasnMap. + */ + private boolean processed(EntityBean bean) { + return processedBeans.put(bean, DUMMY) != null; + } + + /** + * The persistence context. + */ + public PersistenceContext persistenceContext() { + return persistenceContext; + } + + /** + * Should we add existing beans to the current persistence-context? + */ + public boolean addExistingToPersistenceContext() { + return addExistingToPersistenceContext; + } + + /** + * Add a given bean to the persistence-context. Returns the bean from the PC, + * if it was already there. + */ + public EntityBean contextPutExisting(BeanDescriptor desc, EntityBean bean) { + if (bean == null || !addExistingToPersistenceContext) { + return null; + } + Object id = desc.id(bean); + if (!isNullOrZero(id)) { + return desc.contextPutIfAbsent(persistenceContext, id, bean); + } + return null; + } + + public EntityBean contextGet(BeanDescriptor desc, EntityBean bean) { + if (bean == null) { + return null; + } + Object id = desc.id(bean); + if (!isNullOrZero(id)) { + return (EntityBean) desc.contextGet(persistenceContext, id); + } + return null; + } + + /** + * Checks, if we shold merge that property. + */ + boolean checkMerge(BeanProperty property, EntityBean bean, EntityBean existing) { + if (!bean._ebean_getIntercept().isLoadedProperty(property.propertyIndex())) { + return false; + } + if (property.isId() && !mergeId) { + return false; + } + if (property.isVersion() && !mergeVersion) { + return false; + } + return mergeHandler == null || mergeHandler.mergeBeans(bean, existing, property, pathStack.peekWithNull()); + + } + + public void pushPath(String name) { + if (pathStack != null) { + pathStack.pushPathKey(name); + } + } + + public void popPath() { + if (pathStack != null) { + pathStack.pop(); + } + } + + public boolean clearCollections() { + return clearCollections; + } + + /** + * Merges two beans. Returns the merge result. This is + *

    + *
  • null if bean was null
    • + *
  • context bean if found in context + *
  • existing if existing war not null
    • + *
  • new instance if existing was null
    • + *
+ */ + public EntityBean mergeBeans(BeanDescriptor desc, EntityBean bean, EntityBean existing) { + if (bean == null) { + return null; + } + Object id = desc.id(bean); + if (!isNullOrZero(id)) { + EntityBean contextBean = (EntityBean) desc.contextGet(persistenceContext, id); + if (contextBean != null) { + existing = contextBean; + } + } + if (processed(bean)) { + return existing; + } + + if (desc.inheritInfo() != null) { + desc = desc.inheritInfo().readType(bean.getClass()).desc(); + } + + if (existing == null && !isNullOrZero(id)) { + if (desc.isReference(bean._ebean_getIntercept())) { + existing = (EntityBean) desc.createRef(id, persistenceContext); + } else { + // Now, we must hit the database and try to find the reference bean + existing = (EntityBean) desc.findReferenceBean(id, persistenceContext); + } + } + if (existing == null) { + existing = desc.createEntityBean(); + } + + for (BeanProperty prop : desc.propertiesAll()) { + if (checkMerge(prop, bean, existing)) { + prop.merge(bean, existing, this); + } + } + + return existing; + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index a3a013af59..752c246b99 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -1418,11 +1418,7 @@ private void jsonWriteScalar(SpiJsonWriter writeJson, Object value) throws IOExc public void jsonRead(SpiJsonReader ctx, EntityBean bean) throws IOException { Object objValue = jsonRead(ctx); if (jsonDeserialize) { - if (ctx.update()) { - setValueIntercept(bean, objValue); - } else { - setValue(bean, objValue); - } + setValue(bean, objValue); } } @@ -1487,8 +1483,16 @@ private boolean isKeywordType(DocPropertyType type, DocPropertyOptions docOption return type == DocPropertyType.TEXT && (docOptions.isCode() || id || discriminator); } - public void merge(EntityBean bean, EntityBean existing) { - // do nothing unless Many property + public void merge(EntityBean bean, EntityBean existing, BeanMergeHelp mergeHelp) { + if (isDiscriminator()) { + return; + } + Object val = getValue(bean); + if (val != null && scalarType != null && scalarType.mutable()) { + // for mutable types, we must "clone" the object. + val = scalarType.parse(scalarType.format(val)); + } + setValueIntercept(existing, val); } public void registerColumn(BeanDescriptor desc, String prefix) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 1ce1e7f2d8..07063c3c85 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -2,8 +2,6 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; import io.ebean.SqlUpdate; import io.ebean.Transaction; import io.ebean.bean.BeanCollection; @@ -29,7 +27,6 @@ import java.util.*; import static java.lang.System.Logger.Level.ERROR; -import static java.lang.System.Logger.Level.WARNING; /** * Property mapped to a List Set or Map. @@ -210,22 +207,47 @@ public Collection rawCollection(EntityBean bean) { * Copy collection value if existing is empty. */ @Override - public void merge(EntityBean bean, EntityBean existing) { + public void merge(EntityBean bean, EntityBean existing, BeanMergeHelp mergeHelp) { + mergeHelp.pushPath(name); + Object fromCollection = beanCollection(bean); Object existingCollection = getValue(existing); - if (existingCollection instanceof BeanCollection) { - BeanCollection toBC = (BeanCollection) existingCollection; - if (!toBC.isPopulated()) { - Object fromCollection = getValue(bean); - if (fromCollection instanceof BeanCollection) { - BeanCollection fromBC = (BeanCollection) fromCollection; - if (fromBC.isPopulated()) { - toBC.loadFrom(fromBC); + if (fromCollection instanceof BeanCollection) { + BeanCollection fromBC = (BeanCollection) fromCollection; + + if (fromBC.isPopulated()) { + BeanCollection toBC; + if (existingCollection instanceof BeanCollection) { + toBC = (BeanCollection) existingCollection; + if (mergeHelp.addExistingToPersistenceContext()) { + for (Object detailBean : toBC.actualEntries(true)) { + mergeHelp.contextPutExisting(targetDescriptor, (EntityBean) detailBean); + } + } + if (mergeHelp.clearCollections()) { + toBC.clear(); + } + } else { + toBC = createEmpty(existing); + setValueIntercept(existing, toBC); + } + + for (Object detailBean : fromBC.actualDetails()) { + if (detailBean instanceof EntityBean) { + EntityBean toBean = mergeHelp.mergeBeans(targetDescriptor, (EntityBean) detailBean, null); + if (childMasterProperty != null) { + childMasterProperty.setValue(toBean, existing); + } + toBC.addBean(toBean); } } } + } else { + setValueIntercept(existing, fromCollection); } + mergeHelp.popPath(); } + /** * Add the bean to the appropriate collection on the parent bean. */ @@ -1006,7 +1028,7 @@ private Object jsonReadCollection(String json) throws IOException { if (JsonToken.VALUE_NULL == event) { return null; } - return jsonReadCollection(ctx, null, null); + return jsonReadCollection(ctx, null); } /** @@ -1019,16 +1041,15 @@ private void jsonWriteCollection(SpiJsonWriter ctx, String name, Object value, b /** * Read the collection (JSON Array) containing entity beans. */ - public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean, Object targets) throws IOException { + public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException { if (elementDescriptor != null && elementDescriptor.isJsonReadCollection()) { return elementDescriptor.jsonReadCollection(readJson, parentBean); } BeanCollection collection = createEmpty(parentBean); BeanCollectionAdd add = beanCollectionAdd(collection); - Map existingBeans = extractBeans(targets); do { - EntityBean detailBean = getDetailBean(readJson, existingBeans); + EntityBean detailBean = (EntityBean) targetDescriptor.jsonRead(readJson, name); if (detailBean == null) { // read the entire array break; @@ -1043,63 +1064,6 @@ public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean, return collection; } - /** - * Find bean in the target collection and reuse it for JSON update. - */ - private EntityBean getDetailBean(SpiJsonReader readJson, Map targets) throws IOException { - BeanProperty idProperty = targetDescriptor.idProperty(); - if (targets == null || idProperty == null) { - return (EntityBean) targetDescriptor.jsonRead(readJson, name, null); - } else { - JsonToken token = readJson.parser().nextToken(); - if (JsonToken.VALUE_NULL == token || JsonToken.END_ARRAY == token) { - return null; - } - // extract the id. We have to buffer the JSON; - ObjectNode node = readJson.mapper().readTree(readJson.parser()); - SpiJsonReader jsonReader = readJson.forJson(node.traverse()); - JsonNode idNode = node.get(idProperty.name()); - Object id = idNode == null ? null : idProperty.jsonRead(readJson.forJson(idNode.traverse())); - return (EntityBean) targetDescriptor.jsonRead(jsonReader, name, targets.get(id)); - } - } - - /** - * Extract beans, that are currently in the target collection. (targets can be a List/Set/Map) - */ - private Map extractBeans(Object targets) { - Collection beans; - - if (targets == null) { - return null; - } else if (targets instanceof Map) { - if (((Map) targets).isEmpty()) { - return null; - } - beans = ((Map) targets).values(); - } else if (targets instanceof Collection) { - if (((Collection) targets).isEmpty()) { - return null; - } - beans = (Collection) targets; - } else { - CoreLog.log.log(WARNING, "Found non collection value " + targets.getClass().getSimpleName()); - return null; - } - - BeanProperty idProp = targetDescriptor.idProperty(); - Map ret = new HashMap<>(); - for (T bean : beans) { - if (bean instanceof EntityBean) { - Object id = idProp.getValue((EntityBean) bean); - if (id != null) { - ret.put(id, bean); - } - } - } - return ret.isEmpty() ? null : ret; - } - /** * Bind all the property values to the SqlUpdate. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java index 4bc7307fe0..707256eb2d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocManyJsonHelp.java @@ -50,11 +50,8 @@ public void jsonRead(SpiJsonReader readJson, EntityBean parentBean) throws IOExc if (JsonToken.START_ARRAY != event && JsonToken.START_OBJECT != event) { throw new JsonParseException(parser, "Unexpected token " + event + " - expecting start array or object"); } - if (readJson.update()) { - many.setValueIntercept(parentBean, many.jsonReadCollection(readJson, parentBean, many.getValue(parentBean))); - } else { - many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean, null)); - } + + many.setValue(parentBean, many.jsonReadCollection(readJson, parentBean)); } /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 1b99bb213e..44742cbb52 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -30,10 +30,9 @@ import javax.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; + +import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero; /** * Property mapped to a joined bean. @@ -811,22 +810,11 @@ public void jsonWrite(SpiJsonWriter writeJson, EntityBean bean) throws IOExcepti @Override public void jsonRead(SpiJsonReader readJson, EntityBean bean) throws IOException { if (jsonDeserialize && targetDescriptor != null) { - // CHECKME: may we skip reading the object from the json stream? - T target = readJson.update() ? (T) getValue(bean) : null; - T assocBean = targetDescriptor.jsonRead(readJson, name, target); - if (readJson.update()) { - setValueIntercept(bean, assocBean); - } else { - setValue(bean, assocBean); - } + T assocBean = targetDescriptor.jsonRead(readJson, name); + setValue(bean, assocBean); } } - @Override - public Object jsonRead(SpiJsonReader readJson) throws IOException { - return targetDescriptor.jsonRead(readJson, name, null); - } - public boolean isReference(Object detailBean) { EntityBean eb = (EntityBean) detailBean; return targetDescriptor.isReference(eb._ebean_getIntercept()); @@ -849,6 +837,26 @@ public void setParentBeanToChild(EntityBean parent, EntityBean child) { } } + @Override + public void merge(EntityBean bean, EntityBean existing, BeanMergeHelp mergeHelp) { + mergeHelp.pushPath(name); + + EntityBean beanValue = valueAsEntityBean(bean); + EntityBean existingValue = valueAsEntityBean(existing); + + if (beanValue != null && existingValue != null) { + Object beanId = targetDescriptor.id(beanValue); + Object existingId = targetDescriptor.id(existingValue); + if (!isNullOrZero(beanId) && !isNullOrZero(existingId) && !Objects.equals(beanId, existingId)) { + existingValue = null; + } + } + + setValueIntercept(existing, mergeHelp.mergeBeans(targetDescriptor, beanValue, existingValue)); + + mergeHelp.popPath(); + } + public boolean hasCircularImportedId(BeanDescriptor sourceDesc) { return targetDescriptor.hasCircularImportedIdTo(sourceDesc); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java index dc170974d7..2fbf41dcc7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertySimpleCollection.java @@ -19,7 +19,7 @@ public void bindElementValue(SqlUpdate insert, Object value) { } @Override - public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean, Object collectionValue) throws IOException { + public Object jsonReadCollection(SpiJsonReader readJson, EntityBean parentBean) throws IOException { return elementDescriptor.jsonReadCollection(readJson, parentBean); } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java index f1b92a78bb..1f7fa08dcf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonBeanReader.java @@ -36,9 +36,9 @@ public PersistenceContext getPersistenceContext() { } @Override - public T read(T target) { + public T read() { try { - return desc.jsonRead(readJson, null, target); + return desc.jsonRead(readJson, null); } catch (IOException e) { throw new PersistenceIOException(e); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java index 340f978e1a..49ba7547d2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/DJsonContext.java @@ -1,21 +1,12 @@ package io.ebeaninternal.server.json; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.core.PrettyPrinter; +import com.fasterxml.jackson.core.*; import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import io.ebean.FetchPath; import io.ebean.bean.EntityBean; import io.ebean.config.JsonConfig; import io.ebean.plugin.BeanType; -import io.ebean.text.json.EJson; -import io.ebean.text.json.JsonIOException; -import io.ebean.text.json.JsonReadOptions; -import io.ebean.text.json.JsonWriteBeanVisitor; -import io.ebean.text.json.JsonWriteOptions; +import io.ebean.text.json.*; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiJsonContext; import io.ebeaninternal.api.json.SpiJsonReader; @@ -26,19 +17,10 @@ import io.ebeaninternal.util.ParamTypeHelper.ManyType; import io.ebeaninternal.util.ParamTypeHelper.TypeInfo; -import java.io.IOException; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.Writer; +import java.io.*; import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; /** * Default implementation of JsonContext. @@ -124,7 +106,7 @@ public T toBean(Class cls, JsonParser parser) throws JsonIOException { public T toBean(Class cls, JsonParser parser, JsonReadOptions options) throws JsonIOException { BeanDescriptor desc = getDescriptor(cls); try { - return desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options), false), null, null); + return desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options)), null); } catch (IOException e) { throw new JsonIOException(e); } @@ -136,8 +118,8 @@ public void toBean(T target, String json) throws JsonIOException { } @Override - public void toBean(T target, String json, JsonReadOptions options) throws JsonIOException { - toBean(target, new StringReader(json), options); + public void toBean(T target, String json, JsonReadOptions readOptions) throws JsonIOException { + toBean(target, new StringReader(json), readOptions); } @Override @@ -146,8 +128,8 @@ public void toBean(T target, Reader jsonReader) throws JsonIOException { } @Override - public void toBean(T target, Reader jsonReader, JsonReadOptions options) throws JsonIOException { - toBean(target, createParser(jsonReader), options); + public void toBean(T target, Reader jsonReader, JsonReadOptions readOptions) throws JsonIOException { + toBean(target, createParser(jsonReader), readOptions); } @Override @@ -157,10 +139,12 @@ public void toBean(T target, JsonParser parser) throws JsonIOException { @SuppressWarnings("unchecked") @Override - public void toBean(T target, JsonParser parser, JsonReadOptions options) throws JsonIOException { + @Deprecated + public void toBean(T target, JsonParser parser, JsonReadOptions readOptions) throws JsonIOException { BeanDescriptor desc = (BeanDescriptor) getDescriptor(target.getClass()); try { - desc.jsonRead(new ReadJson(desc, parser, options, determineObjectMapper(options), target != null), null, target); + T bean = desc.jsonRead(new ReadJson(desc, parser, readOptions, determineObjectMapper(readOptions)), null); + desc.mergeBeans((EntityBean) bean, (EntityBean) target, null); } catch (IOException e) { throw new JsonIOException(e); } @@ -169,13 +153,13 @@ public void toBean(T target, JsonParser parser, JsonReadOptions options) thr @Override public DJsonBeanReader createBeanReader(Class cls, JsonParser parser, JsonReadOptions options) throws JsonIOException { BeanDescriptor desc = getDescriptor(cls); - return new DJsonBeanReader<>(desc, new ReadJson(desc, parser, options, determineObjectMapper(options), false)); + return new DJsonBeanReader<>(desc, new ReadJson(desc, parser, options, determineObjectMapper(options))); } @Override public DJsonBeanReader createBeanReader(BeanType beanType, JsonParser parser, JsonReadOptions options) throws JsonIOException { BeanDescriptor desc = (BeanDescriptor) beanType; - SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options), false); + SpiJsonReader readJson = new ReadJson(desc, parser, options, determineObjectMapper(options)); return new DJsonBeanReader<>(desc, readJson); } @@ -207,7 +191,7 @@ public List toList(Class cls, JsonParser src) throws JsonIOException { @Override public List toList(Class cls, JsonParser src, JsonReadOptions options) throws JsonIOException { BeanDescriptor desc = getDescriptor(cls); - SpiJsonReader readJson = new ReadJson(desc, src, options, determineObjectMapper(options), false); + SpiJsonReader readJson = new ReadJson(desc, src, options, determineObjectMapper(options)); try { JsonToken currentToken = src.getCurrentToken(); @@ -221,7 +205,7 @@ public List toList(Class cls, JsonParser src, JsonReadOptions options) List list = new ArrayList<>(); do { // CHECKME: Should we update the list - T bean = desc.jsonRead(readJson, null, null); + T bean = desc.jsonRead(readJson, null); if (bean == null) { break; } else { @@ -386,7 +370,7 @@ private void toJsonInternal(Object value, JsonGenerator gen, JsonWriteOptions op public SpiJsonReader createJsonRead(BeanType beanType, String json) { BeanDescriptor desc = (BeanDescriptor) beanType; JsonParser parser = createParser(new StringReader(json)); - return new ReadJson(desc, parser, null, defaultObjectMapper, false); + return new ReadJson(desc, parser, null, defaultObjectMapper); } @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java index ab9100c9f6..d5d637c8f6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/ReadJson.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.ObjectMapper; +import io.ebean.BeanMergeOptions; import io.ebean.bean.EntityBean; import io.ebean.bean.EntityBeanIntercept; import io.ebean.bean.PersistenceContext; @@ -32,13 +33,12 @@ public final class ReadJson implements SpiJsonReader { private final Object objectMapper; private final PersistenceContext persistenceContext; private final LoadContext loadContext; - private final boolean update; private final boolean enableLazyLoading; /** * Construct with parser and readOptions. */ - public ReadJson(BeanDescriptor desc, JsonParser parser, JsonReadOptions readOptions, Object objectMapper, boolean update) { + public ReadJson(BeanDescriptor desc, JsonParser parser, JsonReadOptions readOptions, Object objectMapper) { this.rootDesc = desc; this.parser = parser; this.objectMapper = objectMapper; @@ -48,7 +48,6 @@ public ReadJson(BeanDescriptor desc, JsonParser parser, JsonReadOptions readO // only create visitorMap, pathStack if needed ... this.visitorMap = (readOptions == null) ? null : readOptions.getVisitorMap(); this.pathStack = (visitorMap == null && loadContext == null) ? null : new PathStack(); - this.update = update; } /** @@ -62,7 +61,6 @@ private ReadJson(JsonParser moreJson, ReadJson source) { this.objectMapper = source.objectMapper; this.persistenceContext = source.persistenceContext; this.loadContext = source.loadContext; - this.update = source.update; this.enableLazyLoading = source.enableLazyLoading; } @@ -119,9 +117,14 @@ public Object persistenceContextPutIfAbsent(Object id, EntityBean bean, BeanDesc // no persistenceContext means no lazy loading either return null; } - Object existing = beanDesc.contextPutIfAbsent(persistenceContext, id, bean); + EntityBean existing = beanDesc.contextPutIfAbsent(persistenceContext, id, bean); if (existing != null) { - beanDesc.merge(bean, (EntityBean) existing); + // we foind a bean in the persistence context AND we have deserialized the same bean + // so copy every property to the existing bean + BeanMergeOptions opts = new BeanMergeOptions(); + opts.setPersistenceContext(persistenceContext); + opts.setMergeVersion(true); + beanDesc.mergeBeans(bean, existing, opts); } else { if (loadContext != null) { EntityBeanIntercept ebi = bean._ebean_getIntercept(); @@ -192,7 +195,7 @@ public void popPath() { * call it's visit method with the bean and unmappedProperties. */ @Override - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings({"unchecked", "rawtypes"}) public void beanVisitor(Object bean, Map unmappedProperties) { if (visitorMap != null) { JsonReadBeanVisitor visitor = visitorMap.get(pathStack.peekWithNull()); @@ -211,12 +214,4 @@ public void beanVisitor(Object bean, Map unmappedProperties) { public Object readValueUsingObjectMapper(Class propertyType) throws IOException { return mapper().readValue(parser, propertyType); } - - /** - * Do we update an existing bean? This meeans we have to set values via intercept and handle collections. - */ - @Override - public boolean update() { - return update; - } } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java index 449b659261..06e5de5b58 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/STreeType.java @@ -87,7 +87,7 @@ public interface STreeType { /** * Put the entity bean into the persistence context. */ - Object contextPutIfAbsent(PersistenceContext persistenceContext, Object id, EntityBean localBean); + EntityBean contextPutIfAbsent(PersistenceContext persistenceContext, Object id, EntityBean localBean); /** * Set draft status on the entity bean. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java index 5611ab82a5..aedecc628e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeLoadBean.java @@ -184,7 +184,7 @@ private void readId() throws SQLException { private void readIdBean() { // check the PersistenceContext to see if the bean already exists - contextBean = (EntityBean) localDesc.contextPutIfAbsent(persistenceContext, id, localBean); + contextBean = localDesc.contextPutIfAbsent(persistenceContext, id, localBean); if (contextBean == null) { // bean just added to the persistenceContext contextBean = localBean; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java index 89f77d70b6..9efddfaace 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanDescriptorTest.java @@ -135,7 +135,7 @@ public void merge_when_empty() { from.setName("rob"); Customer to = new Customer(); - customerDesc.merge((EntityBean) from, (EntityBean) to); + customerDesc.mergeBeans((EntityBean) from, (EntityBean) to, null); assertThat(to.getId()).isEqualTo(42); assertThat(to.getName()).isEqualTo("rob"); 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 96ad00cbc5..ae52dcd3e7 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 @@ -255,6 +255,12 @@ public void merge(Object bean, MergeOptions options) { public void merge(Object bean, MergeOptions options, Transaction transaction) { } + @Override + public T mergeBeans(T bean, T existing, BeanMergeOptions options) { + return null; + } + + @Override public List> findVersions(Query query, Transaction transaction) { return null; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java index 4799a631a6..dffae473a4 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java @@ -443,6 +443,12 @@ public void merge(Object bean, MergeOptions options, Transaction transaction) { } + @Override + public T mergeBeans(T bean, T existing, BeanMergeOptions options) { + return null; + } + + @Override public void insert(Object bean) { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Customer.java b/ebean-test/src/test/java/org/tests/model/basic/Customer.java index 0b4f98539c..48b2c62910 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Customer.java @@ -90,7 +90,7 @@ public String getValue() { List orders; @OneToMany(mappedBy = "customer", cascade = CascadeType.ALL) - List contacts; + List contacts = new ArrayList<>(); @Override public String toString() { diff --git a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java index 7225f69e4e..4acb11bcae 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestJsonBeanDescriptorParse.java @@ -1,8 +1,12 @@ package org.tests.text.json; import com.fasterxml.jackson.core.JsonParser; +import io.ebean.BeanMergeOptions; import io.ebean.BeanState; import io.ebean.DB; +import io.ebean.ValuePair; +import io.ebean.test.LoggedSql; +import io.ebean.text.json.JsonReadOptions; import io.ebean.xtest.BaseTestCase; import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.json.SpiJsonReader; @@ -11,20 +15,17 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.tests.model.basic.Address; -import org.tests.model.basic.Contact; -import org.tests.model.basic.ContactNote; -import org.tests.model.basic.Customer; +import org.tests.model.basic.*; import java.io.IOException; import java.io.StringReader; import java.util.Comparator; +import java.util.List; +import java.util.Map; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; public class TestJsonBeanDescriptorParse extends BaseTestCase { @@ -34,6 +35,7 @@ void setup() { customer.setName("Hello Roland"); customer.setId(234); Address address = new Address(); + address.setId(234); address.setLine1("foo"); DB.save(address); customer.setBillingAddress(address); @@ -54,6 +56,7 @@ void setup() { @AfterEach void teardown() { DB.delete(Customer.class, 234); + DB.delete(UTMaster.class, 1); } @Test @@ -62,7 +65,7 @@ public void testJsonRead() throws IOException { BeanDescriptor descriptor = server.descriptor(Customer.class); SpiJsonReader readJson = createRead(server, descriptor); - Customer customer = descriptor.jsonRead(readJson, null, null); + Customer customer = descriptor.jsonRead(readJson, null); assertEquals(Integer.valueOf(123), customer.getId()); assertEquals("Hello Rob", customer.getName()); @@ -87,7 +90,15 @@ public void testJsonManyUpdate() throws IOException { + " ]}," + " {\"id\": 790, \"firstName\": \"Anton\", \"lastName\": null, \"notes\" : null } " + "]}"; - DB.json().toBean(customer, json); + + BeanMergeOptions opts = new BeanMergeOptions(); + // example for a merge handler + // opts.setMergeHandler((a, b, c, d) -> { + // System.out.println("Merge " + d + "." +c); + // return true; + // }); + Customer jsonBean = DB.json().toBean(Customer.class, json); + DB.getDefault().mergeBeans(jsonBean, customer, null); DB.save(customer); customer = DB.find(Customer.class, 234); @@ -125,9 +136,15 @@ public void testJsonUpdate() throws IOException { assertEquals(null, customer.getName()); assertEquals("foo", customer.getBillingAddress().getLine1()); - DB.json().toBean(customer, "{\"billingAddress\":{\"line1\":\"foo\"}}"); + JsonReadOptions opts = new JsonReadOptions(); + opts.setEnableLazyLoading(true); + + Customer jsonBean = DB.json().toBean(Customer.class, "{\"billingAddress\":{\"line1\":\"foo\"}}", opts); + DB.getDefault().mergeBeans(jsonBean, customer, null); assertFalse(DB.beanState(customer.getBillingAddress()).isDirty()); - DB.json().toBean(customer, "{\"billingAddress\":{\"line1\":\"bar\"}}"); + + jsonBean = DB.json().toBean(Customer.class, "{\"billingAddress\":{\"line1\":\"bar\"}}", opts); + DB.getDefault().mergeBeans(jsonBean, customer, null); assertEquals("bar", customer.getBillingAddress().getLine1()); assertTrue(DB.beanState(customer.getBillingAddress()).isDirty()); @@ -180,11 +197,90 @@ public void testJsonUpdate() throws IOException { DB.delete(customer); // cleanup*/ } + @Test + public void testJsonLazyRead() throws IOException { + JsonReadOptions opts = new JsonReadOptions(); + opts.setEnableLazyLoading(true); + Customer customer = DB.json().toBean(Customer.class, "{\"id\": 234}", opts); + assertThat(customer.getBillingAddress().getLine1()).isEqualTo("foo"); + + } + + @Test + public void testJsonCollectionUnpopulated() throws IOException { + + Customer customer = DB.json().toBean(Customer.class, "{\"id\": 234, \"name\" : \"Roland\"}"); + + assertThat(customer.getBillingAddress()).isNull(); + List contacts = customer.getContacts(); + + assertThat(contacts).isEmpty(); + ; + + } + + @Test + public void testJsonUpdateManyToOne() throws IOException { + Customer customer = DB.find(Customer.class, 234); + assertThat(customer.getBillingAddress().getLine1()).isEqualTo("foo"); + + Address address = new Address(); + address.setId(987); + address.setLine1("bar"); + DB.save(address); + customer.setBillingAddress(address); + DB.save(customer); + + assertThat(customer.getBillingAddress().getLine1()).isEqualTo("bar"); + JsonReadOptions opts = new JsonReadOptions(); + + LoggedSql.start(); + Customer jsonBean = DB.json().toBean(Customer.class, "{\"billingAddress\":{\"id\": 234, \"line1\" : \"bar\"}}", opts); + DB.getDefault().mergeBeans(jsonBean, customer, null); + assertThat(LoggedSql.stop()).isEmpty(); + + Map dirty = DB.beanState(customer.getBillingAddress()).dirtyValues(); + assertThat(dirty).containsKeys("line1").hasSize(1); + assertThat(customer.getBillingAddress().getLine1()).isEqualTo("bar"); + assertThat(dirty.get("line1").getOldValue()).isEqualTo("foo"); + + } + + @Test + public void testJsonUpdateWithDbJson() { + UTMaster master = new UTMaster("m0"); + master.setId(1); + master.setJournal(new UTMaster.Journal()); + master.getJournal().addEntry(); + master.getJournal().addEntry(); + DB.save(master); + + DB.json().toBean(master, "{\"id\":1,\"name\":\"newName\",\"description\":\"master\",\"journal\":{\"entries\":[\"newEntry\"]},\"details\":[],\"version\":1}"); + + assertThat(master.getName()).isEqualTo("newName"); + assertThat(master.getDescription()).isEqualTo("master"); + assertThat(master.getJournal().getEntries()).hasSize(1); + + DB.json().toBean(master, "{\"id\":1,\"name\":\"name\",\"journal\":{}}"); + + assertThat(master.getName()).isEqualTo("name"); + assertThat(master.getDescription()).isEqualTo("master"); + assertThat(master.getJournal().getEntries()).hasSize(0); + + DB.json().toBean(master, "{\"id\":1,\"name\":\"newName\",\"description\":\"master\",\"journal\":{\"entries\":[\"newEntry\"]},\"details\":[],\"version\":1}"); + + assertThat(master.getName()).isEqualTo("newName"); + assertThat(master.getDescription()).isEqualTo("master"); + assertThat(master.getJournal().getEntries()).hasSize(1); + + + } + private SpiJsonReader createRead(SpiEbeanServer server, BeanDescriptor descriptor) { StringReader reader = new StringReader("{\"id\":123,\"name\":\"Hello Rob\"}"); JsonParser parser = server.json().createParser(reader); - SpiJsonReader readJson = new ReadJson(descriptor, parser, null, null, false); + SpiJsonReader readJson = new ReadJson(descriptor, parser, null, null); return readJson; } diff --git a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java index 6f2fc22f1a..da1e90f32f 100644 --- a/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java +++ b/ebean-test/src/test/java/org/tests/text/json/TestTextJsonInheritance.java @@ -1,12 +1,20 @@ package org.tests.text.json; -import io.ebean.xtest.BaseTestCase; +import com.fasterxml.jackson.core.*; +import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.DB; import io.ebean.text.json.JsonContext; +import io.ebean.xtest.BaseTestCase; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.tests.model.basic.*; +import java.io.*; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,6 +48,73 @@ public void test() { assertEquals(2, rebuiltList.size()); } + @Test + @Disabled("Run manually") + public void testPerformance() throws IOException { + for (int i = 0; i < 100000; i++) { + Truck c = new Truck(); + c.setLicenseNumber("L " + i); + c.setCapacity(20D); + DB.save(c); + } + DB.update(Truck.class).set("capacity", 40D).update(); + List list = DB.find(Vehicle.class).findList(); + assertThat(list).hasSize(100000); + JsonContext jsonContext = DB.json(); + JsonFactory jsonFactory = new JsonFactory(); + for (int i = 0; i < 1; i++) { + long start = System.nanoTime(); + try (OutputStream out = new GZIPOutputStream(new FileOutputStream("temp.json.gz")); + JsonGenerator gen = jsonFactory.createGenerator(out, JsonEncoding.UTF8)) { + jsonContext.toJson(list, gen); + start = System.nanoTime() - start; + System.out.println("Serializing " + 100_000_000_000_000L / start + " Entities/s"); + } + } + + ObjectMapper mapper = new ObjectMapper(); + for (int i = 0; i < 10; i++) { + long start = System.nanoTime(); + try (InputStream in = new GZIPInputStream(new FileInputStream("temp.json.gz")); + JsonParser parser = mapper.createParser(in)) { + parser.nextToken(); + Vehicle v; + List batch = new ArrayList<>(); + List batchId = new ArrayList<>(); + while ((v = read(parser)) != null) { + batchId.add(DB.beanId(v)); + batch.add(v); + if (batch.size() == 100) { + Map vDb = DB.find(Vehicle.class).where().idIn(batchId).findMap(); + for (Vehicle vehicle : batch) { + Vehicle db = vDb.get(vehicle.getId()); + DB.getDefault().pluginApi().mergeBeans(vehicle, db, null); + } + DB.saveAll(vDb.values()); + batch.clear(); + batchId.clear(); + } + } + //jsonContext.toList(Vehicle.class, parser); + start = System.nanoTime() - start; + System.out.println("DeSerializing " + 100_000_000_000_000L / start + " Entities/s"); + } + } + } + + private Vehicle read(JsonParser parser) throws IOException { + JsonToken token = parser.currentToken(); + if (token == null || token == JsonToken.START_ARRAY || token == JsonToken.END_OBJECT) { + // first invocation + token = parser.nextToken(); + } + if (token == JsonToken.START_OBJECT) { + Vehicle ret = DB.json().toBean(Vehicle.class, parser); + return ret; + } + return null; + } + private void setupData() { DB.createUpdate(CarAccessory.class, "delete from CarAccessory").execute(); DB.createUpdate(CarFuse.class, "delete from CarFuse").execute(); From c5625ce12407016267463e3d9b0d7943e4681455 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 16:11:59 +0200 Subject: [PATCH 026/123] NOPR - DEPRECATED: WriteJson allow include identifier --- .../src/main/java/io/ebeaninternal/server/json/WriteJson.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java index 39e03eb95e..f8a3574cad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/json/WriteJson.java @@ -506,6 +506,9 @@ private boolean isIncludeProperty(BeanProperty prop) { return true; if (currentIncludeProps != null) { // explicitly controlled by pathProperties + if (prop.isId() && currentIncludeProps.contains("${identifier}")) { + return true; + } return currentIncludeProps.contains(prop.name()); } else { // include only loaded properties From 2e433f5c3997a1248bc3cd430ea259502e2b7742 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 16:13:44 +0200 Subject: [PATCH 027/123] NOPR - NEEDS Refactor: ADD: Support for custom metrics --- .../java/io/ebean/metric/CountMetric.java | 6 +--- .../src/main/java/io/ebean/metric/Metric.java | 13 +++++++ .../java/io/ebean/metric/MetricFactory.java | 13 +++++++ .../java/io/ebean/metric/MetricRegistry.java | 31 ++++++++++++++++ .../java/io/ebean/metric/QueryPlanMetric.java | 6 +--- .../java/io/ebean/metric/TimedMetric.java | 6 +--- .../java/io/ebean/metric/TimedMetricMap.java | 6 +--- .../server/cache/DefaultServerCache.java | 4 +++ .../server/core/DefaultServer.java | 5 +++ .../server/profile/AbstractMetric.java | 25 +++++++++++++ .../server/profile/DCountMetric.java | 21 ----------- .../server/profile/DCountMetricStats.java | 27 ++++++++++++++ .../server/profile/DIntMetric.java | 36 +++++++++++++++++++ .../server/profile/DLongMetric.java | 36 +++++++++++++++++++ .../server/profile/DMetricFactory.java | 14 ++++++++ 15 files changed, 208 insertions(+), 41 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/metric/Metric.java create mode 100644 ebean-api/src/main/java/io/ebean/metric/MetricRegistry.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/profile/AbstractMetric.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetricStats.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/profile/DIntMetric.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/profile/DLongMetric.java diff --git a/ebean-api/src/main/java/io/ebean/metric/CountMetric.java b/ebean-api/src/main/java/io/ebean/metric/CountMetric.java index 3ce785c1ea..d125134552 100644 --- a/ebean-api/src/main/java/io/ebean/metric/CountMetric.java +++ b/ebean-api/src/main/java/io/ebean/metric/CountMetric.java @@ -5,7 +5,7 @@ /** * Metric for timed events like transaction execution times. */ -public interface CountMetric { +public interface CountMetric extends Metric { /** * Add to the counter. @@ -32,8 +32,4 @@ public interface CountMetric { */ void reset(); - /** - * Visit non empty metrics. - */ - void visit(MetricVisitor visitor); } diff --git a/ebean-api/src/main/java/io/ebean/metric/Metric.java b/ebean-api/src/main/java/io/ebean/metric/Metric.java new file mode 100644 index 0000000000..374b2134e2 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/metric/Metric.java @@ -0,0 +1,13 @@ +package io.ebean.metric; + +import io.ebean.meta.MetricVisitor; + +/** + * Base for all metrics. + */ +public interface Metric { + /** + * Visit the underlying metric. + */ + void visit(MetricVisitor visitor); +} diff --git a/ebean-api/src/main/java/io/ebean/metric/MetricFactory.java b/ebean-api/src/main/java/io/ebean/metric/MetricFactory.java index d5fb8bd282..478d0a9933 100644 --- a/ebean-api/src/main/java/io/ebean/metric/MetricFactory.java +++ b/ebean-api/src/main/java/io/ebean/metric/MetricFactory.java @@ -2,6 +2,9 @@ import io.ebean.ProfileLocation; +import java.util.function.IntSupplier; +import java.util.function.LongSupplier; + /** * Factory to create timed metric counters. */ @@ -29,6 +32,16 @@ static MetricFactory get() { */ CountMetric createCountMetric(String name); + /** + * Create a metric, that gets the value from a supplier. + */ + Metric createMetric(String name, LongSupplier supplier); + + /** + * Create a metric, that gets the value from a supplier. + */ + Metric createMetric(String name, IntSupplier supplier); + /** * Create a Timed metric. */ diff --git a/ebean-api/src/main/java/io/ebean/metric/MetricRegistry.java b/ebean-api/src/main/java/io/ebean/metric/MetricRegistry.java new file mode 100644 index 0000000000..d881320247 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/metric/MetricRegistry.java @@ -0,0 +1,31 @@ +package io.ebean.metric; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * Global registry of custom metrics instances created. + */ +public final class MetricRegistry { + public interface RegistryEntry { + void remove(); + } + + private static final List list = Collections.synchronizedList(new ArrayList<>()); + + /** + * Register the metric instance. + */ + public static RegistryEntry register(Metric location) { + list.add(location); + return () -> list.remove(location); + } + + /** + * Return all the registered extra metrics. + */ + public static List registered() { + return list; + } +} 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 24999ce0ed..c1f24eea45 100644 --- a/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java +++ b/ebean-api/src/main/java/io/ebean/metric/QueryPlanMetric.java @@ -5,15 +5,11 @@ /** * Internal Query plan metric holder. */ -public interface QueryPlanMetric { +public interface QueryPlanMetric extends Metric { /** * Return the underlying timed metric. */ TimedMetric metric(); - /** - * Visit the underlying metric. - */ - void visit(MetricVisitor visitor); } diff --git a/ebean-api/src/main/java/io/ebean/metric/TimedMetric.java b/ebean-api/src/main/java/io/ebean/metric/TimedMetric.java index 17c3defb95..4ec95581a4 100644 --- a/ebean-api/src/main/java/io/ebean/metric/TimedMetric.java +++ b/ebean-api/src/main/java/io/ebean/metric/TimedMetric.java @@ -5,7 +5,7 @@ /** * Metric for timed events like transaction execution times. */ -public interface TimedMetric { +public interface TimedMetric extends Metric { /** * Add a time event (usually in microseconds). @@ -37,8 +37,4 @@ public interface TimedMetric { */ TimedMetricStats collect(boolean reset); - /** - * Visit non empty metrics. - */ - void visit(MetricVisitor visitor); } diff --git a/ebean-api/src/main/java/io/ebean/metric/TimedMetricMap.java b/ebean-api/src/main/java/io/ebean/metric/TimedMetricMap.java index 5d10397ba2..aeff635e82 100644 --- a/ebean-api/src/main/java/io/ebean/metric/TimedMetricMap.java +++ b/ebean-api/src/main/java/io/ebean/metric/TimedMetricMap.java @@ -5,7 +5,7 @@ /** * A map of timed metrics keyed by a string. */ -public interface TimedMetricMap { +public interface TimedMetricMap extends Metric { /** * Add a time event given the start nanos. @@ -17,8 +17,4 @@ public interface TimedMetricMap { */ void add(String key, long exeMicros); - /** - * Visit the metric. - */ - void visit(MetricVisitor visitor); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java index 2590265716..a0eea215b2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java @@ -6,6 +6,7 @@ import io.ebean.cache.ServerCacheStatistics; import io.ebean.meta.MetricVisitor; import io.ebean.metric.CountMetric; +import io.ebean.metric.Metric; import io.ebean.metric.MetricFactory; import java.io.Serializable; @@ -48,6 +49,7 @@ public class DefaultServerCache implements ServerCache { protected final CountMetric idleCount; protected final CountMetric ttlCount; protected final CountMetric lruCount; + protected final Metric sizeCount; protected final String name; protected final String shortName; protected final int maxSize; @@ -81,6 +83,7 @@ public DefaultServerCache(DefaultServerCacheConfig config) { this.idleCount = factory.createCountMetric(prefix + shortName + ".idle"); this.ttlCount = factory.createCountMetric(prefix + shortName + ".ttl"); this.lruCount = factory.createCountMetric(prefix + shortName + ".lru"); + this.sizeCount = factory.createMetric(prefix + shortName + ".size", map::size); } @@ -103,6 +106,7 @@ public void visit(MetricVisitor visitor) { idleCount.visit(visitor); ttlCount.visit(visitor); lruCount.visit(visitor); + sizeCount.visit(visitor); } @Override 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 31f7ad7b6d..ec4dc01d07 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 @@ -16,6 +16,8 @@ import io.ebean.event.readaudit.ReadAuditLogger; import io.ebean.event.readaudit.ReadAuditPrepare; import io.ebean.meta.*; +import io.ebean.metric.Metric; +import io.ebean.metric.MetricRegistry; import io.ebean.migration.auto.AutoMigrationRunner; import io.ebean.plugin.BeanType; import io.ebean.plugin.Plugin; @@ -2290,6 +2292,9 @@ public void visitMetrics(MetricVisitor visitor) { persister.visitMetrics(visitor); } extraMetrics.visitMetrics(visitor); + for (Metric metric : MetricRegistry.registered()) { + metric.visit(visitor); + } visitor.visitEnd(); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/AbstractMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/AbstractMetric.java new file mode 100644 index 0000000000..7c1400d50e --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/AbstractMetric.java @@ -0,0 +1,25 @@ +package io.ebeaninternal.server.profile; + +import io.ebean.meta.MetricVisitor; +import io.ebean.metric.Metric; + +/** + * Used to collect counter metrics. + */ +abstract class AbstractMetric implements Metric { + + final String name; + private String reportName; + + AbstractMetric(String name) { + this.name = name; + } + + String reportName(MetricVisitor visitor) { + if (reportName == null) { + this.reportName = visitor.namingConvention().apply(name); + } + return reportName; + } + +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java index 34c47cfc64..d9c84bd067 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java @@ -62,25 +62,4 @@ String reportName(MetricVisitor visitor) { return tmp; } - private static class DCountMetricStats implements CountMetricStats { - - private final String name; - private final long count; - - private DCountMetricStats(String name, long count) { - this.name = name; - this.count = count; - } - - @Override - public String name() { - return name; - } - - @Override - public long count() { - return count; - } - } - } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetricStats.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetricStats.java new file mode 100644 index 0000000000..1265c97ed9 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DCountMetricStats.java @@ -0,0 +1,27 @@ +package io.ebeaninternal.server.profile; + +import io.ebean.metric.CountMetricStats; + +/** + * Holder for count metric values. + */ +class DCountMetricStats implements CountMetricStats { + + private final String name; + private final long count; + + DCountMetricStats(String name, long count) { + this.name = name; + this.count = count; + } + + @Override + public String name() { + return name; + } + + @Override + public long count() { + return count; + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DIntMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DIntMetric.java new file mode 100644 index 0000000000..f4e777ea4b --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DIntMetric.java @@ -0,0 +1,36 @@ +package io.ebeaninternal.server.profile; + +import io.ebean.meta.MetricVisitor; +import io.ebean.metric.Metric; + +import java.util.function.IntSupplier; + +/** + * IntSupplier metric. + */ +final class DIntMetric implements Metric { + private final String name; + private final IntSupplier supplier; + private String reportName; + + DIntMetric(String name, IntSupplier supplier) { + this.name = name; + this.supplier = supplier; + } + + + @Override + public void visit(MetricVisitor visitor) { + int val = supplier.getAsInt(); + if (val != 0) { + final String name = reportName != null ? reportName : reportName(visitor); + visitor.visitCount(new DCountMetricStats(name, val)); + } + } + + String reportName(MetricVisitor visitor) { + final String tmp = visitor.namingConvention().apply(name); + this.reportName = tmp; + return tmp; + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DLongMetric.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DLongMetric.java new file mode 100644 index 0000000000..ba291e4da4 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DLongMetric.java @@ -0,0 +1,36 @@ +package io.ebeaninternal.server.profile; + +import io.ebean.meta.MetricVisitor; +import io.ebean.metric.Metric; + +import java.util.function.LongSupplier; + +/** + * LongSpplier metric. + */ +final class DLongMetric implements Metric { + private final String name; + private final LongSupplier supplier; + private String reportName; + + DLongMetric(String name, LongSupplier supplier) { + this.name = name; + this.supplier = supplier; + } + + + @Override + public void visit(MetricVisitor visitor) { + long val = supplier.getAsLong(); + if (val != 0) { + final String name = reportName != null ? reportName : reportName(visitor); + visitor.visitCount(new DCountMetricStats(name, val)); + } + } + + String reportName(MetricVisitor visitor) { + final String tmp = visitor.namingConvention().apply(name); + this.reportName = tmp; + return tmp; + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java index d51ff2198d..5166524451 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java @@ -2,11 +2,15 @@ import io.ebean.ProfileLocation; import io.ebean.metric.CountMetric; +import io.ebean.metric.Metric; import io.ebean.metric.MetricFactory; import io.ebean.metric.QueryPlanMetric; import io.ebean.metric.TimedMetric; import io.ebean.metric.TimedMetricMap; +import java.util.function.IntSupplier; +import java.util.function.LongSupplier; + /** * Default metric factory implementation. */ @@ -27,6 +31,16 @@ public CountMetric createCountMetric(String name) { return new DCountMetric(name); } + @Override + public Metric createMetric(String name, LongSupplier supplier) { + return new DLongMetric(name, supplier); + } + + @Override + public Metric createMetric(String name, IntSupplier supplier) { + return new DIntMetric(name, supplier); + } + @Override public QueryPlanMetric createQueryPlanMetric(Class type, String label, ProfileLocation profileLocation, String sql) { return new DQueryPlanMetric(new DQueryPlanMeta(type, label, profileLocation, sql), new DTimedMetric(label)); From 7e8365f6115df10ce03160451317eaefa2ffca23 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 16:15:05 +0200 Subject: [PATCH 028/123] NOPR - DEPRECATED: TempFileProvider base code --- .../java/io/ebean/config/DatabaseConfig.java | 10 + .../DeleteOnShutdownTempFileProvider.java | 68 +++++++ .../io/ebean/config/TempFileProvider.java | 23 +++ .../ebean/config/WeakRefTempFileProvider.java | 145 +++++++++++++++ .../io/ebean/TestWeakRefTempFileProvider.java | 171 ++++++++++++++++++ .../server/core/DefaultServer.java | 3 + .../server/core/InternalConfiguration.java | 7 + .../server/type/DefaultTypeManager.java | 3 +- .../server/type/ScalarTypeFile.java | 21 +-- 9 files changed, 438 insertions(+), 13 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/config/DeleteOnShutdownTempFileProvider.java create mode 100644 ebean-api/src/main/java/io/ebean/config/TempFileProvider.java create mode 100644 ebean-api/src/main/java/io/ebean/config/WeakRefTempFileProvider.java create mode 100644 ebean-api/src/test/java/io/ebean/TestWeakRefTempFileProvider.java diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index 063d9c13eb..ee29020c2e 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -398,6 +398,8 @@ public class DatabaseConfig { */ private Clock clock = Clock.systemUTC(); + private TempFileProvider tempFileProvider = new WeakRefTempFileProvider(); + private List idGenerators = new ArrayList<>(); private List findControllers = new ArrayList<>(); private List persistControllers = new ArrayList<>(); @@ -571,6 +573,14 @@ public void setClock(final Clock clock) { this.clock = clock; } + public TempFileProvider getTempFileProvider() { + return tempFileProvider; + } + + public void setTempFileProvider(final TempFileProvider tempFileProvider) { + this.tempFileProvider = tempFileProvider; + } + /** * Return the slow query time in millis. */ diff --git a/ebean-api/src/main/java/io/ebean/config/DeleteOnShutdownTempFileProvider.java b/ebean-api/src/main/java/io/ebean/config/DeleteOnShutdownTempFileProvider.java new file mode 100644 index 0000000000..ad257c98ee --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/config/DeleteOnShutdownTempFileProvider.java @@ -0,0 +1,68 @@ +package io.ebean.config; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * TempFileProvider implementation, which deletes all temp files on shutdown. + * + * @author Roland Praml, FOCONIS AG + * + */ +public class DeleteOnShutdownTempFileProvider implements TempFileProvider { + + private static final Logger logger = LoggerFactory.getLogger(DeleteOnShutdownTempFileProvider.class); + + List tempFiles = new ArrayList<>(); + private final String prefix; + private final String suffix; + private final File directory; + + /** + * Creates the TempFileProvider with default prefix "db-". + */ + public DeleteOnShutdownTempFileProvider() { + this("db-", null, null); + } + + /** + * Creates the TempFileProvider. + */ + public DeleteOnShutdownTempFileProvider(String prefix, String suffix, File directory) { + this.prefix = prefix; + this.suffix = suffix; + this.directory = directory; + } + + @Override + public File createTempFile() throws IOException { + File file = File.createTempFile(prefix, suffix, directory); + synchronized (tempFiles) { + tempFiles.add(file.getAbsolutePath()); + } + return file; + } + + /** + * Deletes all created files on shutdown. + */ + @Override + public void shutdown() { + synchronized (tempFiles) { + for (String path : tempFiles) { + if (new File(path).delete()) { + logger.trace("deleted {}", path); + } else { + logger.warn("could not delete {}", path); + } + } + tempFiles.clear(); + } + } + +} diff --git a/ebean-api/src/main/java/io/ebean/config/TempFileProvider.java b/ebean-api/src/main/java/io/ebean/config/TempFileProvider.java new file mode 100644 index 0000000000..4658b46c28 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/config/TempFileProvider.java @@ -0,0 +1,23 @@ +package io.ebean.config; + +import java.io.File; +import java.io.IOException; + +/** + * Creates a temp file for the ScalarTypeFile datatype. + * + * @author Roland Praml, FOCONIS AG + * + */ +public interface TempFileProvider { + + /** + * Creates a tempFile. + */ + File createTempFile() throws IOException; + + /** + * Shutdown the tempFileProvider. + */ + void shutdown(); +} diff --git a/ebean-api/src/main/java/io/ebean/config/WeakRefTempFileProvider.java b/ebean-api/src/main/java/io/ebean/config/WeakRefTempFileProvider.java new file mode 100644 index 0000000000..aa3ae82905 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/config/WeakRefTempFileProvider.java @@ -0,0 +1,145 @@ +package io.ebean.config; + +import java.io.File; +import java.io.IOException; +import java.lang.ref.ReferenceQueue; +import java.lang.ref.WeakReference; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * WeakRefTempFileProvider will delete the tempFile if all references to the returned File + * object are collected by the garbage collection. + * + * @author Roland Praml, FOCONIS AG + * + */ +public class WeakRefTempFileProvider implements TempFileProvider { + + private static final Logger logger = LoggerFactory.getLogger(WeakRefTempFileProvider.class); + + private final ReferenceQueue tempFiles = new ReferenceQueue<>(); + + private WeakFileReference root; + + private final String prefix; + private final String suffix; + private final File directory; + + /** + * We hold a linkedList of weak references. So we can remove stale files in O(1) + * + * @author Roland Praml, FOCONIS AG + */ + private static class WeakFileReference extends WeakReference { + + String path; + WeakFileReference prev; + WeakFileReference next; + + WeakFileReference(File referent, ReferenceQueue q) { + super(referent, q); + path = referent.getAbsolutePath(); + } + + boolean delete(boolean shutdown) { + File file = new File(path); + if (!file.exists()) { + logger.trace("already deleted {}", path); + return true; + } else if (file.delete()) { + logger.trace("deleted {}", path); + return true; + } else { + if (shutdown) { + logger.warn("could not delete {}", path); + } else { + logger.info("could not delete {} - will delete on shutdown", path); + } + return false; + } + } + } + + + /** + * Creates the TempFileProvider with default prefix "db-". + */ + public WeakRefTempFileProvider() { + this("db-", null, null); + } + + /** + * Creates the TempFileProvider. + */ + public WeakRefTempFileProvider(String prefix, String suffix, File directory) { + this.prefix = prefix; + this.suffix = suffix; + this.directory = directory; + } + + @Override + public File createTempFile() throws IOException { + File tempFile = File.createTempFile(prefix, suffix, directory); + logger.trace("createTempFile: {}", tempFile); + synchronized (this) { + add(new WeakFileReference(tempFile, tempFiles)); + } + return tempFile; + } + + /** + * Will delete stale files. + * This is public to use in tests. + */ + public void deleteStaleTempFiles() { + synchronized (this) { + deleteStaleTempFilesInternal(); + } + } + + private void deleteStaleTempFilesInternal() { + WeakFileReference ref; + while ((ref = (WeakFileReference) tempFiles.poll()) != null) { + if (ref.delete(false)) { + remove(ref); // remove from linkedList only, if delete was successful. + } + } + } + + private void add(WeakFileReference ref) { + deleteStaleTempFilesInternal(); + + if (root == null) { + root = ref; + } else { + ref.next = root; + root.prev = ref; + root = ref; + } + } + + private void remove(WeakFileReference ref) { + if (ref.next != null) { + ref.next.prev = ref.prev; + } + if (ref.prev != null) { + ref.prev.next = ref.next; + } else { + root = ref.next; + } + } + + /** + * Deletes all created files on shutdown. + */ + @Override + public void shutdown() { + while (root != null) { + root.delete(true); + root = root.next; + } + } + +} diff --git a/ebean-api/src/test/java/io/ebean/TestWeakRefTempFileProvider.java b/ebean-api/src/test/java/io/ebean/TestWeakRefTempFileProvider.java new file mode 100644 index 0000000000..dc69cc6876 --- /dev/null +++ b/ebean-api/src/test/java/io/ebean/TestWeakRefTempFileProvider.java @@ -0,0 +1,171 @@ +package io.ebean; + + +import io.ebean.config.WeakRefTempFileProvider; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.io.FileOutputStream; +import java.nio.channels.FileLock; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Test for the WeakRefTempFileProvider. (Note: this test relies on an aggressive garbage collection. + * if GC implementation will change, the test may fail) + * + * @author Roland Praml, FOCONIS AG + */ +public class TestWeakRefTempFileProvider { + + WeakRefTempFileProvider prov = new WeakRefTempFileProvider(); + + @AfterEach + public void shutdown() { + prov.shutdown(); + } + + /** + * Run the garbage collection and delete stale files. + */ + private void gc() throws InterruptedException { + System.gc(); + Thread.sleep(100); + prov.deleteStaleTempFiles(); + } + + @Test + public void testStaleEntries() throws Exception { + File tempFile = prov.createTempFile(); + String fileName = tempFile.getAbsolutePath(); + + gc(); + + assertThat(new File(fileName)).exists(); + + tempFile = null; // give up reference + + gc(); + + assertThat(new File(fileName)).doesNotExist(); + + + } + + @Test + public void testLinkedListForward() throws Exception { + File tempFile1 = prov.createTempFile(); + String fileName1 = tempFile1.getAbsolutePath(); + File tempFile2 = prov.createTempFile(); + String fileName2 = tempFile2.getAbsolutePath(); + File tempFile3 = prov.createTempFile(); + String fileName3 = tempFile3.getAbsolutePath(); + + assertThat(new File(fileName1)).exists(); + assertThat(new File(fileName2)).exists(); + assertThat(new File(fileName3)).exists(); + + gc(); + + // give up first ref + tempFile1 = null; + + gc(); + + assertThat(new File(fileName1)).doesNotExist(); + assertThat(new File(fileName2)).exists(); + assertThat(new File(fileName3)).exists(); + + // give up second ref + tempFile2 = null; + + gc(); + + assertThat(new File(fileName1)).doesNotExist(); + assertThat(new File(fileName2)).doesNotExist(); + assertThat(new File(fileName3)).exists(); + + // give up third ref + tempFile3 = null; + + gc(); + + assertThat(new File(fileName1)).doesNotExist(); + assertThat(new File(fileName2)).doesNotExist(); + assertThat(new File(fileName3)).doesNotExist(); + + } + + + @Test + public void testLinkedListReverse() throws Exception { + File tempFile1 = prov.createTempFile(); + String fileName1 = tempFile1.getAbsolutePath(); + File tempFile2 = prov.createTempFile(); + String fileName2 = tempFile2.getAbsolutePath(); + File tempFile3 = prov.createTempFile(); + String fileName3 = tempFile3.getAbsolutePath(); + + assertThat(new File(fileName1)).exists(); + assertThat(new File(fileName2)).exists(); + assertThat(new File(fileName3)).exists(); + + gc(); + + // give up third ref + tempFile3 = null; + + gc(); + + assertThat(new File(fileName1)).exists(); + assertThat(new File(fileName2)).exists(); + assertThat(new File(fileName3)).doesNotExist(); + + // give up second ref + tempFile2 = null; + + gc(); + + assertThat(new File(fileName1)).exists(); + assertThat(new File(fileName2)).doesNotExist(); + assertThat(new File(fileName3)).doesNotExist(); + + // give up first ref + tempFile1 = null; + + gc(); + + assertThat(new File(fileName1)).doesNotExist(); + assertThat(new File(fileName2)).doesNotExist(); + assertThat(new File(fileName3)).doesNotExist(); + + } + + @Test + @Disabled("Runs on Windows only") + public void testFileLocked() throws Exception { + File tempFile = prov.createTempFile(); + String fileName = tempFile.getAbsolutePath(); + + try (FileOutputStream os = new FileOutputStream(fileName)) { + FileLock lock = os.getChannel().lock(); + try { + os.write(42); + + tempFile = null; + gc(); + } finally { + lock.release(); + } + + } + + assertThat(new File(fileName)).exists(); + + prov.shutdown(); + + assertThat(new File(fileName)).doesNotExist(); + } +} 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 ec4dc01d07..662c4ce42e 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 @@ -82,6 +82,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { private final String serverName; private final DatabasePlatform databasePlatform; private final TransactionManager transactionManager; + private final TempFileProvider tempFileProvider; private final QueryPlanManager queryPlanManager; private final ExtraMetrics extraMetrics; private final DataTimeZone dataTimeZone; @@ -161,6 +162,7 @@ public DefaultServer(InternalConfiguration config, ServerCacheManager cache) { this.queryPlanManager = config.initQueryPlanManager(transactionManager); this.metaInfoManager = new DefaultMetaInfoManager(this, this.config.getMetricNaming()); this.serverPlugins = config.getPlugins(); + this.tempFileProvider = config.getConfig().getTempFileProvider(); this.ddlGenerator = config.initDdlGenerator(this); this.scriptRunner = new DScriptRunner(this); @@ -376,6 +378,7 @@ public void shutdown(boolean shutdownDataSource, boolean deregisterDriver) { backgroundExecutor.shutdown(); // shutdown DataSource (if its an Ebean one) transactionManager.shutdown(shutdownDataSource, deregisterDriver); + tempFileProvider.shutdown(); dumpMetrics(); shutdown = true; if (shutdownDataSource) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java index 35a8ee0410..14987c9c16 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InternalConfiguration.java @@ -8,6 +8,7 @@ import io.ebean.config.ExternalTransactionManager; import io.ebean.config.ProfilingConfig; import io.ebean.config.SlowQueryListener; +import io.ebean.config.TempFileProvider; import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.config.dbplatform.DbHistorySupport; import io.ebean.event.changelog.ChangeLogListener; @@ -76,6 +77,7 @@ public final class InternalConfiguration { private final DatabasePlatform databasePlatform; private final DeployInherit deployInherit; private final TypeManager typeManager; + private final TempFileProvider tempFileProvider; private final DtoBeanManager dtoBeanManager; private final ClockService clockService; private final DataTimeZone dataTimeZone; @@ -116,6 +118,7 @@ public final class InternalConfiguration { this.databasePlatform = config.getDatabasePlatform(); this.expressionFactory = initExpressionFactory(config); this.typeManager = new DefaultTypeManager(config, bootupClasses); + this.tempFileProvider = config.getTempFileProvider(); this.multiValueBind = createMultiValueBind(databasePlatform.platform()); this.deployInherit = new DeployInherit(bootupClasses); this.deployCreateProperties = new DeployCreateProperties(typeManager); @@ -517,6 +520,10 @@ SpiLogManager getLogManager() { return logManager; } + public TempFileProvider getTempFileProvider() { + return tempFileProvider; + } + private ServerCachePlugin initServerCachePlugin() { if (config.isLocalOnlyL2Cache()) { localL2Caching = true; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index 2d0297cbaf..31f7cd5c3a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -58,7 +58,7 @@ public final class DefaultTypeManager implements TypeManager { private final DefaultTypeFactory extraTypeFactory; - private final ScalarType fileType = new ScalarTypeFile(); + private final ScalarType fileType; private final ScalarType hstoreType = new ScalarTypePostgresHstore(); private final JsonConfig.DateTime jsonDateTime; @@ -96,6 +96,7 @@ public DefaultTypeManager(DatabaseConfig config, BootupClasses bootupClasses) { this.arrayTypeSetFactory = arrayTypeSetFactory(config.getDatabasePlatform()); this.offlineMigrationGeneration = DbOffline.isGenerateMigration(); this.defaultEnumType = config.getDefaultEnumType(); + this.fileType = new ScalarTypeFile(config.getTempFileProvider()); jsonMapper = findJsonMapper(); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java index 5e4ad5df80..5dd6ff96e9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; +import io.ebean.config.TempFileProvider; import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; import io.ebean.core.type.DocPropertyType; @@ -20,26 +21,22 @@ */ final class ScalarTypeFile extends ScalarTypeBase { - private final String prefix; - private final String suffix; - private final File directory; + private final TempFileProvider tempFileProvider; private final int bufferSize; /** - * Construct with reasonable defaults of Blob and 8096 buffer size. + * Construct with reasonable defaults of Blob and 8192 buffer size. */ - ScalarTypeFile() { - this(Types.LONGVARBINARY, "db-", null, null, 8096); + ScalarTypeFile(TempFileProvider tempFileProvider) { + this(Types.LONGVARBINARY, tempFileProvider, 8192); } /** * Create the ScalarTypeFile. */ - ScalarTypeFile(int jdbcType, String prefix, String suffix, File directory, int bufferSize) { + ScalarTypeFile(int jdbcType, TempFileProvider tempFileProvider, int bufferSize) { super(File.class, false, jdbcType); - this.prefix = prefix; - this.suffix = suffix; - this.directory = directory; + this.tempFileProvider = tempFileProvider; this.bufferSize = bufferSize; } @@ -66,7 +63,7 @@ public File read(DataReader reader) throws SQLException { } try { // stream from db into our temp file - File tempFile = File.createTempFile(prefix, suffix, directory); + File tempFile = tempFileProvider.createTempFile(); OutputStream os = getOutputStream(tempFile); pump(is, os); return tempFile; @@ -109,7 +106,7 @@ public void jsonWrite(JsonGenerator writer, File value) throws IOException { @Override public File jsonRead(JsonParser parser) throws IOException { - File tempFile = File.createTempFile(prefix, suffix, directory); + File tempFile = tempFileProvider.createTempFile(); try (OutputStream os = getOutputStream(tempFile)) { parser.readBinaryValue(os); os.flush(); From d133c057e76721a9722610107b63eb01c8b8412a Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 16:16:17 +0200 Subject: [PATCH 029/123] NOPR - DEPRECATED: IntersectionFactory IntersectionFactory base code Skim M2M table in update IsTableManaged support Fix if a managed table is used to connect different model pairs --- .../annotation/ext/IntersectionFactory.java | 29 +++++++ ebean-api/src/main/java/module-info.java | 2 +- .../server/deploy/BeanDescriptor.java | 7 -- .../server/deploy/BeanDescriptorManager.java | 7 +- .../server/deploy/BeanPropertyAssocMany.java | 24 +++++- .../deploy/IntersectionFactoryHelp.java | 66 ++++++++++++++++ .../server/deploy/IntersectionRow.java | 21 ++++- .../deploy/meta/DeployBeanDescriptor.java | 7 ++ .../meta/DeployBeanPropertyAssocMany.java | 25 ++++++ .../deploy/parse/AnnotationAssocManys.java | 17 +++- .../server/persist/DefaultPersister.java | 4 +- .../server/persist/SaveManyBeans.java | 37 ++++++++- .../java/org/tests/model/m2m/MnyEdge.java | 20 ++++- .../java/org/tests/model/m2m/MnyNode.java | 8 +- .../org/tests/model/m2m/TestM2MWithWhere.java | 78 +++++++++++++++++-- 15 files changed, 320 insertions(+), 32 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/annotation/ext/IntersectionFactory.java create mode 100644 ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionFactoryHelp.java diff --git a/ebean-api/src/main/java/io/ebean/annotation/ext/IntersectionFactory.java b/ebean-api/src/main/java/io/ebean/annotation/ext/IntersectionFactory.java new file mode 100644 index 0000000000..5749549fb9 --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/annotation/ext/IntersectionFactory.java @@ -0,0 +1,29 @@ +package io.ebean.annotation.ext; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +/** + * Annotation to define a factory for an intersection model. This class MUST have a constructor or factory method with two parameters that accepts parent and property type. + * @author Roland Praml, FOCONIS AG + */ +@Documented +@Target({ FIELD, TYPE }) +@Retention(RUNTIME) +public @interface IntersectionFactory { + + /** + * The intersection model class. + */ + Class value(); + + /** + * An optional factory method. + */ + String factoryMethod() default ""; +} diff --git a/ebean-api/src/main/java/module-info.java b/ebean-api/src/main/java/module-info.java index 81c0c6b142..cb7f9f7c7f 100644 --- a/ebean-api/src/main/java/module-info.java +++ b/ebean-api/src/main/java/module-info.java @@ -42,5 +42,5 @@ exports io.ebean.text; exports io.ebean.text.json; exports io.ebean.util; - + exports io.ebean.annotation.ext; } 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 e302571e83..c3f713cbda 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 @@ -1925,13 +1925,6 @@ public BeanDescriptor descriptor(Class otherType) { return owner.descriptor(otherType); } - /** - * Returns true, if the table is managed (i.e. an existing m2m relation). - */ - public boolean isTableManaged(String tableName) { - return owner.isTableManaged(tableName); - } - /** * Return the order column property. */ diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 9bf7f874ac..10604b2dde 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -89,6 +89,7 @@ public final class BeanDescriptorManager implements BeanDescriptorMap, SpiBeanTy private final BootupClasses bootupClasses; private final String serverName; private final List> elementDescriptors = new ArrayList<>(); + private final Set managedTables = new HashSet<>(); private final Map, BeanTable> beanTableMap = new HashMap<>(); private final Map> descMap = new HashMap<>(); private final Map> descQueueMap = new HashMap<>(); @@ -413,8 +414,7 @@ public List> beanTypes(String tableName) { @Override public boolean isTableManaged(String tableName) { - return tableToDescMap.get(tableName.toLowerCase()) != null - || tableToViewDescMap.get(tableName.toLowerCase()) != null; + return managedTables.contains(tableName); } /** @@ -685,6 +685,9 @@ private void readEntityBeanTable() { for (DeployBeanInfo info : deployInfoMap.values()) { BeanTable beanTable = createBeanTable(info); beanTableMap.put(beanTable.getBeanType(), beanTable); + if (beanTable.getBaseTable() != null) { + managedTables.add(beanTable.getBaseTable()); + } } // register non-id embedded beans (after bean tables are created) for (DeployBeanInfo info : embeddedBeans) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 07063c3c85..38ae95aed1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -38,9 +38,12 @@ public class BeanPropertyAssocMany extends BeanPropertyAssoc implements ST * Join for manyToMany intersection table. */ private final TableJoin intersectionJoin; + + private final boolean tableManaged; private final String intersectionPublishTable; private final String intersectionDraftTable; private final boolean orphanRemoval; + private final IntersectionFactoryHelp intersectionFactory; private IntersectionTable intersectionTable; /** * For ManyToMany this is the Inverse join used to build reference queries. @@ -99,10 +102,13 @@ public BeanPropertyAssocMany(BeanDescriptor descriptor, DeployBeanPropertyAss this.mapKey = deploy.getMapKey(); this.fetchOrderBy = deploy.getFetchOrderBy(); this.intersectionJoin = deploy.createIntersectionTableJoin(); + this.intersectionFactory = deploy.getIntersectionFactory(); if (intersectionJoin != null) { + this.tableManaged = deploy.isTableManaged(); this.intersectionPublishTable = intersectionJoin.getTable(); this.intersectionDraftTable = deploy.getIntersectionDraftTable(); } else { + this.tableManaged = false; this.intersectionPublishTable = null; this.intersectionDraftTable = null; } @@ -939,11 +945,11 @@ public boolean isIncludeCascadeSave() { // Note ManyToMany always included as we always 'save' // the relationship via insert/delete of intersection table // REMOVALS means including PrivateOwned relationships - return cascadeInfo.isSave() || hasJoinTable() || ModifyListenMode.REMOVALS == modifyListenMode; + return cascadeInfo.isSave() || (hasJoinTable() && !tableManaged) || ModifyListenMode.REMOVALS == modifyListenMode; } public boolean isIncludeCascadeDelete() { - return cascadeInfo.isDelete() || hasJoinTable() || ModifyListenMode.REMOVALS == modifyListenMode; + return cascadeInfo.isDelete() || (hasJoinTable() && !tableManaged) || ModifyListenMode.REMOVALS == modifyListenMode; } boolean isCascadeDeleteEscalate() { @@ -1071,15 +1077,27 @@ public void bindElementValue(SqlUpdate insert, Object value) { targetDescriptor.bindElementValue(insert, value); } + /** + * Returns true, if this M2M beanproperty has a jointable, where the jointable is managed by an other entity. + */ + public boolean isTableManaged() { + return tableManaged; + } + /** * Returns true, if we must create a m2m join table. */ public boolean createJoinTable() { if (hasJoinTable() && mappedBy() == null) { // only create on other 'owning' side - return !descriptor.isTableManaged(intersectionJoin.getTable()); + return !tableManaged; } else { return false; } } + + public IntersectionFactoryHelp getIntersectionFactory() { + return intersectionFactory; + } + } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionFactoryHelp.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionFactoryHelp.java new file mode 100644 index 0000000000..e9bafa2890 --- /dev/null +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionFactoryHelp.java @@ -0,0 +1,66 @@ +package io.ebeaninternal.server.deploy; + +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; + +/** + * Helper class to construct intersection beans. + * + * @author Roland Praml, FOCONIS AG + */ +public class IntersectionFactoryHelp { + private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup(); + private final MethodHandle handle; + + public IntersectionFactoryHelp(Class clazz, Class leftSide, Class rightSide, String factoryMethod) { + try { + if (factoryMethod.isEmpty()) { + Constructor ctor = findCtor(clazz, leftSide, rightSide); + handle = LOOKUP.findConstructor(clazz, MethodType.methodType(void.class, ctor.getParameterTypes())); + } else { + Method method = findMethod(clazz, factoryMethod, leftSide, rightSide); + handle = LOOKUP.findStatic(clazz, method.getName(), MethodType.methodType(method.getReturnType(), method.getParameterTypes())); + } + } catch (NoSuchMethodException | IllegalAccessException e) { + throw new RuntimeException("The factory" + clazz.getName() + + " must define a public constructor or static factory method that accepts (" + leftSide.getName() + ", " + rightSide.getName() + ")", e); + } + } + + private Constructor findCtor(Class clazz, Class leftSide, Class rightSide) throws NoSuchMethodException { + for (Constructor constructor : clazz.getConstructors()) { + Class[] types = constructor.getParameterTypes(); + if (types.length == 2) { + // we are only interested in ctors with 2 arguments + if (types[0].isAssignableFrom(leftSide) && types[1].isAssignableFrom(rightSide)) { + return constructor; + } + } + } + throw new NoSuchMethodException("Could not find valid constructor"); + } + + private Method findMethod(Class clazz, String methodName, Class leftSide, Class rightSide) throws NoSuchMethodException { + for (Method method : clazz.getMethods()) { + Class[] types = method.getParameterTypes(); + if (types.length == 2 && method.getName().equals(methodName)) { + // we are only interested in ctors with 2 arguments + if (types[0].isAssignableFrom(leftSide) && types[1].isAssignableFrom(rightSide)) { + return method; + } + } + } + throw new NoSuchMethodException("Could not find valid method"); + } + + public Object invoke(Object left, Object right) { + try { + return handle.invoke(left, right); + } catch (Throwable e) { + throw new RuntimeException("Unexpected error creating Intersection bean", e); + } + } +} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java index d4021adeaa..f47576d5ed 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/IntersectionRow.java @@ -65,7 +65,7 @@ public SpiSqlUpdate createInsert(SpiEbeanServer server) { return new DefaultSqlUpdate(server, sb.toString(), bindParams); } - public SpiSqlUpdate createDelete(SpiEbeanServer server, DeleteMode deleteMode) { + public SpiSqlUpdate createDelete(SpiEbeanServer server, DeleteMode deleteMode, String extraWhere) { BindParams bindParams = new BindParams(); StringBuilder sb = new StringBuilder(); if (deleteMode.isHard()) { @@ -89,17 +89,34 @@ public SpiSqlUpdate createDelete(SpiEbeanServer server, DeleteMode deleteMode) { bindParams.setParameter(++count, bindValue); } } + addExtraWhere(sb, extraWhere); + return new DefaultSqlUpdate(server, sb.toString(), bindParams); } - public SpiSqlUpdate createDeleteChildren(SpiEbeanServer server) { + + public SpiSqlUpdate createDeleteChildren(SpiEbeanServer server, String extraWhere) { BindParams bindParams = new BindParams(); StringBuilder sb = new StringBuilder(); sb.append("delete from ").append(tableName).append(" where "); setBindParams(bindParams, sb); + addExtraWhere(sb, extraWhere); return new DefaultSqlUpdate(server, sb.toString(), bindParams); } + private void addExtraWhere(StringBuilder sb, String extraWhere) { + if (extraWhere != null) { + if (extraWhere.indexOf("${ta}") == -1) { + // no table alias append ${mta} to query. + sb.append(" and ").append(extraWhere.replace("${mta}", tableName)); + } else if (extraWhere.indexOf("${mta}") != -1) { + // we have a table alias - this is not interesting for deletion. + // but if have also a m2m table alias - this is a problem now! + throw new UnsupportedOperationException("extraWhere \'" + extraWhere + "\' has both ${ta} and ${mta} - this is not yet supported"); + } + } + } + private int setBindParams(BindParams bindParams, StringBuilder sb) { int count = 0; for (Map.Entry entry : values.entrySet()) { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 41719fa28f..0bd53816fa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -36,6 +36,13 @@ public class DeployBeanDescriptor implements DeployBeanDescriptorMeta { private static final Map EMPTY_RAW_MAP = new HashMap<>(); + /** + * Returns true, if the table is managed (i.e. an existing m2m relation). + */ + public boolean isTableManaged(String tableName) { + return manager.isTableManaged(tableName); + } + private static class PropOrder implements Comparator { @Override diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java index c201308e2d..45f61b77ee 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocMany.java @@ -2,6 +2,7 @@ import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebeaninternal.server.deploy.BeanDescriptor; +import io.ebeaninternal.server.deploy.IntersectionFactoryHelp; import io.ebeaninternal.server.deploy.ManyType; import io.ebeaninternal.server.deploy.TableJoin; import io.ebeaninternal.server.type.TypeReflectHelper; @@ -32,6 +33,12 @@ public class DeployBeanPropertyAssocMany extends DeployBeanPropertyAssoc { * Join for manyToMany intersection table. */ private DeployTableJoin intersectionJoin; + + /** + * Factory to create intersection beans (instead of rows). For managed intersections. + */ + private IntersectionFactoryHelp intersectionFactory; + /** * For ManyToMany this is the Inverse join used to build reference queries. */ @@ -113,6 +120,10 @@ public TableJoin createIntersectionTableJoin() { } } + public boolean isTableManaged() { + return intersectionJoin != null && desc.isTableManaged(intersectionJoin.getTable()); + } + /** * Create the immutable version of the inverse join. */ @@ -149,6 +160,20 @@ public void setInverseJoin(DeployTableJoin inverseJoin) { this.inverseJoin = inverseJoin; } + /** + * Return the intersection factory. + */ + public IntersectionFactoryHelp getIntersectionFactory() { + return intersectionFactory; + } + + /** + * Sets the intersection factory. + */ + public void setIntersectionFactory(IntersectionFactoryHelp intersectionFactory) { + this.intersectionFactory = intersectionFactory; + } + /** * Return the order by clause used to order the fetching of the data for * this list, set or map. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index 5bcd077c10..cfcfd1609a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -4,15 +4,13 @@ import io.ebean.annotation.FetchPreference; import io.ebean.annotation.HistoryExclude; import io.ebean.annotation.Where; +import io.ebean.annotation.ext.IntersectionFactory; import io.ebean.bean.BeanCollection.ModifyListenMode; import io.ebean.config.NamingConvention; import io.ebean.config.TableName; import io.ebean.core.type.ScalarType; import io.ebean.util.CamelCaseHelper; -import io.ebeaninternal.server.deploy.BeanDescriptorManager; -import io.ebeaninternal.server.deploy.BeanProperty; -import io.ebeaninternal.server.deploy.BeanTable; -import io.ebeaninternal.server.deploy.PropertyForeignKey; +import io.ebeaninternal.server.deploy.*; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocMany; @@ -128,6 +126,11 @@ private void read(DeployBeanPropertyAssocMany prop) { prop.getTableJoin().addJoinColumn(util, true, joinColumns, beanTable); } + IntersectionFactory intersectionFactory = get(prop, IntersectionFactory.class); + if (intersectionFactory != null) { + readIntersectionFactory(prop, intersectionFactory); + } + JoinTable joinTable = get(prop, JoinTable.class); if (joinTable != null) { if (prop.isManyToMany()) { @@ -165,6 +168,12 @@ private void read(DeployBeanPropertyAssocMany prop) { } } + private void readIntersectionFactory(DeployBeanPropertyAssocMany prop, IntersectionFactory factory) { + Class leftSide = descriptor.getBeanType(); + Class rightSide = prop.getPropertyType(); + prop.setIntersectionFactory(new IntersectionFactoryHelp(factory.value(), leftSide, rightSide, factory.factoryMethod())); + } + private void checkSelfManyToMany(DeployBeanPropertyAssocMany prop) { if (prop.getTargetType().equals(descriptor.getBeanType())) { throw new IllegalStateException("@ManyToMany mapping for " + prop + " requires explicit @JoinTable with joinColumns & inverseJoinColumns. Refer issue #2157"); diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java index 8c81147ea6..a870e9c565 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/DefaultPersister.java @@ -915,7 +915,7 @@ void deleteManyIntersection(EntityBean bean, BeanPropertyAssocMany many, SpiT private SpiSqlUpdate deleteAllIntersection(EntityBean bean, BeanPropertyAssocMany many, boolean publish) { IntersectionRow intRow = many.buildManyToManyDeleteChildren(bean, publish); - return intRow.createDeleteChildren(server); + return intRow.createDeleteChildren(server, many.extraWhere()); } /** @@ -1012,7 +1012,7 @@ void deleteManyDetails(SpiTransaction t, BeanDescriptor desc, EntityBean pare if (targetDesc.isDeleteByStatement()) { // Just delete all the children with one statement IntersectionRow intRow = many.buildManyDeleteChildren(parentBean, excludeDetailIds); - SqlUpdate sqlDelete = intRow.createDelete(server, deleteMode); + SqlUpdate sqlDelete = intRow.createDelete(server, deleteMode, many.extraWhere()); executeSqlUpdate(sqlDelete, t); } else { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index 68c446fed9..8fba9fd377 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -91,6 +91,22 @@ private boolean isSaveIntersection() { // OneToMany JoinTable return true; } + if (many.isTableManaged()) { + List tables = new ArrayList<>(3); + tables.add(many.descriptor().baseTable()); + tables.add(many.targetDescriptor().baseTable()); + tables.add(many.intersectionTableJoin().getTable()); + // put all tables in a deterministic order + tables.sort(Comparator.naturalOrder()); + + if (transaction.isSaveAssocManyIntersection(String.join("-", tables), many.descriptor().rootName())) { + // notify others, that we do save this transaction + transaction.isSaveAssocManyIntersection(many.intersectionTableJoin().getTable(), many.descriptor().rootName()); + return true; + } else { + return false; + } + } return transaction.isSaveAssocManyIntersection(many.intersectionTableJoin().getTable(), many.descriptor().rootName()); } @@ -287,14 +303,16 @@ private void saveAssocManyIntersection(boolean queue) { } transaction.depth(+1); + boolean needsFlush = false; if (deletions != null && !deletions.isEmpty()) { for (Object other : deletions) { EntityBean otherDelete = (EntityBean) other; // the object from the 'other' side of the ManyToMany // build a intersection row for 'delete' IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherDelete, publish); - SpiSqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD); + SpiSqlUpdate sqlDelete = intRow.createDelete(server, DeleteMode.HARD, many.extraWhere()); persister.executeOrQueue(sqlDelete, transaction, queue, BatchControl.DELETE_QUEUE); + needsFlush = true; } } if (additions != null && !additions.isEmpty()) { @@ -309,7 +327,22 @@ private void saveAssocManyIntersection(boolean queue) { CoreLog.log.log(WARNING, msg); } else { if (!many.hasImportedId(otherBean)) { - throw new PersistenceException("ManyToMany bean does not have an Id value? " + otherBean); + throw new PersistenceException("ManyToMany bean " + otherBean + " does not have an Id value."); + } else if (many.getIntersectionFactory() != null) { + // build a intersection bean for 'insert' + // They need to be executed very late and would normally go to Queue#2, but we do not have + // a SpiSqlUpdate for now. + if (needsFlush) { + transaction.flushBatchOnCascade(); + } + if (queue) { + transaction.depth(+100); + } + Object intersectionBean = many.getIntersectionFactory().invoke(parentBean, otherBean); + persister.saveRecurse((EntityBean) intersectionBean, transaction, parentBean, request.flags()); + if (queue) { + transaction.depth(-100); + } } else { // build a intersection row for 'insert' IntersectionRow intRow = many.buildManyToManyMapBean(parentBean, otherBean, publish); diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java index 28e7636a49..c048d4ac79 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java @@ -7,8 +7,8 @@ import javax.persistence.ManyToOne; @Entity -@Index(unique = true, columnNames = { "from_id", "to_id" }) -@Index(unique = true, columnNames = { "to_id", "from_id" }) +@Index(unique = true, columnNames = {"from_id", "to_id"}) +@Index(unique = true, columnNames = {"to_id", "from_id"}) public class MnyEdge { @Id @@ -20,6 +20,22 @@ public class MnyEdge { @ManyToOne private MnyNode to; + + public MnyEdge() { +// default + } + + public MnyEdge(Object from, Object to) { + this.from = (MnyNode) from; + this.to = (MnyNode) to; + this.id = this.from.id * 10000 + this.to.id; + this.flags = this.from.id + this.to.id; + } + + public static MnyEdge createReverseRelation(Object to, MnyNode from) { + return new MnyEdge(from, to); + } + private int flags; public Integer getId() { diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java index fabb580403..71444320fe 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java @@ -3,6 +3,7 @@ import io.ebean.annotation.Identity; import io.ebean.annotation.Platform; import io.ebean.annotation.Where; +import io.ebean.annotation.ext.IntersectionFactory; import javax.persistence.*; import java.util.List; @@ -16,16 +17,19 @@ public class MnyNode { String name; - @ManyToMany + @ManyToMany(cascade = CascadeType.ALL) @JoinTable(name = "mny_edge", joinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id")) + @IntersectionFactory(MnyEdge.class) + @Where(clause = "${mta}.flags != 12345 and '${dbTableName}' = 'mny_node'") List allRelations; - @ManyToMany + @ManyToMany(cascade = CascadeType.ALL) @JoinTable(name = "mny_edge", joinColumns = @JoinColumn(name = "to_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "from_id", referencedColumnName = "id")) + @IntersectionFactory(value =MnyEdge.class, factoryMethod = "createReverseRelation") List allReverseRelations; @ManyToMany diff --git a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java index d9ac37ffcc..2557d35e72 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/TestM2MWithWhere.java @@ -1,8 +1,8 @@ package org.tests.model.m2m; -import io.ebean.xtest.BaseTestCase; import io.ebean.DB; import io.ebean.test.LoggedSql; +import io.ebean.xtest.BaseTestCase; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; @@ -14,10 +14,78 @@ * Tests M2M with complex where queries. * * @author Roland Praml, FOCONIS AG - * */ public class TestM2MWithWhere extends BaseTestCase { + @Test + public void testModify() throws Exception { + + MnyNode node1 = new MnyNode(); + node1.setName("node1"); + node1.setId(111); + MnyNode node2 = new MnyNode(); + node2.setName("node2"); + node2.setId(222); + MnyNode node3 = new MnyNode(); + node3.setName("node3"); + node3.setId(333); + MnyNode node4 = new MnyNode(); + node4.setName("node4"); + node4.setId(444); + + node1.getAllReverseRelations().add(node2); + node1.getAllRelations().add(node2); + node2.getAllRelations().add(node3); + node3.getAllRelations().add(node4); + DB.save(node1); + DB.save(node1); + + DB.refresh(node2); + DB.refresh(node3); + assertThat(node2.getAllRelations()).containsExactlyInAnyOrder(node1, node3); + assertThat(node3.getAllReverseRelations()).containsExactlyInAnyOrder(node2); + + DB.refresh(node1); + node1.getAllReverseRelations().clear(); + System.out.println("Clearing"); + DB.save(node1); + DB.refresh(node2); + assertThat(node2.getAllRelations()).containsExactlyInAnyOrder(node3); + + node2.getAllRelations().clear(); + node2.getAllRelations().add(node3); + LoggedSql.start(); + DB.save(node2); + LoggedSql.stop().forEach(System.out::println); + + } + + @Test + public void testAccessAndModify() throws Exception { + createTestData(); + + MnyNode node = DB.find(MnyNode.class, 1); + node.setName("fooBarBaz"); + MnyNode removed = node.getAllRelations().remove(0); + + LoggedSql.start(); + DB.save(node); + List sql = LoggedSql.stop(); + assertThat(sql).hasSize(3); + assertThat(sql.get(0)).contains("update mny_node set name=? where id=?; -- bind(fooBarBaz"); + assertThat(sql.get(1)).contains("delete from mny_edge where from_id = ? and to_id = ? and mny_edge.flags != 12345 and 'mny_node' = 'mny_node'"); + assertThat(sql.get(2)).contains("-- bind"); + + node.getAllRelations().add(removed); + LoggedSql.start(); + DB.save(node); + sql = LoggedSql.stop(); + assertThat(sql).hasSize(2); + assertThat(sql.get(0)).contains("insert into mny_edge (id, flags, from_id, to_id) values (?,?,?,?)"); + assertThat(sql.get(1)).contains("-- bind"); + + } + @Test public void testQuery() throws Exception { createTestData(); @@ -70,9 +138,9 @@ public void testGetter() throws Exception { // prefetch everything LoggedSql.start(); node = DB.find(MnyNode.class) - .fetch("bit1Relations","*") - .fetch("bit1ReverseRelations","*") - .where().idEq(3).findOne(); + .fetch("bit1Relations", "*") + .fetch("bit1ReverseRelations", "*") + .where().idEq(3).findOne(); sqls = LoggedSql.stop(); assertThat(sqls).hasSize(2); From 14e8af46f4590ada88184b01f3a87b988b8055c3 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 10 Aug 2023 16:17:48 +0200 Subject: [PATCH 030/123] NOPR - FOCONIS specific notes --- README.md | 33 ++++++++++++------------ release.md | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 16 deletions(-) create mode 100644 release.md diff --git a/README.md b/README.md index 5f7fd0828c..5317b8dedb 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,26 @@ -[![Build](https://github.com/ebean-orm/ebean/actions/workflows/build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/build.yml) +[![Build](https://github.com/FOCONIS/ebean/actions/workflows/build.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/build.yml) [![Maven Central : ebean](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.ebean/ebean) -[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/ebean-orm/ebean/blob/master/LICENSE) -[![Multi-JDK Build](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/multi-jdk-build.yml) +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/FOCONIS/ebean/blob/master/LICENSE) +[![Multi-JDK Build](https://github.com/FOCONIS/ebean/actions/workflows/multi-jdk-build.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/multi-jdk-build.yml) ##### Build with database platforms -[![H2Database](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/h2database.yml) -[![Postgres](https://github.com/ebean-orm/ebean/actions/workflows/postgres.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/postgres.yml) -[![MySql](https://github.com/ebean-orm/ebean/actions/workflows/mysql.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/mysql.yml) -[![MariaDB](https://github.com/ebean-orm/ebean/actions/workflows/mariadb.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/mariadb.yml) -[![Oracle](https://github.com/ebean-orm/ebean/actions/workflows/oracle.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/oracle.yml) -[![SqlServer](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver.yml) -[![DB2 LUW](https://github.com/ebean-orm/ebean/actions/workflows/db2luw.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/db2luw.yml) -[![Yugabyte](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/yugabyte.yml) +[![H2Database](https://github.com/FOCONIS/ebean/actions/workflows/h2database.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/h2database.yml) +[![Postgres](https://github.com/FOCONIS/ebean/actions/workflows/postgres.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/postgres.yml) +[![MySql](https://github.com/FOCONIS/ebean/actions/workflows/mysql.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/mysql.yml) +[![MariaDB](https://github.com/FOCONIS/ebean/actions/workflows/mariadb.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/mariadb.yml) +[![Oracle](https://github.com/FOCONIS/ebean/actions/workflows/oracle.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/oracle.yml) +[![SqlServer](https://github.com/FOCONIS/ebean/actions/workflows/sqlserver.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/sqlserver.yml) +[![DB2 LUW](https://github.com/FOCONIS/ebean/actions/workflows/db2luw.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/db2luw.yml) +[![Yugabyte](https://github.com/FOCONIS/ebean/actions/workflows/yugabyte.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/yugabyte.yml) + ##### Build with Java Early Access versions -[![ebean EA](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-ea.yml) -[![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) +[![ebean EA](https://github.com/FOCONIS/ebean/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/FOCONIS/ebean/actions/workflows/jdk-ea.yml) +[![datasource EA](https://github.com/FOCONIS/ebean-datasource/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/FOCONIS/ebean-datasource/actions/workflows/jdk-ea.yml) +[![migration EA](https://github.com/FOCONIS/ebean-migration/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/FOCONIS/ebean-migration/actions/workflows/jdk-ea.yml) +[![test-docker EA](https://github.com/FOCONIS/ebean-test-docker/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/FOCONIS/ebean-test-docker/actions/workflows/jdk-ea.yml) +[![ebean-agent EA](https://github.com/FOCONIS/ebean-agent/actions/workflows/jdk-ea.yml/badge.svg)](https://github.com/FOCONIS/ebean-agent/actions/workflows/jdk-ea.yml) ---------------------- diff --git a/release.md b/release.md new file mode 100644 index 0000000000..0083b5ae3e --- /dev/null +++ b/release.md @@ -0,0 +1,75 @@ +## Merge back Robs master: + + +```bash +# First sync version to non-foc version. Version must be equal with rob's branch: +mvn versions:set -DgenerateBackupPoms=false -DnewVersion=13.x.x-SNAPSHOT +git commit -am "Sync version to upstream" + +# add remote (one time step) +git remote add upstream git@github.com:ebean-orm/ebean.git + +git fetch upstream +git merge upstream/master +``` +Now resolve all merge conflicts + +```bash +# Set back to foc-version +mvn versions:set -DgenerateBackupPoms=false -DnewVersion=13.x.x-FOCx-SNAPSHOT +``` + +Then check, if all -SNAPSHOT versions are foc-version + + +## Release command + + +We @foconis use this command to release. + +```bash +mvn release:prepare release:perform -Darguments="-Dgpg.skip -DskipTests" -Pfoconis +``` + +### Build releases for github and/or jakarta + +First, checkout latest release commit with +```bash +git checkout HEAD~1 +``` + +Build github release: + +```bash +mvn clean source:jar deploy -DskipTests -Pgithub -T 8 +``` + +Switch to Jakarta: + +```bash +export EBEAN_VERSION=$(grep "13" pom.xml | awk -F '[<>]' '{print $3}') +# first, set to snapshot, because of kotlin +mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${EBEAN_VERSION}-SNAPSHOT -Pjdk16plus -Pjdk15less +mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${EBEAN_VERSION}-jakarta -Pjdk16plus -Pjdk15less +./javax-to-jakarta.sh +mvn clean source:jar deploy -DskipTests -Pfoconis -T 8 +mvn clean source:jar deploy -DskipTests -Pgithub -T 8 +# do not commit, switch back to master +git switch -f master +``` + +## Fix POMs after release + +After a release, you may have to fix poms with + +```bash +mvn versions:update-parent -DallowSnapshots=true -DgenerateBackupPoms=false -Pjdk16plus -Pjdk15less +``` + + # wenn es Probleme mit Versionen gibt, dann manuell ebean-kotlin/pom.xml, tests/test-java16/pom.xml und tests/test-kotlin/pom.xml, usw. anpassen + # wenn es bei kotlin-querybean-generator krachts, dann den Modul auskommentieren oder Modul auslassen und mit ... -rf :NÄCHSTE-MODUL weitermachen + +## generate Java classes from .xsd: + + export JAVA_TOOL_OPTIONS="-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8" + /c/Program\ Files/Java/jdk1.8.0_201/bin/xjc.exe src/main/resources/ebean-dbmigration-1.0.xsd -d src/main/java -p io.ebeaninternal.dbmigration.migration From ac70e91bf8bca4490aadc897e81c699b75bdefa6 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 11 Aug 2023 10:21:13 +0200 Subject: [PATCH 031/123] Bump version to 13.20.2-FOC1 --- 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 | 12 +++---- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-bom/pom.xml | 50 ++++++++++++++--------------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 12 +++---- ebean-ddl-generator/pom.xml | 8 ++--- ebean-jackson-mapper/pom.xml | 4 +-- ebean-postgis/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++--- ebean-redis/pom.xml | 12 +++---- ebean-spring-txn/pom.xml | 6 ++-- ebean-test/pom.xml | 12 +++---- kotlin-querybean-generator/pom.xml | 10 +++--- 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/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 6 ++-- 47 files changed, 192 insertions(+), 192 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index c77909aaae..977c2b98d3 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-clickhouse @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index 496d0e6640..fa20e6ca75 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-cockroach @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index d57007b215..d677d3069e 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-db2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-db2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 634f732d6c..73a56ebe0d 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-h2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index ecccce048c..2ec64823f1 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-hana @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-hana - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 7f1c04a614..fd039855ab 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-mariadb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index c233fb3503..8228fe54d8 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-mysql @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-mysql - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index e29000c69e..7b42e2764e 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-nuodb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index 3fff3d391e..42178462b6 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-oracle @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-oracle - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index d4c381329a..a55ac8c41f 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-postgres @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index af3d8e47e9..e2d0ffacca 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-sqlite @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index cd145dd559..be7993467e 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-sqlserver @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index 93b0d93dcb..1e06886ad4 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-yugabyte @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 60ceaf76d8..9c10355069 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean (all platforms) @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -40,7 +40,7 @@ io.ebean ebean-jackson-mapper - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -59,13 +59,13 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-all - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/composites/pom.xml b/composites/pom.xml index a1450dab1b..5c3cef9cef 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 0cf83d66ec..89baf31781 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 7f03eabb10..b886fbe023 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core-type - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-ddl-generator - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -155,46 +155,46 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean querybean-generator - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided io.ebean kotlin-querybean-generator - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean ebean-postgis - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-redis - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-spring-txn - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-db2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-h2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-hana - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-mariadb - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-mysql - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-nuodb - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-oracle - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-postgres - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-sqlite - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-sqlserver - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 6cd51fa429..718d88799f 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e82a86651d..a115143e2a 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 870fa3bca4..2f43951a5f 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index e9a95e6e8b..bcfae78e32 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index ecda45e7dd..6e4249aac9 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index e874d5b8a8..447bfbcef2 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean querybean-generator - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index ae7c521124..25e7f30453 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean querybean-generator - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 4f770e556d..c3461cf85b 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index b0d81c4ef7..c4b76dc782 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean ebean-platform-all - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index fabeffce6c..e50b49d3e5 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test io.ebean ebean-ddl-generator - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index ba4cb040e2..e3af90bc40 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-db2 - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-hana - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-mysql - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-oracle - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 21fc23cebc..a2251108a4 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 17a4d9909b..13a0a1aeb1 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 02c37a46c6..8e4cabb339 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-SNAPSHOT + 13.20.2-FOC1-SNAPSHOT @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-db2 - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-h2 - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-hana - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-mariadb - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-mysql - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-nuodb - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-oracle - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-postgres - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-sqlite - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-sqlserver - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 718d88799f..66e310a4c1 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index a115143e2a..53b3f6c2f6 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.20.2-FOC1 io.ebean ebean-api - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test io.ebean ebean-platform-postgres - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test io.ebean ebean-platform-sqlserver - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 2f43951a5f..cd4bd0c909 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided io.ebean ebean-core - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index bcfae78e32..248283d734 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 6e4249aac9..c27b8a7f6e 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-core - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 447bfbcef2..6636298711 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test io.ebean querybean-generator - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test io.ebean ebean-test - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 25e7f30453..da17e9b601 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided io.ebean ebean-core - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided io.ebean ebean-querybean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test io.ebean querybean-generator - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test io.ebean ebean-test - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index c3461cf85b..b6125dca62 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index c4b76dc782..0d258ede25 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-core - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 provided io.ebean ebean-ddl-generator - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test io.ebean ebean-platform-all - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index e50b49d3e5..6608be05b4 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test io.ebean ebean-ddl-generator - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index e3af90bc40..30d410e397 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-clickhouse - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-db2 - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-hana - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-hsqldb - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-mysql - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-mariadb - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-nuodb - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-oracle - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-postgres - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-sqlanywhere - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-sqlite - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 io.ebean ebean-platform-sqlserver - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index a2251108a4..4cff61f8a6 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 13a0a1aeb1..8e6d59157b 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 8e4cabb339..039990a26f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC1-SNAPSHOT + 13.20.2-FOC1 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-db2 - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-h2 - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-hana - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-mariadb - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-mysql - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-nuodb - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-oracle - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-postgres - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-sqlite - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-sqlserver - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 66e310a4c1..bc2b0feb1f 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 53b3f6c2f6..5f1fb46388 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.20.2-FOC1 + HEAD io.ebean ebean-api - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test io.ebean ebean-platform-postgres - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index cd4bd0c909..a5728f7eff 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided io.ebean ebean-core - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 248283d734..91cfbbd13d 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index c27b8a7f6e..7ba5c3e76f 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-core - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 6636298711..d8c9bbf702 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test io.ebean querybean-generator - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test io.ebean ebean-test - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index da17e9b601..c0e130c77e 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided io.ebean ebean-core - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided io.ebean ebean-querybean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test io.ebean querybean-generator - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test io.ebean ebean-test - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index b6125dca62..dd8a35f761 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 0d258ede25..68780ced87 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-core - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test io.ebean ebean-platform-all - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 6608be05b4..32499dee95 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test io.ebean ebean-ddl-generator - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 30d410e397..2d0ddd2861 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-db2 - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-hana - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-mysql - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-mariadb - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-nuodb - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-oracle - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-sqlite - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 4cff61f8a6..173797555c 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 8e6d59157b..fb1fc062a1 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 039990a26f..8090e3ee36 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC1 + 13.20.2-FOC2-SNAPSHOT @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-db2 - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-h2 - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-hana - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-mariadb - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-mysql - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-nuodb - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-oracle - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-postgres - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-sqlite - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-sqlserver - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index bc2b0feb1f..8f0af9416d 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 5f1fb46388..daadda41f7 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.20.2-FOC2 io.ebean ebean-api - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test io.ebean ebean-platform-postgres - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test io.ebean ebean-platform-sqlserver - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index a5728f7eff..5430b84941 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided io.ebean ebean-core - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 91cfbbd13d..1d71a9153f 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 7ba5c3e76f..3502da69a8 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-core - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index d8c9bbf702..5d98d12dde 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test io.ebean querybean-generator - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test io.ebean ebean-test - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index c0e130c77e..f50c9ecd24 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided io.ebean ebean-core - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided io.ebean ebean-querybean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test io.ebean querybean-generator - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test io.ebean ebean-test - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index dd8a35f761..350ac2bc99 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 68780ced87..751cb1aef5 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-core - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 provided io.ebean ebean-ddl-generator - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test io.ebean ebean-platform-all - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 32499dee95..3eb158b267 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test io.ebean ebean-ddl-generator - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 2d0ddd2861..9726f96337 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-clickhouse - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-db2 - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-hana - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-hsqldb - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-mysql - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-mariadb - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-nuodb - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-oracle - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-postgres - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-sqlanywhere - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-sqlite - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 io.ebean ebean-platform-sqlserver - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 173797555c..c99af5bb32 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index fb1fc062a1..894c34a5f2 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 8090e3ee36..568d2f0121 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC2-SNAPSHOT + 13.20.2-FOC2 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-db2 - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-h2 - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-hana - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-mariadb - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-mysql - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-nuodb - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-oracle - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-postgres - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-sqlite - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-sqlserver - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 8f0af9416d..2e3b461f1a 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index daadda41f7..dd4ccc4782 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.20.2-FOC2 + HEAD io.ebean ebean-api - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test io.ebean ebean-platform-postgres - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 5430b84941..cdcdbfd0ce 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided io.ebean ebean-core - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 1d71a9153f..4adbd54c53 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 3502da69a8..e3450accc7 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-core - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 5d98d12dde..ca82737ac9 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test io.ebean querybean-generator - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test io.ebean ebean-test - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index f50c9ecd24..9048014633 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided io.ebean ebean-core - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided io.ebean ebean-querybean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test io.ebean querybean-generator - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test io.ebean ebean-test - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 350ac2bc99..c7d540cfb1 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 751cb1aef5..df34bddea6 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-core - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test io.ebean ebean-platform-all - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 3eb158b267..002b09a924 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test io.ebean ebean-ddl-generator - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 9726f96337..d387fcabf5 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-db2 - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-hana - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-mysql - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-mariadb - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-nuodb - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-oracle - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-sqlite - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index c99af5bb32..ce0370701c 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 894c34a5f2..cea9344193 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 568d2f0121..f3fd5e4e7e 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC2 + 13.20.2-FOC3-SNAPSHOT @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-db2 - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-h2 - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-hana - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-mariadb - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-mysql - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-nuodb - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-oracle - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-postgres - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-sqlite - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-sqlserver - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 2e3b461f1a..2e353563c1 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index dd4ccc4782..6b880a36c3 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.20.2-FOC3 io.ebean ebean-api - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test io.ebean ebean-platform-postgres - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test io.ebean ebean-platform-sqlserver - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index cdcdbfd0ce..5688f87762 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided io.ebean ebean-core - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 4adbd54c53..87ba483de3 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index e3450accc7..9ecf99571c 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-core - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index ca82737ac9..b8ffb54fc1 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test io.ebean querybean-generator - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test io.ebean ebean-test - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 9048014633..7ae0b8a2c4 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided io.ebean ebean-core - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided io.ebean ebean-querybean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test io.ebean querybean-generator - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test io.ebean ebean-test - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index c7d540cfb1..8e8dc1b300 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index df34bddea6..7d99ef04d4 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-core - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 provided io.ebean ebean-ddl-generator - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test io.ebean ebean-platform-all - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 002b09a924..c47d4d9369 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test io.ebean ebean-ddl-generator - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index d387fcabf5..a71c723e8f 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-clickhouse - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-db2 - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-hana - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-hsqldb - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-mysql - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-mariadb - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-nuodb - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-oracle - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-postgres - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-sqlanywhere - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-sqlite - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 io.ebean ebean-platform-sqlserver - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index ce0370701c..fd59eac65f 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index cea9344193..49537ccf4a 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index f3fd5e4e7e..bbd27f7892 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC3-SNAPSHOT + 13.20.2-FOC3 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-db2 - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-h2 - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-hana - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-mariadb - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-mysql - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-nuodb - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-oracle - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-postgres - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-sqlite - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-sqlserver - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 2e353563c1..e7af4a0748 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 6b880a36c3..7bccbab2e1 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.20.2-FOC3 + HEAD io.ebean ebean-api - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test io.ebean ebean-platform-postgres - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 5688f87762..5f87ea832b 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided io.ebean ebean-core - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 87ba483de3..bb95b55e5a 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 9ecf99571c..e3802f68b7 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-core - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index b8ffb54fc1..0a49c018e3 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test io.ebean querybean-generator - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test io.ebean ebean-test - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 7ae0b8a2c4..98dacb4720 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided io.ebean ebean-core - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided io.ebean ebean-querybean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test io.ebean querybean-generator - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test io.ebean ebean-test - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 8e8dc1b300..748689bc29 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 7d99ef04d4..f1825820bc 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-core - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test io.ebean ebean-platform-all - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index c47d4d9369..033fb3c142 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test io.ebean ebean-ddl-generator - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index a71c723e8f..2890799f1f 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-db2 - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-hana - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-mysql - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-mariadb - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-nuodb - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-oracle - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-postgres - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-sqlite - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index fd59eac65f..dbd0cee7b2 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 49537ccf4a..8a36a91aa3 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index bbd27f7892..1691d3c09f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC3 + 13.20.2-FOC4-SNAPSHOT + - + jakarta.servlet jakarta.servlet-api 6.0.0 true - ____ JAKARTA-DEPENDENCY-END --> + io.avaje diff --git a/ebean-api/src/main/java/io/ebean/AcquireLockException.java b/ebean-api/src/main/java/io/ebean/AcquireLockException.java index bc6e638ff0..807fb346cb 100644 --- a/ebean-api/src/main/java/io/ebean/AcquireLockException.java +++ b/ebean-api/src/main/java/io/ebean/AcquireLockException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PessimisticLockException; +import jakarta.persistence.PessimisticLockException; /** * Thrown when failing to acquire a pessimistic lock. diff --git a/ebean-api/src/main/java/io/ebean/DB.java b/ebean-api/src/main/java/io/ebean/DB.java index d885fb5150..51d5ad27ca 100644 --- a/ebean-api/src/main/java/io/ebean/DB.java +++ b/ebean-api/src/main/java/io/ebean/DB.java @@ -7,8 +7,8 @@ import io.ebean.plugin.Property; import io.ebean.text.json.JsonContext; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.util.*; import java.util.concurrent.Callable; diff --git a/ebean-api/src/main/java/io/ebean/DataIntegrityException.java b/ebean-api/src/main/java/io/ebean/DataIntegrityException.java index 0d622313c3..495bdd3493 100644 --- a/ebean-api/src/main/java/io/ebean/DataIntegrityException.java +++ b/ebean-api/src/main/java/io/ebean/DataIntegrityException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Thrown when a foreign key constraint is enforced. diff --git a/ebean-api/src/main/java/io/ebean/Database.java b/ebean-api/src/main/java/io/ebean/Database.java index 710cfb7caa..e8f364eb8d 100644 --- a/ebean-api/src/main/java/io/ebean/Database.java +++ b/ebean-api/src/main/java/io/ebean/Database.java @@ -11,8 +11,8 @@ import io.ebean.plugin.SpiServer; import io.ebean.text.json.JsonContext; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.Collection; import java.util.List; diff --git a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java index 9696954f7a..d8d10f13ac 100644 --- a/ebean-api/src/main/java/io/ebean/DatabaseFactory.java +++ b/ebean-api/src/main/java/io/ebean/DatabaseFactory.java @@ -5,7 +5,7 @@ import io.ebean.service.SpiContainer; import io.ebean.service.SpiContainerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Iterator; import java.util.Properties; import java.util.ServiceLoader; diff --git a/ebean-api/src/main/java/io/ebean/DbContext.java b/ebean-api/src/main/java/io/ebean/DbContext.java index 31ff823c7e..a7694182ff 100644 --- a/ebean-api/src/main/java/io/ebean/DbContext.java +++ b/ebean-api/src/main/java/io/ebean/DbContext.java @@ -3,7 +3,7 @@ import io.ebean.config.BeanNotEnhancedException; import io.ebean.datasource.DataSourceConfigurationException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.HashMap; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; diff --git a/ebean-api/src/main/java/io/ebean/ExpressionList.java b/ebean-api/src/main/java/io/ebean/ExpressionList.java index c3b272da77..e0edcbca69 100644 --- a/ebean-api/src/main/java/io/ebean/ExpressionList.java +++ b/ebean-api/src/main/java/io/ebean/ExpressionList.java @@ -4,7 +4,7 @@ import io.avaje.lang.Nullable; import io.ebean.search.*; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.NonUniqueResultException; import java.sql.Connection; import java.sql.Timestamp; import java.util.*; diff --git a/ebean-api/src/main/java/io/ebean/FutureList.java b/ebean-api/src/main/java/io/ebean/FutureList.java index ad7c704851..e7c4b67b70 100644 --- a/ebean-api/src/main/java/io/ebean/FutureList.java +++ b/ebean-api/src/main/java/io/ebean/FutureList.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; diff --git a/ebean-api/src/main/java/io/ebean/PersistenceIOException.java b/ebean-api/src/main/java/io/ebean/PersistenceIOException.java index f70563252f..0b13630cde 100644 --- a/ebean-api/src/main/java/io/ebean/PersistenceIOException.java +++ b/ebean-api/src/main/java/io/ebean/PersistenceIOException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Captures and wraps IOException's occurring during ElasticSearch processing etc. diff --git a/ebean-api/src/main/java/io/ebean/Query.java b/ebean-api/src/main/java/io/ebean/Query.java index f3e39056c9..57399700ff 100644 --- a/ebean-api/src/main/java/io/ebean/Query.java +++ b/ebean-api/src/main/java/io/ebean/Query.java @@ -3,7 +3,7 @@ import io.avaje.lang.NonNullApi; import io.avaje.lang.Nullable; -import javax.persistence.NonUniqueResultException; +import jakarta.persistence.NonUniqueResultException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.Timestamp; diff --git a/ebean-api/src/main/java/io/ebean/SerializableConflictException.java b/ebean-api/src/main/java/io/ebean/SerializableConflictException.java index a1ee9fee4d..78a82acf5c 100644 --- a/ebean-api/src/main/java/io/ebean/SerializableConflictException.java +++ b/ebean-api/src/main/java/io/ebean/SerializableConflictException.java @@ -1,6 +1,6 @@ package io.ebean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; /** * Thrown at SERIALIZABLE isolation level for non-recoverable concurrent conflict. diff --git a/ebean-api/src/main/java/io/ebean/Transaction.java b/ebean-api/src/main/java/io/ebean/Transaction.java index 21ce076a8f..adaadf00c1 100644 --- a/ebean-api/src/main/java/io/ebean/Transaction.java +++ b/ebean-api/src/main/java/io/ebean/Transaction.java @@ -5,7 +5,7 @@ import io.ebean.config.DatabaseConfig; import io.ebean.config.DocStoreConfig; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; /** diff --git a/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java b/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java index b08d310683..72d9b9bd9f 100644 --- a/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java +++ b/ebean-api/src/main/java/io/ebean/bean/InterceptReadWrite.java @@ -4,8 +4,8 @@ import io.ebean.Database; import io.ebean.ValuePair; -import javax.persistence.EntityNotFoundException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.PersistenceException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java index b317ad7a52..db09f135ba 100644 --- a/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java +++ b/ebean-api/src/main/java/io/ebean/config/AbstractNamingConvention.java @@ -3,9 +3,9 @@ import io.ebean.config.dbplatform.DatabasePlatform; import io.ebean.util.AnnotationUtil; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Table; import static io.ebean.util.StringHelper.isNull; diff --git a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java index ee29020c2e..95af7653a2 100644 --- a/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/DatabaseConfig.java @@ -20,7 +20,7 @@ import io.ebean.plugin.CustomDeployParser; import io.ebean.util.StringHelper; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import javax.sql.DataSource; import java.time.Clock; import java.time.ZonedDateTime; diff --git a/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java b/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java index b0f50fb16f..8940177185 100644 --- a/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java +++ b/ebean-api/src/main/java/io/ebean/config/ScalarTypeConverter.java @@ -1,7 +1,7 @@ package io.ebean.config; /** - * Matches the functionality of javax.persistence.AttributeConverter + * Matches the functionality of jakarta.persistence.AttributeConverter *

* In general AttributeConverter should be used in preference to this * ScalarTypeConverter as it is JPA standard and offers the same functionality. diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java index 7408147018..5c4f33cc17 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/DatabasePlatform.java @@ -9,7 +9,7 @@ import io.ebean.config.PlatformConfig; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.*; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java index 246e8f1c05..8c2bc7f529 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java @@ -5,7 +5,7 @@ import io.ebean.Transaction; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java index 221bc669a5..0cf27edf65 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SimpleSequenceIdGenerator.java @@ -3,7 +3,7 @@ import io.ebean.Transaction; import io.ebean.util.JdbcClose; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java index 49fb326821..6116122fd7 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlCodeTranslator.java @@ -5,7 +5,7 @@ import io.ebean.DuplicateKeyException; import io.ebean.SerializableConflictException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collections; import java.util.Map; diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java index 061bccfb82..d74182ddf1 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SqlExceptionTranslator.java @@ -1,6 +1,6 @@ package io.ebean.config.dbplatform; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java index 7f89fccaad..ed18bd413e 100644 --- a/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java +++ b/ebean-api/src/main/java/io/ebean/event/ServletContextListener.java @@ -1,6 +1,6 @@ package io.ebean.event; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextEvent; /** * Listens for webserver server starting and stopping events. @@ -15,7 +15,7 @@ * hook that Ebean registers. *

*/ -public class ServletContextListener implements javax.servlet.ServletContextListener { +public class ServletContextListener implements jakarta.servlet.ServletContextListener { /** * The servlet container is stopping. diff --git a/ebean-api/src/main/java/module-info.java b/ebean-api/src/main/java/module-info.java index cb7f9f7c7f..4e3a7436df 100644 --- a/ebean-api/src/main/java/module-info.java +++ b/ebean-api/src/main/java/module-info.java @@ -12,7 +12,7 @@ requires transitive java.sql; requires transitive io.avaje.config; requires transitive io.avaje.lang; - requires transitive persistence.api; + requires transitive jakarta.persistence.api; requires transitive io.ebean.annotation; requires transitive io.ebean.datasource.api; requires transitive io.avaje.applog; @@ -21,7 +21,7 @@ requires static io.ebean.types; requires static com.fasterxml.jackson.core; requires static com.fasterxml.jackson.databind; - requires static javax.servlet.api; + requires static jakarta.servlet; exports io.ebean; exports io.ebean.bean; diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 4c19b34d40..7a5a500902 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -20,7 +20,7 @@ io.ebean - persistence-api + jakarta-persistence-api ${ebean-persistence-api.version} diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 7bccbab2e1..cc65888615 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -81,15 +81,15 @@ provided - + - + jakarta.transaction jakarta.transaction-api @@ -102,7 +102,7 @@ 4.0.1 provided - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java index c078fa55c5..ca2cf7dde0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/ScopedTransaction.java @@ -3,7 +3,7 @@ import io.ebeaninternal.server.transaction.TransactionScopeManager; import io.ebeaninternal.server.util.ArrayStack; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Manage scoped (typically thread local) transactions. diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java index 10a53b9a7d..1bdadede13 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiCancelableQuery.java @@ -1,6 +1,6 @@ package io.ebeaninternal.api; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import io.ebean.CancelableQuery; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java index db192fa5c6..e045ca139e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransaction.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.transaction.ProfileStream; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java index 4ccce3ee4a..c1f8c55c84 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiTransactionProxy.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.transaction.ProfileStream; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java index 06916912c0..77dfcc3f59 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java @@ -7,7 +7,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.util.UrlHelper; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.*; import java.net.URL; import java.nio.file.Path; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java index 8fa1093be9..a0e56dd128 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DatabasePlatformFactory.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.CoreLog; import io.ebeaninternal.api.DbOffline; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java index c197909096..e3164cfcc7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultBeanLoader.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static java.lang.System.Logger.Level.DEBUG; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java index 3fab82bd09..a7adf02f65 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultContainer.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.core.bootup.BootupClasses; import io.ebeaninternal.server.executor.DefaultBackgroundExecutor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.net.URL; import java.sql.Connection; import java.sql.SQLException; 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 662c4ce42e..43bc753186 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 @@ -47,10 +47,10 @@ import io.ebeaninternal.util.ParamTypeHelper.TypeInfo; import io.ebeanservice.docstore.api.DocStoreIntegration; -import javax.persistence.EntityNotFoundException; -import javax.persistence.NonUniqueResultException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.NonUniqueResultException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java index 7dddf0d124..9d788dfec2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/InitDataSource.java @@ -7,7 +7,7 @@ import io.ebean.datasource.DataSourceFactory; import io.ebean.datasource.DataSourcePoolListener; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java index d29beebe03..68a8aa1405 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryEngine.java @@ -4,7 +4,7 @@ import io.ebean.Version; import io.ebean.bean.BeanCollection; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java index 697730b7a4..08698aaa5e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/OrmQueryRequest.java @@ -18,7 +18,7 @@ import io.ebeaninternal.server.query.CQueryPlan; import io.ebeaninternal.server.transaction.DefaultPersistenceContext; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.*; import java.util.function.Consumer; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java index 315fb5484c..afba654a39 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequest.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.persist.BatchedSqlException; import io.ebeaninternal.server.persist.PersistExecute; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java index 73daf4412d..aee51fbec0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/PersistRequestBean.java @@ -20,9 +20,9 @@ import io.ebeanservice.docstore.api.DocStoreUpdateContext; import io.ebeanservice.docstore.api.DocStoreUpdates; -import javax.persistence.EntityNotFoundException; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.Statement; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java index 660644512e..1a05201e8d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/bootup/BootupClasses.java @@ -16,10 +16,10 @@ import io.ebean.util.AnnotationUtil; import io.ebeaninternal.api.CoreLog; -import javax.persistence.AttributeConverter; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java index 4c0672a359..e12ba14c1f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCascadeInfo.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; /** * Persist info for determining if save or delete should be performed. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java index 35ff6003e0..72abcd3359 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanCollectionUtil.java @@ -2,7 +2,7 @@ import io.ebean.bean.BeanCollection; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collection; import java.util.Map; 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 b9a3b594e5..bd55ceebbd 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 @@ -55,7 +55,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.mapping.DocumentMapping; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.io.StringWriter; import java.lang.reflect.Modifier; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 10604b2dde..281118a5e9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -42,9 +42,9 @@ import io.ebeanservice.docstore.api.DocStoreBeanAdapter; import io.ebeanservice.docstore.api.DocStoreFactory; -import javax.persistence.MappedSuperclass; -import javax.persistence.PersistenceException; -import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Transient; import javax.sql.DataSource; import java.io.Serializable; import java.lang.reflect.Field; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java index d5c303dcb7..a7c50c85e4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanEmbeddedMetaFactory.java @@ -3,7 +3,7 @@ import io.ebean.config.BeanNotRegisteredException; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.Map; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java index e9d9c53726..7676814f55 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanLifecycleAdapterFactory.java @@ -10,14 +10,14 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; import javax.annotation.PostConstruct; -import javax.persistence.PersistenceException; -import javax.persistence.PostLoad; -import javax.persistence.PostPersist; -import javax.persistence.PostRemove; -import javax.persistence.PostUpdate; -import javax.persistence.PrePersist; -import javax.persistence.PreRemove; -import javax.persistence.PreUpdate; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.PostLoad; +import jakarta.persistence.PostPersist; +import jakarta.persistence.PostRemove; +import jakarta.persistence.PostUpdate; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreRemove; +import jakarta.persistence.PreUpdate; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java index 752c246b99..8be0564642 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanProperty.java @@ -41,7 +41,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; import io.ebeanservice.docstore.api.support.DocStructure; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java index 1cc67ee152..3e69c36b6c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssoc.java @@ -26,7 +26,7 @@ import io.ebeanservice.docstore.api.mapping.DocPropertyMapping; import io.ebeanservice.docstore.api.support.DocStructure; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java index 38ae95aed1..200c7dd2fb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocMany.java @@ -21,7 +21,7 @@ import io.ebeaninternal.server.query.STreePropertyAssocMany; import io.ebeaninternal.server.query.SqlBeanLoad; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.io.StringWriter; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java index 44742cbb52..88c8eb0682 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyAssocOne.java @@ -27,7 +27,7 @@ import io.ebeaninternal.server.query.SqlBeanLoad; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java index 6593186a62..fa91c78740 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonBasic.java @@ -5,7 +5,7 @@ import io.ebean.text.TextException; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java index bb234664fc..26a0de2c83 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanPropertyJsonMapper.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import io.ebeaninternal.server.util.Checksum; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Objects; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java index 3634123e2b..8931819a8d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/DynamicPropertyAggregationFormula.java @@ -4,7 +4,7 @@ import io.ebean.core.type.ScalarType; import io.ebeaninternal.server.query.SqlBeanLoad; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Dynamic property based on aggregation (max, min, avg, count). diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java index e72d7463dd..65e0a0675e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/InheritInfo.java @@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.parse.DeployInheritInfo; import io.ebeaninternal.server.query.SqlTreeProperties; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.lang.reflect.Modifier; import java.sql.SQLException; import java.util.ArrayList; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java index 1a1c5651f8..fd92e1349a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/PersistenceContextUtil.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * Utility to find the root bean type. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java index e08582257d..c4da8e680a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/CounterFactory.java @@ -2,7 +2,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java index bb9dbc5f99..8ff0320bc9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/InsertTimestampFactory.java @@ -3,7 +3,7 @@ import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java index f8dc413b96..c99e5bb74c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/generatedproperty/UpdateTimestampFactory.java @@ -3,7 +3,7 @@ import io.ebean.config.ClassLoadConfig; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java index ee64f86af8..637e7af92f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdEmbedded.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java index 2c844c4a25..1a05fe422a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/id/ImportedIdSimple.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; import io.ebeaninternal.server.persist.dmlbind.BindableRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Arrays; import java.util.Comparator; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java index 0bd53816fa..ee1bfafc2c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanDescriptor.java @@ -23,8 +23,8 @@ import io.ebeaninternal.server.idgen.UuidV4IdGenerator; import io.ebeaninternal.server.rawsql.SpiRawSql; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import java.util.*; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java index ad70b8d301..fc0ef67fa6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanEmbedded.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy.meta; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.HashMap; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java index 4881c12afc..5cfe1c1ce4 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanProperty.java @@ -19,10 +19,10 @@ import io.ebeaninternal.server.type.ScalarTypeWrapper; import io.ebeanservice.docstore.api.mapping.DocPropertyOptions; -import javax.persistence.EmbeddedId; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Type; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java index 7f41c028c4..495671115d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployBeanPropertyAssocOne.java @@ -2,7 +2,7 @@ import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; /** * Property mapped to a joined bean. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java index 4a8943a8e9..02684b79da 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployOrderColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.deploy.meta; -import javax.persistence.OrderColumn; +import jakarta.persistence.OrderColumn; public final class DeployOrderColumn { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java index 0f3ed54c1a..0b23db56c1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/meta/DeployTableJoin.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.parse.DeployUtil; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.JoinColumn; +import jakarta.persistence.JoinColumn; import java.util.ArrayList; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java index cfcfd1609a..87466cdf77 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocManys.java @@ -20,20 +20,20 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.EnumType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.MapKey; -import javax.persistence.MapKeyColumn; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.OrderColumn; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.EnumType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.MapKey; +import jakarta.persistence.MapKeyColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.OrderColumn; import java.util.Set; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java index 6ca1243bb2..4bf0066c7a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationAssocOnes.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.deploy.meta.DeployTableJoinColumn; import io.ebeaninternal.server.query.SqlJoinType; -import javax.persistence.*; +import jakarta.persistence.*; import static java.lang.System.Logger.Level.INFO; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java index 35179b8762..dc2be4f70a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationBase.java @@ -9,11 +9,11 @@ import io.ebean.util.AnnotationUtil; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.AttributeOverride; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.NamedQueries; -import javax.persistence.NamedQuery; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.NamedQueries; +import jakarta.persistence.NamedQuery; import java.lang.annotation.Annotation; import java.util.Collections; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java index fe45a72d8c..a1087c4028 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationClass.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.deploy.TablespaceMeta; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.*; +import jakarta.persistence.*; import static io.ebean.util.AnnotationUtil.typeGet; import static java.lang.System.Logger.Level.ERROR; @@ -129,7 +129,7 @@ private void read(Class cls) { for (UniqueConstraint c : uniqueConstraints) { descriptor.addIndex(new IndexDefinition(c.name(), convertColumnNames(c.columnNames()))); } - for (javax.persistence.Index index : table.indexes()) { + for (jakarta.persistence.Index index : table.indexes()) { final String[] cols = index.columnList().split(","); descriptor.addIndex(new IndexDefinition(index.name(), convertColumnNames(cols), index.unique())); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java index 60ef0ddf7b..c5c24bab7f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFields.java @@ -20,7 +20,7 @@ import io.ebeaninternal.server.type.ScalarTypeBytesEncrypted; import io.ebeaninternal.server.type.ScalarTypeEncryptedWrapper; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Types; import java.util.Set; import java.util.UUID; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java index 386e08e642..80a0e87ceb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationFind.java @@ -4,10 +4,10 @@ import io.ebean.annotation.Index; import io.ebean.annotation.Indices; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; import java.lang.reflect.Field; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java index 3e11d738e6..c3589b36f5 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/AnnotationParser.java @@ -6,9 +6,9 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssoc; import io.ebeaninternal.server.deploy.meta.DeployBeanPropertyAssocOne; -import javax.persistence.AttributeOverride; -import javax.persistence.CascadeType; -import javax.persistence.Column; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; import java.util.HashMap; import java.util.Map; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java index d54a972be6..9f9f050695 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployCreateProperties.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.deploy.meta.*; import io.ebeaninternal.server.type.TypeManager; -import javax.persistence.*; +import jakarta.persistence.*; import java.lang.reflect.*; import static java.lang.System.Logger.Level.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java index 4eb2fa6402..8cebff6792 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInherit.java @@ -5,10 +5,10 @@ import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.deploy.meta.DeployBeanDescriptor; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Inheritance; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java index 67e41e3ea9..f2f9a33c76 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployInheritInfo.java @@ -3,7 +3,7 @@ import io.ebeaninternal.server.deploy.InheritInfo; import java.lang.reflect.Modifier; -import javax.persistence.DiscriminatorType; +import jakarta.persistence.DiscriminatorType; import java.sql.Types; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java index 9fe23c0b1c..f39ba2314d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/DeployUtil.java @@ -18,9 +18,9 @@ import io.ebeaninternal.server.type.SimpleAesEncryptor; import io.ebeaninternal.server.type.TypeManager; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.PersistenceException; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.PersistenceException; import java.sql.Types; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java index 7e5a097828..6335cace80 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/deploy/parse/ReadAnnotationConfig.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.generatedproperty.GeneratedPropertyFactory; import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.util.HashSet; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java index f9956f1067..34bdb75443 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/expression/FilterExpressionList.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiExpressionList; import io.ebeaninternal.api.SpiQuery; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.*; @NonNullApi diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java index 00b12ea2cd..46b6673f75 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmtHolder.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.persist; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.Collection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java index d4cab2a179..ecde091f8a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/BeanPersister.java @@ -2,7 +2,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Defines bean insert update and delete implementation. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java index 7edcc3f22c..0021c9a122 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/Binder.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.persist.platform.MultiValueBind; import io.ebeaninternal.server.type.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.math.BigDecimal; import java.sql.*; import java.util.Collection; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java index fb166d49d1..2eb6c102a6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeOrmUpdate.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.util.BindParamsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java index cd1aad8a2f..9275b6ff4a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/ExeUpdateSql.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequestUpdateSql.SqlType; import io.ebeaninternal.server.util.BindParamsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java index d71ed62c8e..48332fb146 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/MergeHandler.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocMany; import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java index 8fba9fd377..823fbaaff0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.*; import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java index df23bea169..b4b3232e8f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DeleteHandler.java @@ -3,7 +3,7 @@ import io.ebeaninternal.api.SpiTransaction; import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java index 478e86ed78..1b59a036c3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DmlHandler.java @@ -9,7 +9,7 @@ import io.ebeaninternal.server.persist.dmlbind.BindableRequest; import io.ebeaninternal.server.bind.DataBind; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java index b805da26e0..e6a18233b1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/DocStoreBeanPersister.java @@ -3,7 +3,7 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.persist.BeanPersister; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Document store based BeanPersister. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java index 9859901bb1..85a94bbaaa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertHandler.java @@ -6,8 +6,8 @@ import io.ebeaninternal.server.core.PersistRequestBean; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java index 51dfa8a877..7e6ca3678d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/UpdateHandler.java @@ -4,7 +4,7 @@ import io.ebeaninternal.api.SpiUpdatePlan; import io.ebeaninternal.server.core.PersistRequestBean; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java index 565b85d27e..da7c0b5eab 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableDiscriminator.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.InheritInfo; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java index 43109f2bd1..1039e665fa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdEmbedded.java @@ -6,7 +6,7 @@ import io.ebeaninternal.server.deploy.BeanPropertyAssocOne; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Arrays; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java index 7b50e1e4e3..5498c479ff 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableIdScalar.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.deploy.BeanProperty; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java index 495e89d6b5..3095b10f19 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/persist/dmlbind/BindableUnidirectional.java @@ -7,7 +7,7 @@ import io.ebeaninternal.server.deploy.id.ImportedId; import io.ebeaninternal.server.persist.dml.GenerateDmlRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java index da853e7efe..b9c2baedcb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQuery.java @@ -17,7 +17,7 @@ import io.ebeaninternal.server.core.SpiOrmQueryRequest; import io.ebeaninternal.server.deploy.*; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java index e9e58f78a0..9a9e96346d 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java @@ -25,7 +25,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping.Column; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java index 9bc46a2aa6..bbce247985 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java @@ -19,7 +19,7 @@ import io.ebeaninternal.server.deploy.BeanDescriptor; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.ResultSet; import java.sql.SQLException; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index ca7073ea67..a0779c5f23 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.core.OrmQueryRequest; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java index eed074283d..84a920527b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultOrmQueryEngine.java @@ -12,7 +12,7 @@ import io.ebeaninternal.server.core.SpiResultSet; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.Collection; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java index 10713ff7a4..6f3e013653 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java @@ -13,7 +13,7 @@ import io.ebeaninternal.server.core.RowReader; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java index 24ce404732..1a3784b270 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryEngine.java @@ -5,7 +5,7 @@ import io.ebeaninternal.server.core.DtoQueryRequest; import io.ebeaninternal.server.persist.Binder; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java index 47676c5255..319a9453e0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/DtoQueryIterator.java @@ -3,7 +3,7 @@ import io.ebean.QueryIterator; import io.ebeaninternal.server.core.DtoQueryRequest; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; final class DtoQueryIterator implements QueryIterator { diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java index f763341f84..894d717d5a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/LimitOffsetPagedList.java @@ -4,7 +4,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import io.ebeaninternal.api.SpiQuery; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.Future; import java.util.concurrent.locks.ReentrantLock; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java index bd232c91f1..e334cf7be2 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/QueryFutureList.java @@ -4,7 +4,7 @@ import io.ebean.Query; import io.ebean.Transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java index 26baf4f17a..5905adc3ba 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/AbstractQuery.java @@ -2,7 +2,7 @@ import java.util.concurrent.locks.ReentrantLock; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import io.ebean.CancelableQuery; import io.ebeaninternal.api.SpiCancelableQuery; 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 7aaafeade4..725f55f0c9 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 @@ -22,7 +22,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql; import io.ebeaninternal.server.transaction.ExternalJdbcTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.Timestamp; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java index f2585a7080..ed83f4b292 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/ONamedParam.java @@ -2,7 +2,7 @@ import io.ebeaninternal.api.SpiNamedParam; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Named parameter used as placeholder in expressions created by EQL language parsing. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java index e2ce3f307a..9697af5baf 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetail.java @@ -8,7 +8,7 @@ import io.ebeaninternal.server.el.ElPropertyDeploy; import io.ebeaninternal.server.el.ElPropertyValue; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.Serializable; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java index 744f70ebf5..c58fc5403a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryDetailParser.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.querydefn; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Parses a Object relational query statement into a OrmQueryDetail and OrmQueryAttributes. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java index 48e61789b5..5dec9d5e63 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/rawsql/DRawSqlColumnsParser.java @@ -3,7 +3,7 @@ import io.ebeaninternal.server.rawsql.SpiRawSql.ColumnMapping; import io.ebeaninternal.server.util.DSelectColumnsParser; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java index 9cc68f1295..0208581ae1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultTransactionScopeManager.java @@ -2,7 +2,7 @@ import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * Manages the transaction scoping using a Ebean thread local. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java index c40a83a12c..f01009b9ff 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ExternalJdbcTransaction.java @@ -1,6 +1,6 @@ package io.ebeaninternal.server.transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java index 20cfac63f1..3d89f0e244 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/ImplicitReadOnlyTransaction.java @@ -11,7 +11,7 @@ import io.ebeaninternal.server.persist.BatchControl; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; import java.util.HashMap; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java index 9687c4c91a..110bb7fdaa 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JdbcTransaction.java @@ -13,8 +13,8 @@ import io.ebeaninternal.server.persist.BatchedSqlException; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; -import javax.persistence.RollbackException; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.RollbackException; import java.sql.Connection; import java.sql.SQLException; import java.util.*; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java index 66f1a1c787..4629f08714 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransaction.java @@ -1,9 +1,9 @@ package io.ebeaninternal.server.transaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; -import javax.transaction.Status; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.UserTransaction; import java.sql.SQLException; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java index 37b8827c2b..afa032abef 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java @@ -7,12 +7,12 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; -import javax.transaction.Status; -import javax.transaction.Synchronization; -import javax.transaction.TransactionSynchronizationRegistry; -import javax.transaction.UserTransaction; +import jakarta.transaction.Status; +import jakarta.transaction.Synchronization; +import jakarta.transaction.TransactionSynchronizationRegistry; +import jakarta.transaction.UserTransaction; import static java.lang.System.Logger.Level.DEBUG; import static java.lang.System.Logger.Level.WARNING; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java index 444d936b7f..8114a9acdc 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/NoTransaction.java @@ -14,7 +14,7 @@ import io.ebeaninternal.server.persist.BatchControl; import io.ebeanservice.docstore.api.DocStoreTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java index 85ef1e8a92..cb0ff45b47 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/SavepointTransaction.java @@ -5,7 +5,7 @@ import io.ebeaninternal.api.TransactionEvent; import io.ebeaninternal.server.util.Str; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; import java.sql.Savepoint; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java index 7225a2c008..23075fa9f6 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactory.java @@ -3,7 +3,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java index d97d85d0cc..26a13c353a 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasic.java @@ -3,7 +3,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java index 9835f7204e..063f139d76 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryBasicWithRead.java @@ -3,7 +3,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java index cfc51370ac..2b842141d9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenant.java @@ -4,7 +4,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java index cf3992c9ec..dd5ca90c2e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionFactoryTenantWithRead.java @@ -4,7 +4,7 @@ import io.ebean.util.JdbcClose; import io.ebeaninternal.api.SpiTransaction; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index c8842d290f..821d92094e 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -29,7 +29,7 @@ import io.ebeanservice.docstore.api.DocStoreUpdateProcessor; import io.ebeanservice.docstore.api.DocStoreUpdates; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java index 242b657f34..0dc55668be 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/AttributeConverterAdapter.java @@ -2,7 +2,7 @@ import io.ebean.config.ScalarTypeConverter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; /** * Adapter from ScalarTypeConverter to AttributeConverter. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java index 31f7cd5c3a..14a96080df 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/DefaultTypeManager.java @@ -20,8 +20,8 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import io.ebeaninternal.server.deploy.meta.DeployProperty; -import javax.persistence.AttributeConverter; -import javax.persistence.EnumType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.EnumType; import java.io.File; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java index 93860f0470..6559458ce0 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/EnumToDbIntegerMap.java @@ -3,7 +3,7 @@ import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java index 84fdab9fe5..b2be8d63cb 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArrayList.java @@ -10,7 +10,7 @@ import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareList; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java index 2929391cb0..d1034be93b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeArraySet.java @@ -10,7 +10,7 @@ import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareSet; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.lang.reflect.Type; import java.sql.SQLException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java index 3fae086ec2..2e636fd4a3 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeClass.java @@ -2,7 +2,7 @@ import io.ebean.core.type.ScalarTypeBaseVarchar; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; /** * ScalarType for Class that persists it to VARCHAR column. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java index b0c8b3e7f9..b890df7a0b 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeDayOfWeek.java @@ -3,7 +3,7 @@ import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.time.DayOfWeek; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java index 3d8227efde..1430212f69 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnum.java @@ -2,7 +2,7 @@ import io.ebean.core.type.ScalarType; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.util.Set; /** diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java index 2596b68f07..227520fbf7 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumStandard.java @@ -7,7 +7,7 @@ import io.ebean.core.type.DocPropertyType; import io.ebean.core.type.ScalarTypeBase; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java index 9054a45464..399912843c 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeEnumWithMapping.java @@ -4,7 +4,7 @@ import io.ebean.core.type.DataReader; import io.ebean.core.type.ScalarType; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.util.Iterator; import java.util.LinkedHashSet; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java index e37ff8cb68..8d43c7d389 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java @@ -8,7 +8,7 @@ import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareList; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java index 0ae3248a4d..3997c374ad 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java @@ -8,7 +8,7 @@ import io.ebean.text.json.EJson; import io.ebeaninternal.json.ModifyAwareSet; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import java.sql.SQLException; import java.sql.Types; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java index 1b1403230c..73e6b056ee 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeMonth.java @@ -3,7 +3,7 @@ import io.ebean.core.type.DataBinder; import io.ebean.core.type.DataReader; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.time.Month; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java index 828174a677..2c8f3fef11 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeManager.java @@ -4,7 +4,7 @@ import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; import io.ebeaninternal.server.deploy.meta.DeployProperty; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java index bda5577460..d97e982203 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/util/BindParamsParser.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.BindParams.Param; import io.ebeaninternal.server.deploy.BeanDescriptor; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.Collection; /** diff --git a/ebean-core/src/main/java/module-info.java b/ebean-core/src/main/java/module-info.java index d09920dd5f..d12bd34828 100644 --- a/ebean-core/src/main/java/module-info.java +++ b/ebean-core/src/main/java/module-info.java @@ -35,7 +35,7 @@ requires static com.fasterxml.jackson.core; requires static com.fasterxml.jackson.databind; requires static jakarta.validation; - requires static java.transaction; + requires static jakarta.transaction; requires static java.naming; requires static java.validation; requires static org.postgresql.jdbc; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java index 3dc9d70188..56ebe4c679 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BaseTest.java @@ -6,7 +6,7 @@ import io.ebeaninternal.api.SpiEbeanServer; import org.tests.model.basic.Animal; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; public class BaseTest { diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java index 1905886051..95bd8e0f9f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/deploy/BeanCascadeInfoTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import javax.persistence.CascadeType; +import jakarta.persistence.CascadeType; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java index 2fd51c0d3b..2a89f0f38f 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java @@ -9,7 +9,7 @@ import org.tests.model.basic.IntEnum; import org.tests.model.basic.VarcharEnum; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.time.DayOfWeek; import java.time.Month; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java index bd085d73a2..f5cf34e91a 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeWrapperAdapterTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java index ac94509cca..9a357fe01b 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java @@ -13,7 +13,7 @@ import org.tests.model.ivo.Money; import org.tests.model.ivo.converter.MoneyTypeConverter; -import javax.persistence.EnumType; +import jakarta.persistence.EnumType; import java.sql.SQLException; import java.sql.Types; import java.util.GregorianCalendar; diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java index 20da9cf980..0f60d5b786 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TypeReflectHelperTest.java @@ -10,7 +10,7 @@ import org.tests.model.ivo.converter.OidTypeConverter; import org.tests.model.ivo.converter.SysTimeConverter; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7d..c8843ccee2 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java index 6d315b65a3..2ac44823e1 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CalculationResult { diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java index c58afe6c11..cea72d5459 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.*; +import jakarta.persistence.*; @ChangeLog @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a69..fa3f577ecf 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef42..9e40cab92c 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bbc..d39f7bb091 100644 --- a/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-core/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Address.java b/ebean-core/src/test/java/org/tests/model/basic/Address.java index 632cb4efc1..5e1ff9f7ff 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Address.java @@ -2,7 +2,7 @@ import io.ebean.annotation.InvalidateQueryCache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Animal.java b/ebean-core/src/test/java/org/tests/model/basic/Animal.java index 069b1e4cfa..ba68c99d57 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Animal.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Animal.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java b/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java index 761a8d4c70..ae3c9a1601 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java +++ b/ebean-core/src/test/java/org/tests/model/basic/AnimalShelter.java @@ -1,12 +1,12 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.PERSIST; @Entity public class AnimalShelter { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Article.java b/ebean-core/src/test/java/org/tests/model/basic/Article.java index 797366edd4..4cc6f020bb 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Article.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Article.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java b/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java index 4ba4c5def6..97dfc8998a 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java +++ b/ebean-core/src/test/java/org/tests/model/basic/BWithQIdent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java index 86c39f5b49..da618902ed 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java +++ b/ebean-core/src/test/java/org/tests/model/basic/BasicDomain.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Car.java b/ebean-core/src/test/java/org/tests/model/basic/Car.java index 268920a34d..c55fe81bf8 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Car.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Car.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java b/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java index 37ee5720e6..b134230a0b 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java +++ b/ebean-core/src/test/java/org/tests/model/basic/CarAccessory.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CarAccessory extends BasicDomain { diff --git a/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java b/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java index df2aef5bf0..7c2dd390c8 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java +++ b/ebean-core/src/test/java/org/tests/model/basic/CarFuse.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CarFuse { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Cat.java b/ebean-core/src/test/java/org/tests/model/basic/Cat.java index d3df201b61..a9d0581afe 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Cat.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Cat.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Formula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("CAT") diff --git a/ebean-core/src/test/java/org/tests/model/basic/Contact.java b/ebean-core/src/test/java/org/tests/model/basic/Contact.java index a4d6700714..97a48bf101 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Contact.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java b/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java index 1b2963624d..a0e4fcb7b4 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java +++ b/ebean-core/src/test/java/org/tests/model/basic/ContactGroup.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ContactGroup extends BasicDomain { diff --git a/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java b/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java index ffe0b2e56e..f1fbc8075c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java +++ b/ebean-core/src/test/java/org/tests/model/basic/ContactNote.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Country.java b/ebean-core/src/test/java/org/tests/model/basic/Country.java index bde38fc78d..73f9764214 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Country.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Country.java @@ -2,9 +2,9 @@ import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; /** diff --git a/ebean-core/src/test/java/org/tests/model/basic/Customer.java b/ebean-core/src/test/java/org/tests/model/basic/Customer.java index 8e209631e0..17fab4ba32 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Customer.java @@ -2,7 +2,7 @@ import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Dog.java b/ebean-core/src/test/java/org/tests/model/basic/Dog.java index 7b2fad5466..be7e4f4759 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Dog.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Dog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/EBasic.java b/ebean-core/src/test/java/org/tests/model/basic/EBasic.java index 603102032e..42cae8c935 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/EBasic.java +++ b/ebean-core/src/test/java/org/tests/model/basic/EBasic.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Order.java b/ebean-core/src/test/java/org/tests/model/basic/Order.java index dfb9f2aef5..1d97448687 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Order.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Order.java @@ -2,7 +2,7 @@ import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.sql.Date; diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java index 364d94f2fe..8da916a41c 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderAggregate.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java index 3938372963..b7318d9680 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderDetail.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.DocEmbedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java b/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java index a587538a1b..9448671000 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java +++ b/ebean-core/src/test/java/org/tests/model/basic/OrderShipment.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/Product.java b/ebean-core/src/test/java/org/tests/model/basic/Product.java index b0fde6d073..df57dadd07 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Product.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Product.java @@ -2,10 +2,10 @@ import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-core/src/test/java/org/tests/model/basic/Section.java b/ebean-core/src/test/java/org/tests/model/basic/Section.java index 0395411889..9856a09e55 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Section.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Section.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-core/src/test/java/org/tests/model/basic/SubSection.java b/ebean-core/src/test/java/org/tests/model/basic/SubSection.java index b5e8888f28..d45f49ed3b 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/SubSection.java +++ b/ebean-core/src/test/java/org/tests/model/basic/SubSection.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java index 80c0f8d363..07f614d658 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class TBytesOnly { diff --git a/ebean-core/src/test/java/org/tests/model/basic/TOne.java b/ebean-core/src/test/java/org/tests/model/basic/TOne.java index 13ae7e7e29..09ac648454 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TOne.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TOne.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * A basic entity to test simple things. diff --git a/ebean-core/src/test/java/org/tests/model/basic/Truck.java b/ebean-core/src/test/java/org/tests/model/basic/Truck.java index c32d70777b..35785d85f8 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Truck.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171bb..b766599c74 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-core/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java index cab8c4dde7..9ba8697048 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-core/src/test/java/org/tests/model/basic/Vehicle.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java index 00119e5ec0..c4b03be79b 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d4..13b4ee34e3 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f0..2f635062e8 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5c..2b1df858ee 100644 --- a/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-core/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BSite.java b/ebean-core/src/test/java/org/tests/model/bridge/BSite.java index 2023a8c4bc..036af85e56 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/BSite.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/BSite.java @@ -1,8 +1,8 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/bridge/BUser.java b/ebean-core/src/test/java/org/tests/model/bridge/BUser.java index 7a87fe864e..9573f85b7a 100644 --- a/ebean-core/src/test/java/org/tests/model/bridge/BUser.java +++ b/ebean-core/src/test/java/org/tests/model/bridge/BUser.java @@ -1,7 +1,7 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java b/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java index d44cf80521..be6109e190 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java +++ b/ebean-core/src/test/java/org/tests/model/composite/RCustomer.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author rnentjes diff --git a/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java b/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java index a871d49aae..ae879544ee 100644 --- a/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java +++ b/ebean-core/src/test/java/org/tests/model/composite/RCustomerKey.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java index 6ba9d4c414..122261b609 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EAddress.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbJson; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import java.util.Map; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EMain.java b/ebean-core/src/test/java/org/tests/model/embedded/EMain.java index edb13ac1bc..cb0cfb0afa 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EMain.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EMain.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_main") diff --git a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java index ef5e82a80f..ee6ad5d63e 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java b/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java index 574a557a6c..d7108f062f 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/Eembeddable.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Eembeddable { diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java index 341f0670eb..183643e706 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLive.java @@ -3,8 +3,8 @@ import io.ebean.Model; import io.ebean.annotation.WhenCreated; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java index 52b6583cd3..e9fd6d49e4 100644 --- a/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java +++ b/ebean-core/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java index bd39796517..18a440b1b3 100644 --- a/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/ebean-core/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -2,7 +2,7 @@ import org.tests.model.ivo.Money; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.math.BigDecimal; /** diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 5f87ea832b..47aeeca05e 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -39,15 +39,15 @@ provided - + - + jakarta.xml.bind jakarta.xml.bind-api @@ -59,7 +59,7 @@ 4.0.0 runtime - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java index c0c56abddf..3f6ec8aea9 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlGenerator.java @@ -13,7 +13,7 @@ import io.ebeaninternal.dbmigration.model.CurrentModel; import io.ebeaninternal.extraddl.model.ExtraDdlXmlReader; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.*; import java.sql.Connection; import java.sql.SQLException; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java index 8a002f513d..f7d326c13a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/Detect.java @@ -11,6 +11,6 @@ public class Detect { * Return true if JAXB is present. */ public static boolean isJAXBPresent(DatabaseConfig config) { - return config.getClassLoadConfig().isPresent("javax.xml.bind.JAXBException"); + return config.getClassLoadConfig().isPresent("jakarta.xml.bind.JAXBException"); } } diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java index 2586acf894..fdf57a999c 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java index e8e6b94209..b4d12ede53 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java index 630ccbce96..20326eb5be 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddTableComment.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java index a53b6cb659..578fbf172e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AddUniqueConstraint.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java index 7082c03e20..256ed1d641 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java index 95996d71c1..9a394b5311 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterForeignKey.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java index 0f6d43dc06..7f38df0fa2 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java index fc37c8e638..895b51c29b 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/AlterTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.math.BigInteger; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java index 424c48a16d..7240b52239 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Application.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java index ae24ce4577..62b185d73e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Applications.java @@ -1,9 +1,9 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java index a469e331ab..2bcafcae58 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Apply.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java index edc22f3807..2526468b17 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSet.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java index 8f15e8496c..cdad503a79 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ChangeSetType.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java index 995c01fb95..aa9e7f8142 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Column.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java index 62c0deb463..d065a09abf 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Configuration.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java index f0ec659d73..0380942a63 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateIndex.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java index cc45c3b440..a1bb5a44b7 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateSchema.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java index 4c303d97d0..13187d594e 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/CreateTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java index e85add7c2e..758a0f28c0 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DdlScript.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java index 25b63ad80e..36bb0f2b3b 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DefaultTablespace.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java index 7c9906d837..4735605492 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java index 65b15e9793..1ccdcaf8a6 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropHistoryTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java index 1104b31d19..e37065ad6a 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropIndex.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java index 640c53ed16..48a2418193 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/DropTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java index 7673fa881b..05bcbcd556 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ForeignKey.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java index 50eba9dad2..be5b2aa258 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/IdentityType.java @@ -1,8 +1,8 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java index 78bc2ef99b..9b455358ef 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Migration.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java index 85e04f4a78..0266a5a507 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/ObjectFactory.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java index 4535c5eec5..052b72be11 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameColumn.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java index 6e45cbba8d..423e006183 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/RenameTable.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java index 893356679e..bb0cf28385 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Rollback.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java index 954ac5a02f..8702ec7fed 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/Sql.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java index 47b22f02ec..08bd1ed7dd 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/UniqueConstraint.java @@ -1,6 +1,6 @@ package io.ebeaninternal.dbmigration.migration; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java index f52bba8313..8f7b350c28 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migration/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/dbmigration", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.ebeaninternal.dbmigration.migration; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java index e93260ba90..bac25a5088 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlReader.java @@ -3,9 +3,9 @@ import io.ebeaninternal.dbmigration.migration.Migration; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java index c887fc2b09..12c50e9cf0 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/migrationreader/MigrationXmlWriter.java @@ -4,9 +4,9 @@ import io.ebean.util.IOUtils; import io.ebeaninternal.dbmigration.migration.Migration; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import java.io.File; import java.io.IOException; import java.io.Writer; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java index 53819461f4..7fbcbd2d68 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/DdlScript.java @@ -1,11 +1,11 @@ package io.ebeaninternal.extraddl.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java index 2255ee88d1..bdd2f45c23 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdl.java @@ -1,10 +1,10 @@ package io.ebeaninternal.extraddl.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java index 350c584e8c..fa6a25e358 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ExtraDdlXmlReader.java @@ -3,9 +3,9 @@ import io.avaje.applog.AppLog; import io.ebean.annotation.Platform; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.IOException; import java.io.InputStream; diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java index 20cf3cd461..320fced06d 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/ObjectFactory.java @@ -1,6 +1,6 @@ package io.ebeaninternal.extraddl.model; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java index c8e18d1dc0..b4f69f4623 100644 --- a/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java +++ b/ebean-ddl-generator/src/main/java/io/ebeaninternal/extraddl/model/package-info.java @@ -1,2 +1,2 @@ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://ebean-orm.github.io/xml/ns/extraddl", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package io.ebeaninternal.extraddl.model; diff --git a/ebean-ddl-generator/src/main/java/module-info.java b/ebean-ddl-generator/src/main/java/module-info.java index c5b6af08b2..bee21be876 100644 --- a/ebean-ddl-generator/src/main/java/module-info.java +++ b/ebean-ddl-generator/src/main/java/module-info.java @@ -8,7 +8,7 @@ requires transitive io.ebean.ddl.runner; requires transitive io.ebean.core; - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires io.ebean.core.type; requires io.ebean.migration; diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 0f580744ad..ef6a0538f3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,17 +1,17 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java index b192290cf0..61285db0f3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java index 8bc2dbf1a4..75699b9758 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,10 +1,10 @@ package org.tests.inheritance.company.domain; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7d..c8843ccee2 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java index 9cde2d7f3a..e11e143470 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,10 +1,10 @@ package org.tests.inheritance.model; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CalculationResult { diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java index b0363976df..741337dd6e 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,14 +3,14 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.ManyToOne; @ChangeLog @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a69..fa3f577ecf 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef42..9e40cab92c 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bbc..d39f7bb091 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-ddl-generator/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java b/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java index da67d03758..525f6f25a7 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java index c1119456a4..7feb4da8e0 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Address.java @@ -3,11 +3,11 @@ import io.ebean.annotation.InvalidateQueryCache; import org.tests.model.metaannotation.SizeMedium; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java index 4a71909a89..ac0a629f76 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyAssoc.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CKeyAssoc { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java index aed4a10b93..4a353ac3df 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyDetail.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CKeyDetail { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java index 36ef22ab86..fcf7dd6390 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParent.java @@ -2,12 +2,12 @@ import io.ebean.annotation.Cache; -import javax.persistence.CascadeType; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.CascadeType; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.ArrayList; import java.util.List; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java index a0d8c828c8..139b448f71 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/CKeyParentId.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java index 39496a703b..da5511ef14 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Person.java @@ -1,14 +1,14 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.List; @@ -19,7 +19,7 @@ public class Person implements Serializable { private static final long serialVersionUID = 495045977245770183L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @SequenceGenerator(name = "PERSONS_SEQ", initialValue = 1000, allocationSize = 40) @Column(name = "ID", unique = true, nullable = false) private Long id; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java index 3ba7b3ebe1..b33a46c7a0 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Phone.java @@ -1,14 +1,14 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -19,7 +19,7 @@ public class Phone implements Serializable { private static final long serialVersionUID = -326610269092956952L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @Column(name = "id", unique = true, nullable = false) private Long id; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java index 1c77787344..a813f20a38 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Truck.java @@ -2,11 +2,11 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; @Entity @Inheritance diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171bb..b766599c74 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java index ae99a871a7..6b64476434 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/Vehicle.java @@ -2,10 +2,10 @@ import org.tests.model.BaseModel; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java index cb28ad9591..940c299ddf 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -2,8 +2,8 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d4..13b4ee34e3 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f0..2f635062e8 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5c..2b1df858ee 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java index 4d34035199..f7d8592869 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/AuditInfo.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java index 40610428ec..25f467fbc7 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKEmbId.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java index 50d7baf14a..750c50e84c 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/CKSiteUser.java @@ -1,9 +1,9 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java index 30873ff547..f0e7c2c197 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Item.java @@ -1,13 +1,13 @@ package org.tests.model.compositekeys; -import javax.persistence.AttributeOverride; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Item { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java index 99b7c1018d..1771e0c3ad 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ItemKey.java @@ -1,7 +1,7 @@ package org.tests.model.compositekeys; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java index 070c353aa0..6aa82273bb 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Parcel.java @@ -1,8 +1,8 @@ package org.tests.model.compositekeys; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Parcel { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java index 3ee5c1d48e..4c5645757b 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/ParcelLocation.java @@ -1,10 +1,10 @@ package org.tests.model.compositekeys; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; @Entity public class ParcelLocation { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java index ad6e7270f6..a3e8b32478 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Region.java @@ -1,11 +1,11 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java index dc92408aae..dec7c74eeb 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/RegionKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RegionKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java index 22d6b12534..78448b72c0 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubType.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java index 6de6159ad8..e9a87dbd37 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/SubTypeKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class SubTypeKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java index a650c5c0e2..04b806f016 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/Type.java @@ -1,13 +1,13 @@ package org.tests.model.compositekeys; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java index a5b8f07d0c..17a7c0bb3b 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/compositekeys/TypeKey.java @@ -1,6 +1,6 @@ package org.tests.model.compositekeys; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class TypeKey { diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java index 7fe9bcfdf3..f27ce54989 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Conversation.java @@ -3,11 +3,11 @@ import io.ebean.annotation.FetchPreference; import org.tests.model.BaseModel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java index eee84f8a7b..0bc0f845b9 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Group.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java index 51379a9403..45cda714e0 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Message.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "c_message") diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java index dae00e2d50..a979ea9fac 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/Participation.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "c_participation") diff --git a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java index f921fd85e5..6c0a2a2404 100644 --- a/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java +++ b/ebean-ddl-generator/src/test/java/org/tests/model/converstation/User.java @@ -4,9 +4,9 @@ import io.ebean.annotation.HistoryExclude; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @History @Entity diff --git a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java index a4dfbac9a3..dad6d8bca3 100644 --- a/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java +++ b/ebean-jackson-mapper/src/main/java/io/ebean/jackson/mapper/ScalarJsonJacksonMapper.java @@ -12,7 +12,7 @@ import io.ebean.core.type.*; import io.ebean.text.TextException; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; diff --git a/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java b/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java index 410fe38f98..6dc59d1e20 100644 --- a/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java +++ b/ebean-postgis/src/test/java/org/example/domain/BaseEntity.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass abstract class BaseEntity { diff --git a/ebean-postgis/src/test/java/org/example/domain/CachedBean.java b/ebean-postgis/src/test/java/org/example/domain/CachedBean.java index 02835c4b88..a67a744886 100644 --- a/ebean-postgis/src/test/java/org/example/domain/CachedBean.java +++ b/ebean-postgis/src/test/java/org/example/domain/CachedBean.java @@ -4,8 +4,8 @@ import org.postgis.Point; import org.postgis.Polygon; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="mybean_cached") diff --git a/ebean-postgis/src/test/java/org/example/domain/MyBean.java b/ebean-postgis/src/test/java/org/example/domain/MyBean.java index 5ff0bd1b4e..6ad51f8a98 100644 --- a/ebean-postgis/src/test/java/org/example/domain/MyBean.java +++ b/ebean-postgis/src/test/java/org/example/domain/MyBean.java @@ -7,9 +7,9 @@ import org.postgis.Point; import org.postgis.Polygon; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="mybean") diff --git a/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java b/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java index 99c6cf44c7..9a3a8c4a6a 100644 --- a/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java +++ b/ebean-postgis/src/test/java/org/example/domain/OtherBeanGeoLatte.java @@ -9,9 +9,9 @@ import org.geolatte.geom.Point; import org.geolatte.geom.Polygon; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name="mybean") diff --git a/ebean-querybean/src/test/java/org/example/domain/ACat.java b/ebean-querybean/src/test/java/org/example/domain/ACat.java index 3537437b74..33333f8f68 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ACat.java +++ b/ebean-querybean/src/test/java/org/example/domain/ACat.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("CAT") @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/ADog.java b/ebean-querybean/src/test/java/org/example/domain/ADog.java index 81646476b5..8d5a5837e6 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ADog.java +++ b/ebean-querybean/src/test/java/org/example/domain/ADog.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Inheritance @DiscriminatorValue("DOG") diff --git a/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java b/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java index 30187d6fc2..38415ba3ac 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java +++ b/ebean-querybean/src/test/java/org/example/domain/ASuperCat.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("SCAT") @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/AWildCat.java b/ebean-querybean/src/test/java/org/example/domain/AWildCat.java index 85e2e32054..443c73c310 100644 --- a/ebean-querybean/src/test/java/org/example/domain/AWildCat.java +++ b/ebean-querybean/src/test/java/org/example/domain/AWildCat.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Inheritance @DiscriminatorValue("WC") diff --git a/ebean-querybean/src/test/java/org/example/domain/Address.java b/ebean-querybean/src/test/java/org/example/domain/Address.java index f3b161dc84..87909f39f9 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Address.java +++ b/ebean-querybean/src/test/java/org/example/domain/Address.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import org.example.domain.otherpackage.GenericType; diff --git a/ebean-querybean/src/test/java/org/example/domain/Animal.java b/ebean-querybean/src/test/java/org/example/domain/Animal.java index 2a4196c06b..e3c33492bd 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Animal.java +++ b/ebean-querybean/src/test/java/org/example/domain/Animal.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; @Entity @Inheritance diff --git a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java index 2ae8785d26..e1da4e42dd 100644 --- a/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/AreaImpl.java @@ -2,10 +2,10 @@ import org.example.domain.api.ACity; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/BaseModel.java b/ebean-querybean/src/test/java/org/example/domain/BaseModel.java index 211d3141c2..938baee970 100644 --- a/ebean-querybean/src/test/java/org/example/domain/BaseModel.java +++ b/ebean-querybean/src/test/java/org/example/domain/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; /** diff --git a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java index 643914429c..111c9b30b0 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CityImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/CityImpl.java @@ -3,9 +3,9 @@ import org.example.domain.api.ACity; import org.example.domain.api.ACountry; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CityImpl implements ACity { diff --git a/ebean-querybean/src/test/java/org/example/domain/Contact.java b/ebean-querybean/src/test/java/org/example/domain/Contact.java index 44e7dbf311..7d2554f574 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Contact.java +++ b/ebean-querybean/src/test/java/org/example/domain/Contact.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbArray; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.time.ZonedDateTime; diff --git a/ebean-querybean/src/test/java/org/example/domain/ContactNote.java b/ebean-querybean/src/test/java/org/example/domain/ContactNote.java index 9f684b81c5..6ac6f40360 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ContactNote.java +++ b/ebean-querybean/src/test/java/org/example/domain/ContactNote.java @@ -2,9 +2,9 @@ import io.ebean.Finder; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; @Entity public class ContactNote extends BaseModel { diff --git a/ebean-querybean/src/test/java/org/example/domain/ContactOther.java b/ebean-querybean/src/test/java/org/example/domain/ContactOther.java index 731def6d64..ec2e734a02 100644 --- a/ebean-querybean/src/test/java/org/example/domain/ContactOther.java +++ b/ebean-querybean/src/test/java/org/example/domain/ContactOther.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; /** * Contact entity bean. diff --git a/ebean-querybean/src/test/java/org/example/domain/Country.java b/ebean-querybean/src/test/java/org/example/domain/Country.java index 07b5dace51..322d1466c7 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Country.java +++ b/ebean-querybean/src/test/java/org/example/domain/Country.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.time.Instant; import java.time.OffsetDateTime; diff --git a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java index 6f8797df81..d85b4c4264 100644 --- a/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java +++ b/ebean-querybean/src/test/java/org/example/domain/CountryImpl.java @@ -2,8 +2,8 @@ import org.example.domain.api.ACountry; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CountryImpl implements ACountry { diff --git a/ebean-querybean/src/test/java/org/example/domain/Customer.java b/ebean-querybean/src/test/java/org/example/domain/Customer.java index 4f843ffb7e..2b1264abaf 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Customer.java +++ b/ebean-querybean/src/test/java/org/example/domain/Customer.java @@ -7,13 +7,13 @@ import org.example.domain.otherpackage.PhoneNumber; import org.example.domain.otherpackage.ValidEmail; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Lob; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Lob; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/ebean-querybean/src/test/java/org/example/domain/MyInner.java b/ebean-querybean/src/test/java/org/example/domain/MyInner.java index e37dadabaf..ec9c8f9f59 100644 --- a/ebean-querybean/src/test/java/org/example/domain/MyInner.java +++ b/ebean-querybean/src/test/java/org/example/domain/MyInner.java @@ -1,9 +1,9 @@ package org.example.domain; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; import java.util.Objects; @Entity diff --git a/ebean-querybean/src/test/java/org/example/domain/Order.java b/ebean-querybean/src/test/java/org/example/domain/Order.java index 7b63725fe3..39b392cfef 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Order.java +++ b/ebean-querybean/src/test/java/org/example/domain/Order.java @@ -3,12 +3,12 @@ import io.ebean.Finder; import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import javax.validation.constraints.NotNull; import java.sql.Date; import java.util.ArrayList; diff --git a/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java b/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java index d16682b18c..e3456ec2c6 100644 --- a/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java +++ b/ebean-querybean/src/test/java/org/example/domain/OrderDetail.java @@ -1,8 +1,8 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Order Detail entity bean. diff --git a/ebean-querybean/src/test/java/org/example/domain/Product.java b/ebean-querybean/src/test/java/org/example/domain/Product.java index ed58daa054..75e59e86bb 100644 --- a/ebean-querybean/src/test/java/org/example/domain/Product.java +++ b/ebean-querybean/src/test/java/org/example/domain/Product.java @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import javax.validation.constraints.Size; /** diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java index c5e574f624..776def4286 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/GenericTypeAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class GenericTypeAttributeConverter implements AttributeConverter, String> { diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java index 9500b99241..0bb36aa015 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/PhoneAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class PhoneAttributeConverter implements AttributeConverter { diff --git a/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java b/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java index 6864366ffe..3688d03bb7 100644 --- a/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java +++ b/ebean-querybean/src/test/java/org/example/domain/otherpackage/ValidEmailAttributeConverter.java @@ -1,7 +1,7 @@ package org.example.domain.otherpackage; -import javax.persistence.AttributeConverter; -import javax.persistence.Converter; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; @Converter public class ValidEmailAttributeConverter implements AttributeConverter { diff --git a/ebean-redis/src/test/java/org/domain/EBase.java b/ebean-redis/src/test/java/org/domain/EBase.java index 84143f8e39..e9d409b426 100644 --- a/ebean-redis/src/test/java/org/domain/EBase.java +++ b/ebean-redis/src/test/java/org/domain/EBase.java @@ -4,9 +4,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.time.Instant; @MappedSuperclass diff --git a/ebean-redis/src/test/java/org/domain/Person.java b/ebean-redis/src/test/java/org/domain/Person.java index d5a8833918..edc212740f 100644 --- a/ebean-redis/src/test/java/org/domain/Person.java +++ b/ebean-redis/src/test/java/org/domain/Person.java @@ -5,7 +5,7 @@ import io.ebean.annotation.CacheBeanTuning; import io.ebean.annotation.Index; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Cache(enableQueryCache = true, nearCache = true, naturalKey = "name") diff --git a/ebean-redis/src/test/java/org/domain/RCust.java b/ebean-redis/src/test/java/org/domain/RCust.java index 8c1d015389..9f439d8d6c 100644 --- a/ebean-redis/src/test/java/org/domain/RCust.java +++ b/ebean-redis/src/test/java/org/domain/RCust.java @@ -5,7 +5,7 @@ import io.ebean.annotation.CacheBeanTuning; import io.ebean.annotation.Index; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Cache(naturalKey = "name") diff --git a/ebean-redis/src/test/java/org/domain/UChild.java b/ebean-redis/src/test/java/org/domain/UChild.java index 64a0641aa0..0f6fccf902 100644 --- a/ebean-redis/src/test/java/org/domain/UChild.java +++ b/ebean-redis/src/test/java/org/domain/UChild.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-redis/src/test/java/org/domain/UParent.java b/ebean-redis/src/test/java/org/domain/UParent.java index 25b42f12e3..dede6ba17c 100644 --- a/ebean-redis/src/test/java/org/domain/UParent.java +++ b/ebean-redis/src/test/java/org/domain/UParent.java @@ -4,10 +4,10 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java index 482222ab59..e51566b7a0 100644 --- a/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java +++ b/ebean-spring-txn/src/main/java/io/ebean/spring/txn/SpringJdbcTransactionManager.java @@ -9,7 +9,7 @@ import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.List; diff --git a/ebean-spring-txn/src/test/java/org/example/Account.java b/ebean-spring-txn/src/test/java/org/example/Account.java index dea4c103d9..9ee1855bb5 100644 --- a/ebean-spring-txn/src/test/java/org/example/Account.java +++ b/ebean-spring-txn/src/test/java/org/example/Account.java @@ -1,9 +1,9 @@ package org.example; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Table(name="o_account") @Entity diff --git a/ebean-spring-txn/src/test/java/org/example/Role.java b/ebean-spring-txn/src/test/java/org/example/Role.java index 6fcee501eb..305635fb11 100644 --- a/ebean-spring-txn/src/test/java/org/example/Role.java +++ b/ebean-spring-txn/src/test/java/org/example/Role.java @@ -1,10 +1,10 @@ package org.example; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; @Table(name="o_role") @Entity diff --git a/ebean-spring-txn/src/test/java/org/example/User.java b/ebean-spring-txn/src/test/java/org/example/User.java index 337796f062..4d985ed980 100644 --- a/ebean-spring-txn/src/test/java/org/example/User.java +++ b/ebean-spring-txn/src/test/java/org/example/User.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Table(name="o_user") diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index f1825820bc..511a0f28a9 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -71,7 +71,7 @@ - + - + jakarta.xml.bind jakarta.xml.bind-api @@ -96,7 +96,7 @@ 4.0.0 runtime - ____ JAKARTA-DEPENDENCY-END --> + diff --git a/ebean-test/src/main/java/module-info.java b/ebean-test/src/main/java/module-info.java index 428c3b3f4a..ae6e0e00a0 100644 --- a/ebean-test/src/main/java/module-info.java +++ b/ebean-test/src/main/java/module-info.java @@ -19,7 +19,7 @@ requires transitive io.ebean.test.containers; requires transitive org.assertj.core; - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires transitive com.h2database; // support testing diff --git a/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java b/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java index 950fbc57dc..d502204b4e 100644 --- a/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java +++ b/ebean-test/src/test/java/io/ebean/test/config/TestServerOffline.java @@ -20,7 +20,7 @@ import java.sql.Statement; import java.util.Properties; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java index e41d914b92..f6c3ff9367 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/base/EbeanServer_eqlTest.java @@ -8,7 +8,7 @@ import org.tests.model.basic.Customer; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java index b0819c5595..47e2fd94db 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java +++ b/ebean-test/src/test/java/io/ebean/xtest/config/ServerConfigSqlServerTest.java @@ -43,7 +43,7 @@ public void need_explicitPlatform() { assertThat(sqlServer).isNotNull(); sqlServer.shutdown(); -// javax.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for details +// jakarta.persistence.PersistenceException: java.lang.IllegalArgumentException: For SqlServer please choose the more specific sqlserver16 or sqlserver17 platform via DatabaseConfig.setDatabasePlatformName. Refer to issue #1340 for details // // at io.ebeaninternal.server.core.DatabasePlatformFactory.create(DatabasePlatformFactory.java:62) // at io.ebeaninternal.server.core.DefaultContainer.setDatabasePlatform(DefaultContainer.java:266) 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 ae52dcd3e7..8860470543 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 @@ -24,8 +24,8 @@ import io.ebeaninternal.server.query.CQuery; import io.ebeaninternal.server.transaction.RemoteTransactionEvent; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.time.Clock; import java.util.*; diff --git a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java index dffae473a4..15b166c79c 100644 --- a/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java +++ b/ebean-test/src/test/java/io/ebean/xtest/internal/api/TDSpiServer.java @@ -16,8 +16,8 @@ import io.ebean.text.json.JsonContext; import javax.annotation.Nullable; -import javax.persistence.OptimisticLockException; -import javax.persistence.PersistenceException; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.PersistenceException; import javax.sql.DataSource; import java.util.Collection; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java index 0148551a62..81b62296d5 100644 --- a/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java +++ b/ebean-test/src/test/java/misc/migration/history/v1_0/EHistory7.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * detects a bug where dropHistoryTable is not applied correctly diff --git a/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java b/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java index 7b658368cc..c7fea43ce6 100644 --- a/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java +++ b/ebean-test/src/test/java/misc/migration/history/v1_1/EHistory7.java @@ -1,9 +1,9 @@ package misc.migration.history.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * detects a bug where dropHistoryTable is not applied correctly diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java index 75f0c7013e..ba1725ac6b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java index 2d8c7f956f..83c9d2a5c6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyDetail.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java index dacf6febe6..9b82840387 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParent.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "migtest_ckey_parent") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java index d61d29e7da..6d85f0b735 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java index f7b14f3213..8599eacdeb 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascade.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java index b05ccab94a..7f8df14727 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java index 1c44c06d61..f35aa2fb2f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkNone.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java index 96e5880178..4251108eb0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_0; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java index 28e2da2299..0762022f8a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java index 6c46d75290..396ec48ab0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/DfkSetNull.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java index 9bc8ee0329..d53398aa1c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EBasic.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.io.File; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java index 834099a10a..9125a42efa 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EEnum.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_enum") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java index fc659f2706..05125e47df 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Tablespace; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java index d29a2c45b6..ca1c23032e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory2.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history2") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java index 1224581a71..9e964c776f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory3.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java index ce1b464e13..592760ceb0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory4.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java index a6e5f5ee69..924b2fddb3 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory5.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java index 9a1fd23b7e..3033d1b477 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EHistory6.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java index 964f766056..dec74391fe 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/EQuoted.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; // table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java index 46103c1731..7ed1990a1e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ERef.java @@ -3,10 +3,10 @@ import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java index 58d9a0af07..4758647115 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ESoftdelete.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java index 0a593993f2..34edeae82e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/ETable.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java index c0f9f59183..56fe39d6e1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/MtmChild.java @@ -1,9 +1,9 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_mtm_c") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java index 87b23387cb..603e09b3bc 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/MtmMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_mtm_m") diff --git a/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java index 23bc8f5699..2f9b3f7ed6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/OtoChild.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java index 770c3e754d..520b99228a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_0/OtoMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_0; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_oto_master") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java index 847ddc32c3..9af912c4d5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java index 2b8655c0b2..b9286eb4b0 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyDetail.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java index 5c039bb067..891cd2c776 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParent.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java index 4d27231663..386926d0c2 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java index 22f1c88f8a..963d407ef1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascade.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java index deed36868e..97705b0a4d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java index 16129121f9..177504b667 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkNone.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java index 5cac1da059..6422f556ed 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java index eb04c6d64e..0c8254e63a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java index be199b097d..521ffb1bd2 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DfkSetNull.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java b/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java index 67bffc1a7c..16bb807348 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropMain.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; /** diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java index 76b8a2b428..268d386cdf 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefMany.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java index 3de28d1ac0..8fdf79d87d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOne.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "drop_ref_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java index de8a012e7f..23ec35b711 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/DropRefOneToOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "drop_ref_one_to_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java index 3ed011c124..6be3b314a7 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EBasic.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java index 577ede01d8..2adc703b08 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EEnum.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java index d7f1829c55..e266f3c35c 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory.java @@ -3,9 +3,9 @@ import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java index 89cf970a7e..a47e62445e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory2.java @@ -6,9 +6,9 @@ import io.ebean.annotation.HistoryExclude; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java index e8ab4ecc87..2dc55632e5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory3.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java index 1ac4d45087..67a877ee69 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory4.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java index f107314895..a8b0cde886 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory5.java @@ -5,9 +5,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java index 171772b0dd..cfde2a19fd 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EHistory6.java @@ -5,9 +5,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java index 7c23cc5400..9b63ab148d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ESoftdelete.java @@ -3,9 +3,9 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java index 20926d60f4..2411fa6bc6 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETable.java @@ -4,7 +4,7 @@ import io.ebean.annotation.History; import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java index 215b0890f0..9675a1d8a5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestBinary.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java index 7405b2f011..dcee36fe8d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestJson.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java index c73428254d..91a6373899 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestLob.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java b/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java index 2ec1cc61d8..6ef702dee2 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/ETestVarchar.java @@ -1,9 +1,9 @@ package misc.migration.v1_1; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/EUser.java b/ebean-test/src/test/java/misc/migration/v1_1/EUser.java index 42b901033a..505b7ae310 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/EUser.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/EUser.java @@ -1,8 +1,8 @@ package misc.migration.v1_1; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_user") diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java index 344ebb4df6..fb0801e034 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Tablespace; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java index 4507821be6..1a21d67ffd 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Tablespace; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java index dd42d0771e..2f89d93674 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/OtoChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java index 80de9b9996..46c934ca72 100644 --- a/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_1/OtoMaster.java @@ -1,6 +1,6 @@ package misc.migration.v1_1; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_oto_master") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java index 351bb3ca79..bd42eb7742 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyAssoc.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_assoc") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java index c02288f0a6..906febe969 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyDetail.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_ckey_detail") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java index 7c44a42dc1..0c56f793e4 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParent.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "migtest_ckey_parent") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java index a2f42926b9..12b1dba4a9 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/CKeyParentId.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java index 31f91eb2a5..5ed826b29a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascade.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_cascade") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java index de1e430031..86db49985e 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkCascadeOne.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java index 4bc65eb4dd..c3e3868ff1 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkNone.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java index 38b64fee72..e3b12ddb7a 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package misc.migration.v1_2; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "migtest_fk_none_via_join") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java index f1141d1862..3db7fe6958 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkOne.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_one") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java b/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java index 01b643c994..b4be7b601f 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/DfkSetNull.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_fk_set_null") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java index 191dc52151..34d985ff28 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EBasic.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.io.File; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java index b77161f218..857ab92f87 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EEnum.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_enum") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java index e4d0e9506d..f2eaec57ac 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Tablespace; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java index 2647b7af4c..8d1d1d13b8 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory2.java @@ -4,9 +4,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.HistoryExclude; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_history2") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java index 2e31ad85c9..e9cc601674 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory3.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java index c556f2c473..d4590ed7a5 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory4.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java index 957ba43f4d..052143c943 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory5.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java index 284b706b85..af2f0ce2fe 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EHistory6.java @@ -5,9 +5,9 @@ import io.ebean.annotation.History; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity diff --git a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java index 38ae02730a..513431b487 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/EQuoted.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; //table with upper and lower case letters @Table(name = "`migtest_QuOtEd`") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java index 66ef3e373d..f233265d89 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ERef.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ERef.java @@ -3,10 +3,10 @@ import io.ebean.annotation.Index; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java b/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java index 5987135e3b..d7289d6b92 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ESoftdelete.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_e_softdelete") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java index edfe5b3091..afa5171e0b 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/ETable.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/ETable.java @@ -4,7 +4,7 @@ import io.ebean.annotation.History; import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Table(name = "`table`") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java index de83d81941..d5cdd76a65 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/MtmChild.java @@ -1,9 +1,9 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_mtm_c") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java index a1e5e41cfb..b30b01f5b9 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/MtmMaster.java @@ -1,8 +1,8 @@ package misc.migration.v1_2; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "migtest_mtm_m") diff --git a/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java index 39b298d8bb..ad957efa01 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/OtoChild.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static io.ebean.annotation.Platform.MYSQL; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java b/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java index ef7f78cbab..e6e69bea6d 100644 --- a/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java +++ b/ebean-test/src/test/java/misc/migration/v1_2/OtoMaster.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import static io.ebean.annotation.Platform.MYSQL; import static io.ebean.annotation.Platform.POSTGRES; diff --git a/ebean-test/src/test/java/org/etest/BSimpleFor.java b/ebean-test/src/test/java/org/etest/BSimpleFor.java index 2da2044129..25829b4306 100644 --- a/ebean-test/src/test/java/org/etest/BSimpleFor.java +++ b/ebean-test/src/test/java/org/etest/BSimpleFor.java @@ -2,10 +2,10 @@ import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import java.time.Instant; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java b/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java index 41a23d20f7..ea1c203be4 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtBaseDomain.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.time.Instant; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtContent.java b/ebean-test/src/test/java/org/multitenant/partition/MtContent.java index 9489c13424..8dbeb5a54f 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtContent.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtContent.java @@ -1,6 +1,6 @@ package org.multitenant.partition; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MtContent extends MtTenantAware { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtNone.java b/ebean-test/src/test/java/org/multitenant/partition/MtNone.java index 83968e1721..1ca74e6253 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtNone.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtNone.java @@ -1,8 +1,8 @@ package org.multitenant.partition; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MtNone { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java index 9c21a14e05..1a2d5a81e1 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtTenant.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Length; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MtTenant { diff --git a/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java b/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java index ea6337a893..2fdc98bd50 100644 --- a/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java +++ b/ebean-test/src/test/java/org/multitenant/partition/MtTenantAware.java @@ -2,8 +2,8 @@ import io.ebean.annotation.TenantId; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class MtTenantAware extends MtBaseDomain { diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java index 32b65492ae..f3f120d530 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFBaseSegment.java @@ -1,6 +1,6 @@ package org.tests.aggregateformula; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java index c1e2d1d442..4593b3bd70 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFPartialSegment.java @@ -1,9 +1,9 @@ package org.tests.aggregateformula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java b/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java index f0c4ac9b5e..2ad3e1d3bd 100644 --- a/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java +++ b/ebean-test/src/test/java/org/tests/aggregateformula/IAFSegmentStatus.java @@ -1,8 +1,8 @@ package org.tests.aggregateformula; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "iaf_segment_status") diff --git a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java index 0340880631..bf02301ab5 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java +++ b/ebean-test/src/test/java/org/tests/basic/TestAnnotationBase.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.ValidationGroupSomething; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Entity; +import jakarta.persistence.MappedSuperclass; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.lang.annotation.ElementType; diff --git a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java index 43af424792..7613edef3b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java +++ b/ebean-test/src/test/java/org/tests/basic/TestErrorBindLog.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Order; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java index eb1ce3daff..1867a694c0 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java +++ b/ebean-test/src/test/java/org/tests/basic/TestIUDVanilla.java @@ -6,7 +6,7 @@ import org.tests.model.basic.EBasicVer; import org.tests.model.basic.UTMaster; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import java.sql.Timestamp; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java index e7c84da152..a3783adf87 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java +++ b/ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java @@ -8,7 +8,7 @@ import org.tests.model.basic.Address; import org.tests.model.basic.metaannotation.SizeMedium; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java index 2f338368b4..4a36fb268b 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -15,9 +15,9 @@ import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import javax.persistence.Embeddable; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import javax.validation.constraints.Size; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java index d1ef2bc7c1..6a2d78454f 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContextMany.java @@ -8,13 +8,13 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java index fb53692331..6126630d2e 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Booking.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java index 7687f56d89..3b86cde62f 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Invoice.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "drel_invoice") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java index a26f182573..459431e000 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Tire.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "tire") diff --git a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java index 01b617d0d2..84fffb43fb 100644 --- a/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java +++ b/ebean-test/src/test/java/org/tests/basic/one2one/Wheel.java @@ -1,6 +1,6 @@ package org.tests.basic.one2one; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "wheel") diff --git a/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java b/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java index 5de7ef9f27..75326d3b3b 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java +++ b/ebean-test/src/test/java/org/tests/basic/type/BSimpleWithGen.java @@ -1,8 +1,8 @@ package org.tests.basic.type; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java index 5750e30a18..bb38df92bf 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/TestBatchOnCascadeExceptionHandling.java @@ -14,7 +14,7 @@ import org.tests.model.basic.EOptOneB; import org.tests.model.basic.EOptOneC; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.sql.Savepoint; diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java index 9357a2668d..cb287cc8a0 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterAddressData.java @@ -2,8 +2,8 @@ import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java index f4112c7463..03d896a11d 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterContractData.java @@ -2,10 +2,10 @@ import io.ebean.annotation.NotNull; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java index c2c6375c25..b4331bf225 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsClient.java @@ -1,9 +1,9 @@ package org.tests.batchinsert.o2o; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java index e75f24aeba..137e01d01d 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterSpecialNeedsContact.java @@ -1,7 +1,7 @@ package org.tests.batchinsert.o2o; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java index 8339ca353c..0030ce7e06 100644 --- a/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java +++ b/ebean-test/src/test/java/org/tests/batchinsert/o2o/MeterVersion.java @@ -2,10 +2,10 @@ import io.ebean.annotation.NotNull; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java index 5648911aa3..d323c7e709 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestBatchLazyWithDeleted.java @@ -6,7 +6,7 @@ import org.tests.model.basic.UUOne; import org.tests.model.basic.UUTwo; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java index 5783e0fb97..8f5f71c4d5 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistantBean.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java index 28001fb8a4..c84de0a755 100644 --- a/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java +++ b/ebean-test/src/test/java/org/tests/batchload/TestLazyLoadNonExistentBean.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.UUOne; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.UUID; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java index 80a543a11d..7ba23c22f2 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPCategory.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java index fd58c7d5c9..822f5588a8 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProduct.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Cache diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java index 3c18bbc1af..f20ccc7dd5 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategory.java @@ -1,9 +1,9 @@ package org.tests.cache.embeddedid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; @IdClass(CEPProductCategoryId.class) @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java index 0cd33f4a41..1cd3e815d5 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/CEPProductCategoryId.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java index a61aeadf55..06fa970edb 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/Concept.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java index 4db4403885..55f2d3c6ec 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/ConceptId.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class ConceptId { diff --git a/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java b/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java index 2716ec70f3..5c15ad0226 100644 --- a/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java +++ b/ebean-test/src/test/java/org/tests/cache/embeddedid/Connection.java @@ -1,6 +1,6 @@ package org.tests.cache.embeddedid; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @IdClass(ConceptId.class) diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java index 144253edf4..1d58df4584 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheEmail.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java index f7747b5bde..b5c154f127 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonCacheInfo.java @@ -3,8 +3,8 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java index b4b5051255..6ec0569c8f 100644 --- a/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java +++ b/ebean-test/src/test/java/org/tests/cache/personinfo/PersonOther.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.time.Instant; diff --git a/ebean-test/src/test/java/org/tests/cascade/COOne.java b/ebean-test/src/test/java/org/tests/cascade/COOne.java index 07c92ecac6..fced7fe5c6 100644 --- a/ebean-test/src/test/java/org/tests/cascade/COOne.java +++ b/ebean-test/src/test/java/org/tests/cascade/COOne.java @@ -1,11 +1,11 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class COOne { diff --git a/ebean-test/src/test/java/org/tests/cascade/COOneMany.java b/ebean-test/src/test/java/org/tests/cascade/COOneMany.java index 8894ca8ee6..d773df6940 100644 --- a/ebean-test/src/test/java/org/tests/cascade/COOneMany.java +++ b/ebean-test/src/test/java/org/tests/cascade/COOneMany.java @@ -2,8 +2,8 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class COOneMany { diff --git a/ebean-test/src/test/java/org/tests/cascade/CORoot.java b/ebean-test/src/test/java/org/tests/cascade/CORoot.java index 68700b0d37..296c7d485d 100644 --- a/ebean-test/src/test/java/org/tests/cascade/CORoot.java +++ b/ebean-test/src/test/java/org/tests/cascade/CORoot.java @@ -1,10 +1,10 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class CORoot { diff --git a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java index 2febada002..29f3c22a58 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedDetail.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity @Cache diff --git a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java index 093a2946fb..9f4d1300d4 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmCacheOrderedMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java index b15a4ff8e3..412bda3c2b 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmOrderedDetail.java @@ -1,9 +1,9 @@ package org.tests.cascade; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmOrderedDetail { diff --git a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java index 89141a3457..8db5bef7af 100644 --- a/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/OmOrderedMaster.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java index 29e4945396..a0b278da42 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelDetail.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelDetail.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java index 06bf64f181..26bad8cdf3 100644 --- a/ebean-test/src/test/java/org/tests/cascade/RelMaster.java +++ b/ebean-test/src/test/java/org/tests/cascade/RelMaster.java @@ -1,6 +1,6 @@ package org.tests.cascade; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class RelMaster { diff --git a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java index e1d5f19dfd..79c4610b15 100644 --- a/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java +++ b/ebean-test/src/test/java/org/tests/cascade/TestPrivateOwnedIgnoreTransientOrphan.java @@ -6,7 +6,7 @@ import org.tests.model.basic.TSDetail; import org.tests.model.basic.TSMaster; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import static org.assertj.core.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java index 0df82645c0..89e2c4fc50 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/TestOnCascadeDeleteChildrenWithCompositeKeys.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java b/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java index c2f87d08d7..46fa475df5 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/AuditInfo.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java index 8638fe6104..22cc4b23c5 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoBean.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CaoBean { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java index 4d56e0cf6c..1235931ea0 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/CaoKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class CaoKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java index 9aca96574c..df62a8318b 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Item.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Item { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java index adc1767696..c77a9172c5 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/ItemKey.java @@ -1,7 +1,7 @@ package org.tests.compositekeys.db; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java index bf1324de9e..b695e8ec65 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Parcel.java @@ -1,8 +1,8 @@ package org.tests.compositekeys.db; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Parcel { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java index 79d5416738..0b79041e64 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/ParcelLocation.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ParcelLocation { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java index be0891ac8c..8dc04b5583 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Region.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java index ecf8b3f861..55084a798a 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/RegionKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RegionKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java index a6defdc4ec..a441fa1e42 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/SubType.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Identity; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java index 0a98564e1b..e19cd42673 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/SubTypeKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class SubTypeKey { diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java index bfd160d983..a45a7753b9 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/Type.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java b/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java index 2725c0867f..e8d2e9af83 100644 --- a/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java +++ b/ebean-test/src/test/java/org/tests/compositekeys/db/TypeKey.java @@ -1,6 +1,6 @@ package org.tests.compositekeys.db; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class TypeKey { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java index 18f4f8201b..1c699fcbca 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkCascade.java @@ -3,9 +3,9 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class DfkCascade { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java index fa3c14c2c8..94de27cad5 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkCascadeOne.java @@ -1,9 +1,9 @@ package org.tests.ddl; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNone.java b/ebean-test/src/test/java/org/tests/ddl/DfkNone.java index 995ba990d8..be0218be87 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNone.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNone.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class DfkNone { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java index 5d95be203f..1a34ab0adc 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaJoin.java @@ -1,6 +1,6 @@ package org.tests.ddl; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class DfkNoneViaJoin { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java index 9b781e3c8d..c1c3e6afe5 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkNoneViaMtoM.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkOne.java b/ebean-test/src/test/java/org/tests/ddl/DfkOne.java index 84bb826d85..d4852716fb 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkOne.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkOne.java @@ -1,7 +1,7 @@ package org.tests.ddl; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class DfkOne { diff --git a/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java b/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java index 5f55e3f0be..aef54a4f7c 100644 --- a/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java +++ b/ebean-test/src/test/java/org/tests/ddl/DfkSetNull.java @@ -3,9 +3,9 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class DfkSetNull { diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java index 5140be70ce..cb1936c6f8 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/DefaultsModel.java @@ -3,10 +3,10 @@ import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java b/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java index 77546973d4..04c9b0e395 100644 --- a/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java +++ b/ebean-test/src/test/java/org/tests/defaultvalues/ReferencedDefaultsModel.java @@ -3,8 +3,8 @@ import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Draftable diff --git a/ebean-test/src/test/java/org/tests/delete/DcDetail.java b/ebean-test/src/test/java/org/tests/delete/DcDetail.java index e49cc58bc4..4a118009e1 100644 --- a/ebean-test/src/test/java/org/tests/delete/DcDetail.java +++ b/ebean-test/src/test/java/org/tests/delete/DcDetail.java @@ -1,8 +1,8 @@ package org.tests.delete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class DcDetail { diff --git a/ebean-test/src/test/java/org/tests/delete/DcMaster.java b/ebean-test/src/test/java/org/tests/delete/DcMaster.java index 22a0e1b3ae..43a4136e9d 100644 --- a/ebean-test/src/test/java/org/tests/delete/DcMaster.java +++ b/ebean-test/src/test/java/org/tests/delete/DcMaster.java @@ -1,6 +1,6 @@ package org.tests.delete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java index def5d23742..ddebc9ec71 100644 --- a/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java +++ b/ebean-test/src/test/java/org/tests/draftable/DocLinkTest.java @@ -9,7 +9,7 @@ import org.tests.model.draftable.Doc; import org.tests.model.draftable.Link; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java index 19fe7661d1..37f40457f7 100644 --- a/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java +++ b/ebean-test/src/test/java/org/tests/expression/bitwise/BwBean.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BwBean extends Model { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java b/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java index c9997015a9..5749cbe920 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/AuditLog.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java b/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java index 4388e2ddbd..e337be332b 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/EaObject.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "ea_object") diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java index 2be7954db7..ab276ee24d 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeyIdentity.java @@ -1,9 +1,9 @@ package org.tests.idkeys.db; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class GenKeyIdentity { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java index 85051a34c2..0d2a04d91d 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqA.java @@ -1,9 +1,9 @@ package org.tests.idkeys.db; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; @Entity public class GenKeySeqA { diff --git a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java index 474e4902ac..e0f8f90b4c 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java +++ b/ebean-test/src/test/java/org/tests/idkeys/db/GenKeySeqB.java @@ -1,6 +1,6 @@ package org.tests.idkeys.db; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class GenKeySeqB { diff --git a/ebean-test/src/test/java/org/tests/inherit/ChildA.java b/ebean-test/src/test/java/org/tests/inherit/ChildA.java index 9e68184159..55412518ee 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ChildA.java +++ b/ebean-test/src/test/java/org/tests/inherit/ChildA.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("A") diff --git a/ebean-test/src/test/java/org/tests/inherit/ChildB.java b/ebean-test/src/test/java/org/tests/inherit/ChildB.java index 34a42e5702..7a92f3f256 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ChildB.java +++ b/ebean-test/src/test/java/org/tests/inherit/ChildB.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("B") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java index a76c0f272a..b4a2f2ebc1 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChild1.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("1") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java b/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java index 5f3737c900..087782ec18 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChild2.java @@ -1,7 +1,7 @@ package org.tests.inherit; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("2") diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java b/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java index 747a995c96..e17172e4a5 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntChildBase.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class DIntChildBase extends DIntParent { diff --git a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java index f67cd5041c..5bd4122a57 100644 --- a/ebean-test/src/test/java/org/tests/inherit/DIntParent.java +++ b/ebean-test/src/test/java/org/tests/inherit/DIntParent.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "dint_parent") diff --git a/ebean-test/src/test/java/org/tests/inherit/Data.java b/ebean-test/src/test/java/org/tests/inherit/Data.java index 0f20e16c37..e145787952 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Data.java +++ b/ebean-test/src/test/java/org/tests/inherit/Data.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inherit/EUncle.java b/ebean-test/src/test/java/org/tests/inherit/EUncle.java index 6dbe920892..7eb423f446 100644 --- a/ebean-test/src/test/java/org/tests/inherit/EUncle.java +++ b/ebean-test/src/test/java/org/tests/inherit/EUncle.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "rawinherit_uncle") diff --git a/ebean-test/src/test/java/org/tests/inherit/Parent.java b/ebean-test/src/test/java/org/tests/inherit/Parent.java index 4eac1553ae..1e440903d8 100644 --- a/ebean-test/src/test/java/org/tests/inherit/Parent.java +++ b/ebean-test/src/test/java/org/tests/inherit/Parent.java @@ -1,6 +1,6 @@ package org.tests.inherit; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java b/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java index d015616692..f082bc7cd0 100644 --- a/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java +++ b/ebean-test/src/test/java/org/tests/inherit/ParentAggregate.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java index 8a3964f9eb..19d1f1089d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java +++ b/ebean-test/src/test/java/org/tests/inheritance/InnerReport.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import javax.persistence.*; +import jakarta.persistence.*; /** */ diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java index 613637800f..16d6b27ddc 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationNode.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; /** diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java index f03850f1c0..062a67420b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationTreeNode.java @@ -1,12 +1,12 @@ package org.tests.inheritance; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import javax.validation.constraints.NotNull; -import static javax.persistence.CascadeType.ALL; -import static javax.persistence.FetchType.LAZY; +import static jakarta.persistence.CascadeType.ALL; +import static jakarta.persistence.FetchType.LAZY; /** * Model class to reference an organization tree node. diff --git a/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java b/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java index 19814855f6..6bde8ee890 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java +++ b/ebean-test/src/test/java/org/tests/inheritance/OrganizationUnit.java @@ -1,7 +1,7 @@ package org.tests.inheritance; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("Unit") diff --git a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java index c5ac10b648..5215cbe53b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java +++ b/ebean-test/src/test/java/org/tests/inheritance/Stockforecast.java @@ -1,6 +1,6 @@ package org.tests.inheritance; -import javax.persistence.*; +import jakarta.persistence.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java index ecd0c2e39c..f7fbe69492 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/AbstractBaseBlock.java @@ -1,6 +1,6 @@ package org.tests.inheritance.abstrakt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "blockt") diff --git a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java index ea0297de1e..73d8388240 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java +++ b/ebean-test/src/test/java/org/tests/inheritance/abstrakt/Block.java @@ -1,7 +1,7 @@ package org.tests.inheritance.abstrakt; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value = "2") diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java index bf2432b2af..587a81900d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceA.java @@ -1,8 +1,8 @@ package org.tests.inheritance.bothsides; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class SourceA extends SourceBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java index 2cac1f07ca..44f570ffad 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceB.java @@ -1,8 +1,8 @@ package org.tests.inheritance.bothsides; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class SourceB extends SourceBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java index 53056bbb9a..d9ae07d90f 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/SourceBase.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java index 0febee7cf5..fe5155a908 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target1.java @@ -1,6 +1,6 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Target1 extends TargetBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java index 76c4bb28b2..d581a08d97 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/Target2.java @@ -1,6 +1,6 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Target2 extends TargetBase { diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java index e5359d6573..71b849277f 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/TargetBase.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java b/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java index 848269e23d..80c958cee7 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java +++ b/ebean-test/src/test/java/org/tests/inheritance/bothsides/WithAutoGeneratedUUID.java @@ -1,7 +1,7 @@ package org.tests.inheritance.bothsides; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.util.UUID; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java index fea779587e..27922451df 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIAddress.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CIAddress extends CIBaseModel { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java index 64e983fa85..19021e320d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIBaseModel.java @@ -3,8 +3,8 @@ import io.ebean.Model; import io.ebean.annotation.Cache; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @Cache(enableQueryCache=true) @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java index 3ac832e3d0..2cd10cb820 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomer.java @@ -1,7 +1,7 @@ package org.tests.inheritance.cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue(value="1") diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java index 7e376add8a..73cdd8d6d3 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CICustomerParent.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java index f61dd11bf5..66ccad83fc 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreet.java @@ -1,9 +1,9 @@ package org.tests.inheritance.cache; -import javax.persistence.Column; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "street") diff --git a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java index 88b2de299f..8c568d3441 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cache/CIStreetParent.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java index 095ba5af6d..d8b082c943 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ComplexBean.java @@ -1,10 +1,10 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class ComplexBean extends RootBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java index ccf784adcc..cda033333c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ElementBean.java @@ -2,9 +2,9 @@ import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class ElementBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java index 3c66367e89..d5ee430952 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/ReferencingBean.java @@ -1,13 +1,13 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; import java.util.UUID; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class ReferencingBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java index 76d9ddc0c6..bd72f50b0d 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/RootBean.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java index e234228fc1..69a6674b9c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java +++ b/ebean-test/src/test/java/org/tests/inheritance/cascadedelete/SimpleBean.java @@ -1,6 +1,6 @@ package org.tests.inheritance.cascadedelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class SimpleBean extends RootBean { diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java index 899381d4e9..6f42c6da89 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/AbstractBar.java @@ -1,6 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java index b192290cf0..61285db0f3 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/ConcreteBar.java @@ -1,7 +1,7 @@ package org.tests.inheritance.company.domain; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java index 5ef6ef7c89..b64ab0337b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java +++ b/ebean-test/src/test/java/org/tests/inheritance/company/domain/Foo.java @@ -1,6 +1,6 @@ package org.tests.inheritance.company.domain; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Per-Ingemar Andersson, It-huset i Norden AB diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java b/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java index ae914d0c7d..c8843ccee2 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/AbstractBaseClass.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractBaseClass { diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java index 6d315b65a3..2ac44823e1 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/CalculationResult.java @@ -1,6 +1,6 @@ package org.tests.inheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CalculationResult { diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java index c58afe6c11..cea72d5459 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/Configuration.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.ChangeLog; -import javax.persistence.*; +import jakarta.persistence.*; @ChangeLog @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java b/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java index 7afed20a69..fa3f577ecf 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/Configurations.java @@ -1,9 +1,9 @@ package org.tests.inheritance.model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java index e1b90aef42..9e40cab92c 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/GroupConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java b/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java index 3ff22d7bbc..d39f7bb091 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java +++ b/ebean-test/src/test/java/org/tests/inheritance/model/ProductConfiguration.java @@ -1,8 +1,8 @@ package org.tests.inheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java index e28fe6b66a..0386f7e52b 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderMasterInheritance.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java index 036ceccf88..de8e5d6d47 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedA.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OrderedA extends OrderedParent { diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java index d21a708e47..810060dc54 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedB.java @@ -1,6 +1,6 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class OrderedB extends OrderedParent { diff --git a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java index 43845541c2..1935a26078 100644 --- a/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java +++ b/ebean-test/src/test/java/org/tests/inheritance/order/OrderedParent.java @@ -1,8 +1,8 @@ package org.tests.inheritance.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java b/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java index 59bf6a04a3..7cee172f3e 100644 --- a/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java +++ b/ebean-test/src/test/java/org/tests/insert/EIdUidBean.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java b/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java index c251efd5a0..7ce8ba5bb4 100644 --- a/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java +++ b/ebean-test/src/test/java/org/tests/insert/OnlyIdEntity.java @@ -1,7 +1,7 @@ package org.tests.insert; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OnlyIdEntity { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java b/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java index 2f30ccd495..592f3b8bbb 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCalendar.java @@ -1,11 +1,11 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfCalendar extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCity.java b/ebean-test/src/test/java/org/tests/iud/PcfCity.java index 2612bc1f37..969cbb6cdc 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCity.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCity.java @@ -1,9 +1,9 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfCity extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfCountry.java b/ebean-test/src/test/java/org/tests/iud/PcfCountry.java index bdfb3f930e..e572994338 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfCountry.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfCountry.java @@ -1,8 +1,8 @@ package org.tests.iud; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/iud/PcfEvent.java b/ebean-test/src/test/java/org/tests/iud/PcfEvent.java index 1a8aa8d40d..f6de132004 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfEvent.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfEvent.java @@ -1,6 +1,6 @@ package org.tests.iud; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class PcfEvent extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfModel.java b/ebean-test/src/test/java/org/tests/iud/PcfModel.java index 1184352433..ef6030c175 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfModel.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfModel.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class PcfModel extends Model { diff --git a/ebean-test/src/test/java/org/tests/iud/PcfPerson.java b/ebean-test/src/test/java/org/tests/iud/PcfPerson.java index 1a3cfdf595..c29d311860 100644 --- a/ebean-test/src/test/java/org/tests/iud/PcfPerson.java +++ b/ebean-test/src/test/java/org/tests/iud/PcfPerson.java @@ -1,11 +1,11 @@ package org.tests.iud; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class PcfPerson extends PcfModel { diff --git a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java index 27434601ef..fbca4ace74 100644 --- a/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java +++ b/ebean-test/src/test/java/org/tests/json/TestDbJson_List.java @@ -10,7 +10,7 @@ import org.tests.model.json.EBasicJsonList; import org.tests.model.json.PlainBean; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.*; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java index a3d937a777..8762122834 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonJacksonIgnore.java @@ -3,8 +3,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java index 18cc8b8548..b8d4f4d960 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientEntityList.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Sql; import org.tests.model.basic.Order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java index cb9d46d8de..0835146270 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientList.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java index 5827027800..ba37681909 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/EJsonTransientObject.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java index 3a2ae072c5..29aae4c43b 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelA.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.List; @Sql diff --git a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java index ea2eb71fb2..91f07257a9 100644 --- a/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java +++ b/ebean-test/src/test/java/org/tests/json/transientproperties/ModelB.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Sql @Entity diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java index bacfbdf9f6..c28f9e3cfd 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntity.java @@ -4,9 +4,9 @@ import io.ebean.annotation.Platform; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "main_entity") diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java index 280b4221cb..805bcabc9e 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/MainEntityRelation.java @@ -4,7 +4,7 @@ import io.ebean.annotation.NotNull; import org.tests.model.basic.Cat; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java index 771862a953..d2611e5068 100644 --- a/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java +++ b/ebean-test/src/test/java/org/tests/lazyforeignkeys/TestLazyForeignKeys.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Cat; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java index 999ef1aa0a..4c0eb92d33 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfig.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java index 8da38cd599..10d04e357c 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/AppConfigControl.java @@ -1,6 +1,6 @@ package org.tests.lazyloadconf; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "app_config_control") diff --git a/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java b/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java index f59e7677ae..b301bf0347 100644 --- a/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java +++ b/ebean-test/src/test/java/org/tests/lazyloadconf/Relationship.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Cache(enableBeanCache = true) diff --git a/ebean-test/src/test/java/org/tests/level/Level1.java b/ebean-test/src/test/java/org/tests/level/Level1.java index 16f79a6ee7..29782a1170 100644 --- a/ebean-test/src/test/java/org/tests/level/Level1.java +++ b/ebean-test/src/test/java/org/tests/level/Level1.java @@ -1,6 +1,6 @@ package org.tests.level; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/Level2.java b/ebean-test/src/test/java/org/tests/level/Level2.java index 76d1339f44..b88e81f48b 100644 --- a/ebean-test/src/test/java/org/tests/level/Level2.java +++ b/ebean-test/src/test/java/org/tests/level/Level2.java @@ -1,6 +1,6 @@ package org.tests.level; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/level/Level3.java b/ebean-test/src/test/java/org/tests/level/Level3.java index 40393b38dc..6168a6ae5c 100644 --- a/ebean-test/src/test/java/org/tests/level/Level3.java +++ b/ebean-test/src/test/java/org/tests/level/Level3.java @@ -1,7 +1,7 @@ package org.tests.level; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Level3 { diff --git a/ebean-test/src/test/java/org/tests/level/Level4.java b/ebean-test/src/test/java/org/tests/level/Level4.java index 5ef9b6269d..b517ec0223 100644 --- a/ebean-test/src/test/java/org/tests/level/Level4.java +++ b/ebean-test/src/test/java/org/tests/level/Level4.java @@ -1,7 +1,7 @@ package org.tests.level; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class Level4 { diff --git a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java index 07491fa1fd..44eeddfe2a 100644 --- a/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/lifecycle/TestLifecycleExceptions.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasicWithLifecycleExceptions; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.io.IOException; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java index 0b9cf1f24f..57971c59f1 100644 --- a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java +++ b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyA.java @@ -2,9 +2,9 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java index 2ae3f93406..dbaedd8798 100644 --- a/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java +++ b/ebean-test/src/test/java/org/tests/m2m/softdelete/MsManyB.java @@ -2,9 +2,9 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MAddress.java b/ebean-test/src/test/java/org/tests/merge/MAddress.java index cfeb31bb6f..ccaef2c47a 100644 --- a/ebean-test/src/test/java/org/tests/merge/MAddress.java +++ b/ebean-test/src/test/java/org/tests/merge/MAddress.java @@ -1,6 +1,6 @@ package org.tests.merge; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class MAddress extends MBase { diff --git a/ebean-test/src/test/java/org/tests/merge/MBase.java b/ebean-test/src/test/java/org/tests/merge/MBase.java index c0daf222ee..e11e850155 100644 --- a/ebean-test/src/test/java/org/tests/merge/MBase.java +++ b/ebean-test/src/test/java/org/tests/merge/MBase.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.util.UUID; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/merge/MContact.java b/ebean-test/src/test/java/org/tests/merge/MContact.java index 9331bbb430..5631f1f75a 100644 --- a/ebean-test/src/test/java/org/tests/merge/MContact.java +++ b/ebean-test/src/test/java/org/tests/merge/MContact.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MContactMessage.java b/ebean-test/src/test/java/org/tests/merge/MContactMessage.java index a5f71b4526..5021a24267 100644 --- a/ebean-test/src/test/java/org/tests/merge/MContactMessage.java +++ b/ebean-test/src/test/java/org/tests/merge/MContactMessage.java @@ -2,8 +2,8 @@ import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class MContactMessage extends MBase { diff --git a/ebean-test/src/test/java/org/tests/merge/MCustomer.java b/ebean-test/src/test/java/org/tests/merge/MCustomer.java index 802f8000bd..186b6a2fdb 100644 --- a/ebean-test/src/test/java/org/tests/merge/MCustomer.java +++ b/ebean-test/src/test/java/org/tests/merge/MCustomer.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/merge/MGroup.java b/ebean-test/src/test/java/org/tests/merge/MGroup.java index a455006af7..7c87c72343 100644 --- a/ebean-test/src/test/java/org/tests/merge/MGroup.java +++ b/ebean-test/src/test/java/org/tests/merge/MGroup.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/merge/MMachine.java b/ebean-test/src/test/java/org/tests/merge/MMachine.java index 896da51a11..ba78dd9f5d 100644 --- a/ebean-test/src/test/java/org/tests/merge/MMachine.java +++ b/ebean-test/src/test/java/org/tests/merge/MMachine.java @@ -1,9 +1,9 @@ package org.tests.merge; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Version; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/BaseModel.java b/ebean-test/src/test/java/org/tests/model/BaseModel.java index da67d03758..525f6f25a7 100644 --- a/ebean-test/src/test/java/org/tests/model/BaseModel.java +++ b/ebean-test/src/test/java/org/tests/model/BaseModel.java @@ -4,9 +4,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/EGenProps.java b/ebean-test/src/test/java/org/tests/model/EGenProps.java index 623b131f95..43ef3c445c 100644 --- a/ebean-test/src/test/java/org/tests/model/EGenProps.java +++ b/ebean-test/src/test/java/org/tests/model/EGenProps.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.sql.Timestamp; import java.time.Instant; import java.time.LocalDateTime; diff --git a/ebean-test/src/test/java/org/tests/model/EWhoProps.java b/ebean-test/src/test/java/org/tests/model/EWhoProps.java index 54d3445d83..ddf93c42d1 100644 --- a/ebean-test/src/test/java/org/tests/model/EWhoProps.java +++ b/ebean-test/src/test/java/org/tests/model/EWhoProps.java @@ -1,6 +1,6 @@ package org.tests.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EWhoProps extends EWhoPropsSuper { diff --git a/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java b/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java index 156eb52d1c..2b3c9304c6 100644 --- a/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java +++ b/ebean-test/src/test/java/org/tests/model/EWhoPropsSuper.java @@ -5,9 +5,9 @@ import io.ebean.annotation.WhoCreated; import io.ebean.annotation.WhoModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java index af12d57873..d37f100702 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachine.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java index 58eae294d8..94dd05fe99 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUse.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java index b5863efb3b..af9ea87452 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineAuxUseAgg.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Sum; import io.ebean.annotation.View; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java index d88df603d9..3b90352ea7 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStats.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java index dc3da08c27..2f1b5a83ed 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineStatsAgg.java @@ -5,9 +5,9 @@ import io.ebean.annotation.Sum; import io.ebean.annotation.View; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java index 66d3677f31..ff9feaff49 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DMachineUse.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java b/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java index e0cbd9352c..1bf9d7b674 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/DOrg.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class DOrg extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java b/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java index 0e18650f65..1674e8c545 100644 --- a/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java +++ b/ebean-test/src/test/java/org/tests/model/aggregation/Decimal93.java @@ -1,6 +1,6 @@ package org.tests.model.aggregation; -import javax.persistence.Column; +import jakarta.persistence.Column; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java index a9e3f44310..14cea519e2 100644 --- a/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java +++ b/ebean-test/src/test/java/org/tests/model/array/EArrayBean.java @@ -5,9 +5,9 @@ import io.ebean.annotation.DbArray; import io.ebean.annotation.NotNull; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java b/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java index 523fa34362..7286a7cfd6 100644 --- a/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java +++ b/ebean-test/src/test/java/org/tests/model/array/EArraySetBean.java @@ -4,9 +4,9 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.DbArray; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Address.java b/ebean-test/src/test/java/org/tests/model/basic/Address.java index 98234699ae..0c3334d40a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Address.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Address.java @@ -3,7 +3,7 @@ import io.ebean.annotation.InvalidateQueryCache; import org.tests.model.basic.metaannotation.SizeMedium; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Animal.java b/ebean-test/src/test/java/org/tests/model/basic/Animal.java index 069b1e4cfa..ba68c99d57 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Animal.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Animal.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java b/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java index 761a8d4c70..ae3c9a1601 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java +++ b/ebean-test/src/test/java/org/tests/model/basic/AnimalShelter.java @@ -1,12 +1,12 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.PERSIST; +import static jakarta.persistence.CascadeType.PERSIST; @Entity public class AnimalShelter { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Article.java b/ebean-test/src/test/java/org/tests/model/basic/Article.java index 797366edd4..4cc6f020bb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Article.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Article.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.CacheBeanTuning; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java index d660c93f09..5aa6085b75 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Attribute.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Attribute.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance() diff --git a/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java b/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java index 080b87fa57..351fee45d8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java +++ b/ebean-test/src/test/java/org/tests/model/basic/AttributeHolder.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java index 9cc71440db..0f02573585 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmark.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; /** * A user may have multiple bookmarks diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java index 305ab9497f..a01f78ef33 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkOrg.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class BBookmarkOrg { diff --git a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java index 064f4aa66a..2fe503e7d1 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BBookmarkUser.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * @author Chris diff --git a/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java b/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java index fcb91cdb3d..774cf8ef03 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BWithQIdent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java b/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java index 86c39f5b49..da618902ed 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BasicDomain.java @@ -3,9 +3,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java b/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java index 89ae68bcdc..550abd3033 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BeanWithTimeZone.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.TimeZone; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/BigDog.java b/ebean-test/src/test/java/org/tests/model/basic/BigDog.java index ddd6e54599..0aa1c331ac 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/BigDog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/BigDog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("BDG") diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java index 4a71909a89..ac0a629f76 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyAssoc.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CKeyAssoc { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java index aed4a10b93..4a353ac3df 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyDetail.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class CKeyDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java index 1b1cb0a81e..0067a35005 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyParent.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java b/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java index a0d8c828c8..139b448f71 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CKeyParentId.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/basic/Car.java b/ebean-test/src/test/java/org/tests/model/basic/Car.java index 268920a34d..c55fe81bf8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Car.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Car.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java b/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java index 37ee5720e6..b134230a0b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CarAccessory.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class CarAccessory extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java b/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java index df2aef5bf0..7c2dd390c8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CarFuse.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class CarFuse { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Cat.java b/ebean-test/src/test/java/org/tests/model/basic/Cat.java index d3df201b61..a9d0581afe 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Cat.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Cat.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Formula; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("CAT") diff --git a/ebean-test/src/test/java/org/tests/model/basic/Contact.java b/ebean-test/src/test/java/org/tests/model/basic/Contact.java index 2d2f639c8d..5b2b05139e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Contact.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Contact.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java b/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java index 1b2963624d..a0e4fcb7b4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ContactGroup.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ContactGroup extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java b/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java index ffe0b2e56e..f1fbc8075c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ContactNote.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Country.java b/ebean-test/src/test/java/org/tests/model/basic/Country.java index bde38fc78d..73f9764214 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Country.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Country.java @@ -2,9 +2,9 @@ import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/Customer.java b/ebean-test/src/test/java/org/tests/model/basic/Customer.java index 48b2c62910..b97895fbf4 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Customer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Customer.java @@ -3,7 +3,7 @@ import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java index 5c4887e9ad..7e6d0a028d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/CustomerAggregate.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-test/src/test/java/org/tests/model/basic/Dog.java b/ebean-test/src/test/java/org/tests/model/basic/Dog.java index 7b2fad5466..be7e4f4759 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Dog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Dog.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java index 603102032e..42cae8c935 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasic.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasic.java @@ -3,9 +3,9 @@ import io.ebean.annotation.EnumValue; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java index 214a2447fa..279b2b4b57 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicChangeLog.java @@ -3,9 +3,9 @@ import io.ebean.annotation.*; import org.tests.model.json.PlainBean; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java index 0541f1b3f2..5aba6bcebb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClob.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Version; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java index 4ae5a6b1de..bcfa0be7c9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobFetchEager.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java index 410b0cbf3a..5a7d2b863e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVer.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java index 8af997f69c..36c5ccd311 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicClobNoVerChild.java @@ -2,9 +2,9 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class EBasicClobNoVerChild { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java index 3fb5cc9e43..6975b21e0e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncrypt.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Date; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java index 77c6b2f2b3..063c26171e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptBinary.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java index f77af37f58..629d34250c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptClient.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Encrypted; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java index aaff1184e8..0fda7b6b3f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEncryptRelate.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "e_basicenc_relate") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java index 698f6eac28..3460cc9981 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumId.java @@ -2,9 +2,9 @@ import io.ebean.annotation.EnumValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "e_basic_enum_id") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java index 7cccf2ac1c..99cd57c829 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicEnumInt.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DbEnumType; import io.ebean.annotation.DbEnumValue; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java index 160fff74ab..297d4b2b3e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicLog.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "e_basic_log") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java index 163827a182..9e1f225edb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicNoDefaultConstructor.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "e_basic_ndc") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java index eaefd65fb5..3724a870b0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicTree.java @@ -1,11 +1,11 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderBy; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderBy; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java index 10fcbee547..f0e7c82f5d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicVer.java @@ -4,10 +4,10 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java index 44902ed31d..11038e2610 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycle.java @@ -6,7 +6,7 @@ import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_withlife") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java index e5df815e97..2d8a592d91 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLifecycleExceptions.java @@ -5,7 +5,7 @@ import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_with_ex") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java index eee062e946..ae91ad03c7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithLog.java @@ -6,7 +6,7 @@ import io.ebean.annotation.SoftDelete; import javax.annotation.PostConstruct; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_basic_withlog") diff --git a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java index 6573b3007e..ece55fd9c1 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EBasicWithUniqueCon.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java b/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java index 0655ac7812..22e21e00a3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ECustomId.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java b/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java index 8635706c4a..91bb9ae69a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EDefaultProp.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class EDefaultProp { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java index 8449d7d926..31e9c24c7b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ENullCollection.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java index 8c84ef4e5f..9af4fa94ec 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ENullCollectionDetail.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ENullCollectionDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java index 8a47cec81a..ee8534764e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneA.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EOptOneA extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java index 6b94d1ecc1..9f849a1968 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneB.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EOptOneB extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java b/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java index 15ac6809f1..f4f6513db5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EOptOneC.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class EOptOneC extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java index a827bc5b4d..f9ad3cc1a0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ESimple.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ESimple.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ESimple { diff --git a/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java b/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java index 5db551231d..1530ffc950 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ESomeType.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.Currency; import java.util.Locale; import java.util.TimeZone; diff --git a/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java b/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java index 75cc12edba..8dc053dba8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ETransMany.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java index 979a3ea28d..288bd8f401 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollection.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java index 414828a981..72b7a359eb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EVanillaCollectionDetail.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class EVanillaCollectionDetail { diff --git a/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java b/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java index 29a187be3d..7b72a709c5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java +++ b/ebean-test/src/test/java/org/tests/model/basic/EWithInetAddr.java @@ -3,10 +3,10 @@ import io.ebean.types.Cidr; import io.ebean.types.Inet; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import java.net.InetAddress; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java index 9f7dee4b6f..2c8c6fd1a9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java +++ b/ebean-test/src/test/java/org/tests/model/basic/FeatureDescription.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Index; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Index; +import jakarta.persistence.Table; @Cache(readOnly = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java index 3f426696da..9fd059a8ec 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java index 4aaf5e2cac..c93fdb8d92 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "l2_cldf_reset_bean_child") diff --git a/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java index 0633e254fe..945ec1d197 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ListAttribute.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java b/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java index 8c88c06e98..1b3950f155 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java +++ b/ebean-test/src/test/java/org/tests/model/basic/ListAttributeValue.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java index 3e6ebfaece..d0eadcd7e5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MNonUpdPropEntity.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "non_updateprop") diff --git a/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java b/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java index a04fb62f3c..1fab0f8b09 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MProtectedConstructBean.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MProtectedConstructBean { diff --git a/ebean-test/src/test/java/org/tests/model/basic/MRole.java b/ebean-test/src/test/java/org/tests/model/basic/MRole.java index c66a1db607..8ce68ac0df 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MRole.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MRole.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MUser.java b/ebean-test/src/test/java/org/tests/model/basic/MUser.java index 7abf2ec605..0f45275b78 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MUser.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MUserType.java b/ebean-test/src/test/java/org/tests/model/basic/MUserType.java index 9d147bceee..3dcf373e1d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MUserType.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MUserType.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "muser_type") diff --git a/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java b/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java index 9b7b6b0839..84111f24bb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MnocRole.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MnocRole { diff --git a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java index aa71e9497c..d75825808e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MnocUser.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java b/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java index 7593dc6d07..9976f94874 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyAdHoc.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java index df731191e7..caf515c27e 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSize.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java index 2534a6ebf3..b6261df26a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java +++ b/ebean-test/src/test/java/org/tests/model/basic/MyLobSizeJoinMany.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MyLobSizeJoinMany { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java index a4d8d65ee6..00bff96f04 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OBeanChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Not cached bean (copy of {@link OCachedBeanChild}} without {@link Cache} annotation diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java index 1919822cb9..bb906f8e8d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBean.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java index a2f99e85e0..8a67f8249d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedBeanChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; /** * Cached bean for testing caching implementation, especially relations. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java index 8ec1833796..b02aa68da7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildA.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java index 1ef25a2cae..7bb43c225f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhChildB.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java index ef6acaec8d..ed97d8cd80 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCachedInhRoot.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Table; /** * Cached entity for inheritance. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OCar.java b/ebean-test/src/test/java/org/tests/model/basic/OCar.java index db0ebf12c2..17367e2f3c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OCar.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OCar.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OCar extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java index cb239a007f..74aebe6706 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OEngine.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OEngine.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java index 9f758cf212..7b4c55c20a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OGearBox.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Order.java b/ebean-test/src/test/java/org/tests/model/basic/Order.java index dfb9f2aef5..1d97448687 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Order.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Order.java @@ -2,7 +2,7 @@ import io.ebean.annotation.*; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java b/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java index 364d94f2fe..8da916a41c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderAggregate.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; /** * An example of an Aggregate object. diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java index 3938372963..b7318d9680 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderDetail.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.DocEmbedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.math.BigDecimal; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java b/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java index a587538a1b..9448671000 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java +++ b/ebean-test/src/test/java/org/tests/model/basic/OrderShipment.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/PFile.java b/ebean-test/src/test/java/org/tests/model/basic/PFile.java index ddac4e6c49..7652d1f2c5 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PFile.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PFile.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class PFile extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java index eba148198d..76bf52c1cd 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PFileContent.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Lob; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; @Entity public class PFileContent extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java index 603cf43b48..ca2563ca5c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PersistentFile.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class PersistentFile extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java b/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java index dce5b6a1ef..34b89b18a9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/PersistentFileContent.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; +import jakarta.persistence.OneToOne; @Entity public class PersistentFileContent extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/basic/Person.java b/ebean-test/src/test/java/org/tests/model/basic/Person.java index d58d0f6814..781a65da55 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Person.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Person.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.List; @@ -11,7 +11,7 @@ public class Person implements Serializable { private static final long serialVersionUID = 495045977245770183L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @SequenceGenerator(name = "PERSONS_SEQ", initialValue = 1000, allocationSize = 40) @Column(name = "ID", unique = true, nullable = false) private Long id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Phone.java b/ebean-test/src/test/java/org/tests/model/basic/Phone.java index 736e748af2..32c660fd44 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Phone.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Phone.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; @@ -11,7 +11,7 @@ public class Phone implements Serializable { private static final long serialVersionUID = -326610269092956952L; @Id - @GeneratedValue(strategy = javax.persistence.GenerationType.AUTO) + @GeneratedValue(strategy = jakarta.persistence.GenerationType.AUTO) @Column(name = "id", unique = true, nullable = false) private Long id; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Product.java b/ebean-test/src/test/java/org/tests/model/basic/Product.java index b0fde6d073..df57dadd07 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Product.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Product.java @@ -2,10 +2,10 @@ import io.ebean.annotation.*; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; import javax.validation.constraints.Size; import java.io.Serializable; import java.sql.Timestamp; diff --git a/ebean-test/src/test/java/org/tests/model/basic/Section.java b/ebean-test/src/test/java/org/tests/model/basic/Section.java index 0395411889..9856a09e55 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Section.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Section.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java b/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java index 26a5160421..e513fb55a6 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/SomeEnumBean.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Enumerated; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; @Entity public class SomeEnumBean { diff --git a/ebean-test/src/test/java/org/tests/model/basic/SubSection.java b/ebean-test/src/test/java/org/tests/model/basic/SubSection.java index b5e8888f28..d45f49ed3b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/SubSection.java +++ b/ebean-test/src/test/java/org/tests/model/basic/SubSection.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java index 80c0f8d363..07f614d658 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TBytesOnly.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class TBytesOnly { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java b/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java index 9f084dc8dc..4e90897df9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TIntChild.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java index e71c039982..4093264f57 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TIntRoot.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java index c20e06772d..d689cee104 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TJodaEntity.java @@ -3,8 +3,8 @@ import org.joda.time.LocalDate; import org.joda.time.LocalTime; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TJodaEntity { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java index 04a0543723..150b37c4ae 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TMapSuperEntity.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Entity @Table(name = "t_mapsuper1") diff --git a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java index 543958ed73..2a7373a180 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TMappedSuper2.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.MappedSuperclass; -import javax.persistence.Transient; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Transient; +import jakarta.persistence.Version; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/basic/TOne.java b/ebean-test/src/test/java/org/tests/model/basic/TOne.java index 13ae7e7e29..09ac648454 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TOne.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * A basic entity to test simple things. diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java index 50667a7840..7c2b17939d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSDetail.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Index; import io.ebean.annotation.Platform; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java index 6ef9960baf..2386261e16 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TSMaster.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java b/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java index 53ce83a4b3..f02d1c6712 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TUuidEntity.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java index a19c89c7db..c7a1d535e2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsert.java @@ -1,13 +1,13 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TWithPreInsert implements TWithPreInsertCommon { diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java index 5f679f9f61..95f4c1cea6 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java b/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java index 674d0f8241..2b8963d99a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TreeNode.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Formula; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/Trip.java b/ebean-test/src/test/java/org/tests/model/basic/Trip.java index 07cb5ad0a5..6b24fd7c6c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Trip.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Trip.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Truck.java b/ebean-test/src/test/java/org/tests/model/basic/Truck.java index c32d70777b..35785d85f8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Truck.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Truck.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbEnumValue; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java b/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java index 56cbc171bb..b766599c74 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TruckRef.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class TruckRef { diff --git a/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java b/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java index 2d214ff75e..28305cb218 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UTDetail.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name = "ut_detail") diff --git a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java index 4c1b2998c6..f66526dbc1 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UTMaster.java @@ -3,7 +3,7 @@ import io.ebean.Model; import io.ebean.annotation.DbJsonB; -import javax.persistence.*; +import jakarta.persistence.*; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java index 6a97b4fed5..afdcf410d0 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUOne.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java index 1c9116065f..fe1b434bed 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java +++ b/ebean-test/src/test/java/org/tests/model/basic/UUTwo.java @@ -1,6 +1,6 @@ package org.tests.model.basic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java b/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java index cab8c4dde7..9ba8697048 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java +++ b/ebean-test/src/test/java/org/tests/model/basic/Vehicle.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java index 00119e5ec0..c4b03be79b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleDriver.java @@ -1,7 +1,7 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java index 1aa7b703d4..13b4ee34e3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLease.java @@ -1,9 +1,9 @@ package org.tests.model.basic; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.Version; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java index 4af74793f0..2f635062e8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseLong.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java index 6e5ccbee5c..2b1df858ee 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VehicleLeaseShort.java @@ -1,8 +1,8 @@ package org.tests.model.basic; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java index 72fbc08cfd..30fb747bb9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/basic/VwCustomer.java @@ -3,7 +3,7 @@ import io.ebean.annotation.*; import org.tests.model.basic.finder.CustomerFinder; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.sql.Date; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java index 1bb0a459b0..12783238b6 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhOne.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java index fcfb8479f3..d18724800a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRef.java @@ -3,8 +3,8 @@ import io.ebean.annotation.Cache; import org.tests.model.basic.BasicDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity @Cache(enableQueryCache = true) diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java index 548ee094cc..48b2ab9011 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhRoot.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Cache; import org.tests.model.basic.BasicDomain; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java index 53d3685e82..1d6e957b4a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/CInhTwo.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.Inheritance; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java index bed1d44abd..963c00a3f8 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheChild.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java index 7c458bd12d..e8d565d280 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ECacheRoot.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java b/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java index d570e1e4ad..72bfd3a586 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/ESoftWithCache.java @@ -4,10 +4,10 @@ import io.ebean.annotation.Cache; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Cache @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java index 08fb12bf77..7b5804be72 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCacheBase.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class OCacheBase extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java index 4ee852d90e..ac63d82191 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedApp.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.UniqueConstraint; @Cache(naturalKey = "appName") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java index d4a97b84de..baf35a3cac 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedAppDetail.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.UniqueConstraint; @Cache(naturalKey = {"app", "detail"}) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java index 5928181138..e8bba1e4a3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Cached bean for testing caching implementation. diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java index 92cbde2eca..09aca6596d 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNatKeyBean3.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; /** * Cached bean for compound natural key. diff --git a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java index ac3eba8a9a..7dad96365b 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java +++ b/ebean-test/src/test/java/org/tests/model/basic/cache/OCachedNkeyUid.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.util.UUID; @Cache(naturalKey = "cid") diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/First.java b/ebean-test/src/test/java/org/tests/model/basic/first/First.java index d6c96c825e..8e1e36bb2f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/First.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/First.java @@ -1,6 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "f_first") diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java index dd3ffd6240..b7c6ccd65f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/Second.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/Second.java @@ -1,6 +1,6 @@ package org.tests.model.basic.first; -import javax.persistence.*; +import jakarta.persistence.*; @AttributeOverride(name = "name", column = @Column(name = "mod_name")) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java b/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java index 083c30f74e..2487835080 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java +++ b/ebean-test/src/test/java/org/tests/model/basic/first/SuperSecond.java @@ -1,9 +1,9 @@ package org.tests.model.basic.first; -import javax.persistence.CascadeType; -import javax.persistence.JoinColumn; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.OneToOne; @MappedSuperclass public abstract class SuperSecond { diff --git a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java index c34292bbeb..0c22053566 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java +++ b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperActual.java @@ -1,7 +1,7 @@ package org.tests.model.basic.mapsuper; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MapSuperActual extends MapSuperNoId { diff --git a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java index d9781a5cb4..75fa06dac7 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java +++ b/ebean-test/src/test/java/org/tests/model/basic/mapsuper/MapSuperNoId.java @@ -2,8 +2,8 @@ import io.ebean.annotation.WhenCreated; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java index e49d35903b..4de72efeb2 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation1.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ChangeLog; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java index a84ff7eb02..9744086718 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation2.java @@ -3,10 +3,10 @@ import io.ebean.annotation.ChangeLog; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java index 249d137e41..530d3b1c2f 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation3.java @@ -3,8 +3,8 @@ import io.ebean.annotation.ChangeLog; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java index 9e2109f09f..a5635554eb 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java +++ b/ebean-test/src/test/java/org/tests/model/basic/relates/Relation4.java @@ -3,8 +3,8 @@ import io.ebean.annotation.ChangeLog; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java index c405b9ed79..a3468b75e3 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdChild.java @@ -1,6 +1,6 @@ package org.tests.model.basic.xtra; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "td_child") diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java index bc398b70a4..b7039bb562 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdExtendedParent.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java index 1f401072c3..4eb9655e7c 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/EdParent.java @@ -1,7 +1,7 @@ package org.tests.model.basic.xtra; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java b/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java index 0412c5d753..e9951a7d31 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java +++ b/ebean-test/src/test/java/org/tests/model/basic/xtra/OptimisticLockExceptionThrowingDao.java @@ -7,7 +7,7 @@ import io.ebean.annotation.Transactional; import org.tests.model.basic.EBasicVer; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java b/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java index 32e5e3af81..fd0cc44121 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BDManyId.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java b/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java index ad99b4a2d8..c26e4064b1 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BEmbId.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSite.java b/ebean-test/src/test/java/org/tests/model/bridge/BSite.java index 2023a8c4bc..036af85e56 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSite.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSite.java @@ -1,8 +1,8 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java index f8eb5b2a32..d8d4b22b8d 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserA.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Objects; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java index 9d4b37f1be..2d99c79313 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserB.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java index 99b3143b7b..2235787aa7 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserC.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java index 220990cade..36d1b627d6 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserD.java @@ -1,6 +1,6 @@ package org.tests.model.bridge; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java index ceda123498..05ef197b0f 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserDMany.java @@ -1,9 +1,9 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java index a6795de77f..ec196e0522 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BSiteUserE.java @@ -1,9 +1,9 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.ManyToOne; @Entity @IdClass(BEmbId.class) diff --git a/ebean-test/src/test/java/org/tests/model/bridge/BUser.java b/ebean-test/src/test/java/org/tests/model/bridge/BUser.java index 7a87fe864e..9573f85b7a 100644 --- a/ebean-test/src/test/java/org/tests/model/bridge/BUser.java +++ b/ebean-test/src/test/java/org/tests/model/bridge/BUser.java @@ -1,7 +1,7 @@ package org.tests.model.bridge; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/cache/EColAB.java b/ebean-test/src/test/java/org/tests/model/cache/EColAB.java index 763d70e6cc..50dbbdc955 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/EColAB.java +++ b/ebean-test/src/test/java/org/tests/model/cache/EColAB.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java index 07b3b9a915..9fc9c3e862 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheChild.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Cache; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity @Cache(enableQueryCache = true, enableBeanCache = true) diff --git a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java index d422eb5a48..0025e2782e 100644 --- a/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java +++ b/ebean-test/src/test/java/org/tests/model/cache/M2MCacheMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java index 7da07463ba..b6fd4dcf91 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Car.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Car.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java index 886ea8d534..7f752081a4 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Tire.java @@ -1,6 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "sa_tire") diff --git a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java index 402f907888..6519db5728 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java +++ b/ebean-test/src/test/java/org/tests/model/carwheel/Wheel.java @@ -1,6 +1,6 @@ package org.tests.model.carwheel; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "sa_wheel") diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java index 3479c3a65e..8ef693d213 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TCar.java @@ -2,7 +2,7 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java index 746a2233be..3b1716a6e2 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruck.java @@ -1,6 +1,6 @@ package org.tests.model.carwheeltruck; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java index d9f917421d..64d55b27cf 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolder.java @@ -2,10 +2,10 @@ import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TTruckHolder { diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java index 1498b263a7..e53107abf2 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TTruckHolderItem.java @@ -1,8 +1,8 @@ package org.tests.model.carwheeltruck; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java index 03a6f38dac..af2e93dc66 100644 --- a/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java +++ b/ebean-test/src/test/java/org/tests/model/carwheeltruck/TWheel.java @@ -1,8 +1,8 @@ package org.tests.model.carwheeltruck; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class TWheel { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java index d19b742dbe..2ea814a415 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClient.java @@ -1,6 +1,6 @@ package org.tests.model.composite; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class CkeClient { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java index 4a897c1b60..480a38a96c 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeClientKey.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.util.Objects; diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java index 1c9de8ccc9..d457773748 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeUser.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; @Entity public class CkeUser { diff --git a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java index de55f7c1a6..08faf273af 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/CkeUserKey.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.util.Objects; diff --git a/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java index d44cf80521..be6109e190 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/composite/RCustomer.java @@ -1,8 +1,8 @@ package org.tests.model.composite; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; /** * @author rnentjes diff --git a/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java b/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java index a871d49aae..ae879544ee 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java +++ b/ebean-test/src/test/java/org/tests/model/composite/RCustomerKey.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java index b5b48bcd9c..b59280abd6 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/ROrder.java +++ b/ebean-test/src/test/java/org/tests/model/composite/ROrder.java @@ -1,6 +1,6 @@ package org.tests.model.composite; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; diff --git a/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java b/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java index 3952899e21..a052406bdc 100644 --- a/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java +++ b/ebean-test/src/test/java/org/tests/model/composite/ROrderPK.java @@ -1,7 +1,7 @@ package org.tests.model.composite; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; import java.io.Serializable; diff --git a/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java b/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java index bcc21445f4..31bac0a102 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java +++ b/ebean-test/src/test/java/org/tests/model/controller/FindControllerMain.java @@ -1,8 +1,8 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Transient; @Entity public class FindControllerMain { diff --git a/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java b/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java index 41a2bd10e7..26e5863a08 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java +++ b/ebean-test/src/test/java/org/tests/model/controller/SoftRefA.java @@ -1,7 +1,7 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SoftRefA { diff --git a/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java b/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java index c7086096e5..da27e66e5e 100644 --- a/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java +++ b/ebean-test/src/test/java/org/tests/model/controller/SoftRefB.java @@ -1,7 +1,7 @@ package org.tests.model.controller; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class SoftRefB { diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java index 0caada2595..bb882913d9 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Conversation.java @@ -3,7 +3,7 @@ import io.ebean.annotation.FetchPreference; import org.tests.model.BaseModel; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Group.java b/ebean-test/src/test/java/org/tests/model/converstation/Group.java index eee84f8a7b..0bc0f845b9 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Group.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Group.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Message.java b/ebean-test/src/test/java/org/tests/model/converstation/Message.java index 51379a9403..45cda714e0 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Message.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Message.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "c_message") diff --git a/ebean-test/src/test/java/org/tests/model/converstation/Participation.java b/ebean-test/src/test/java/org/tests/model/converstation/Participation.java index dae00e2d50..a979ea9fac 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/Participation.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/Participation.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "c_participation") diff --git a/ebean-test/src/test/java/org/tests/model/converstation/User.java b/ebean-test/src/test/java/org/tests/model/converstation/User.java index f921fd85e5..6c0a2a2404 100644 --- a/ebean-test/src/test/java/org/tests/model/converstation/User.java +++ b/ebean-test/src/test/java/org/tests/model/converstation/User.java @@ -4,9 +4,9 @@ import io.ebean.annotation.HistoryExclude; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java b/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java index fb40393c9a..5d64de0d54 100644 --- a/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java +++ b/ebean-test/src/test/java/org/tests/model/ddd/DExhEntity.java @@ -4,9 +4,9 @@ import org.tests.model.ivo.Oid; import org.tests.model.ivo.converter.AnEnumType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java b/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java index f1ce5936e7..a2842e1164 100644 --- a/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java +++ b/ebean-test/src/test/java/org/tests/model/ddd/DPerson.java @@ -3,8 +3,8 @@ import org.tests.model.ivo.Money; import org.tests.model.ivo.Oid; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class DPerson { diff --git a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java index 4deef720bf..2da96cdc6f 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/CustomerReport.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DocStore; import org.tests.model.basic.Customer; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; /** diff --git a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java index 194fa83854..5482a6d6f7 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/ProductReport.java @@ -3,8 +3,8 @@ import io.ebean.annotation.DocStore; import org.tests.model.basic.Product; -import javax.persistence.DiscriminatorValue; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.ManyToOne; @DocStore @DiscriminatorValue("PR") diff --git a/ebean-test/src/test/java/org/tests/model/docstore/Report.java b/ebean-test/src/test/java/org/tests/model/docstore/Report.java index 707a56bd84..d5dcaf8376 100644 --- a/ebean-test/src/test/java/org/tests/model/docstore/Report.java +++ b/ebean-test/src/test/java/org/tests/model/docstore/Report.java @@ -2,8 +2,8 @@ import io.ebean.annotation.DocStore; -import javax.persistence.Inheritance; -import javax.persistence.OneToMany; +import jakarta.persistence.Inheritance; +import jakarta.persistence.OneToMany; import java.util.List; @DocStore diff --git a/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java b/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java index 5d44a2fb76..6ef36a15f0 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/BaseDomain.java @@ -5,9 +5,9 @@ import io.ebean.annotation.WhenCreated; import io.ebean.annotation.WhenModified; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import java.sql.Timestamp; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java b/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java index 98b79cb680..4832d31125 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/BasicDraftableBean.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Draft; import io.ebean.annotation.Draftable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity @Draftable diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Doc.java b/ebean-test/src/test/java/org/tests/model/draftable/Doc.java index e2c196644a..b0baa9573c 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Doc.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Doc.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Draftable; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Document.java b/ebean-test/src/test/java/org/tests/model/draftable/Document.java index 2652b22377..c16d144729 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Document.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Document.java @@ -5,10 +5,10 @@ import io.ebean.annotation.DraftOnly; import io.ebean.annotation.Draftable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import javax.validation.constraints.Size; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java b/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java index f5cf0b0dda..63054b8010 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/DocumentMedia.java @@ -2,8 +2,8 @@ import io.ebean.annotation.DraftableElement; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; /** * 'Owned' by @Draftable root. diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Link.java b/ebean-test/src/test/java/org/tests/model/draftable/Link.java index 547f3012bf..2a663ea976 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Link.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Link.java @@ -2,9 +2,9 @@ import io.ebean.annotation.*; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.sql.Timestamp; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java b/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java index 2c1ca26c20..a08fce9d66 100644 --- a/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java +++ b/ebean-test/src/test/java/org/tests/model/draftable/Organisation.java @@ -1,6 +1,6 @@ package org.tests.model.draftable; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Organisation extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java index 96805eef78..81109a7267 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcEnumPerson.java @@ -1,9 +1,9 @@ package org.tests.model.elementcollection; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java index c41a7540a9..f49a82d4f7 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java index d65a134104..9838847e2b 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcPhone.java @@ -1,7 +1,7 @@ package org.tests.model.elementcollection; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import javax.validation.constraints.Size; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java index de38b9a11c..a9709b2450 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcTop.java @@ -1,9 +1,9 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EcTop { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java index 03b6cb0867..2880c8a00a 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java index 7ce82c393d..ea9d3862c3 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcblPerson2.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java index b4e2b70d13..060c41eb42 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcbmPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java index 2dad35c3ca..a4d0508b91 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java index d89cbc311d..8cd6661a76 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcmcPerson.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java index d6661f1e2e..eebaa3e643 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsPerson.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java index 6cf06f2828..9eec1fbe64 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmChild.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java index 750512cc75..bddd013b03 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmOne.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java index f9c319a039..6e98bc7d18 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmParent.java @@ -1,12 +1,12 @@ package org.tests.model.elementcollection; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EcsmParent { diff --git a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java index 0f3cb85a16..6b474026f2 100644 --- a/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java +++ b/ebean-test/src/test/java/org/tests/model/elementcollection/EcsmTwo.java @@ -1,6 +1,6 @@ package org.tests.model.elementcollection; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashSet; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java index 5dc697ddd1..cf194d7b7c 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EAddr.java @@ -2,8 +2,8 @@ import org.tests.model.basic.Country; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; @Embeddable public class EAddr { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java b/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java index 4b737f0f55..99a689d017 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EAddress.java @@ -3,10 +3,10 @@ import io.ebean.annotation.DbJson; import org.tests.model.json.PlainBean; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import java.util.Map; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java index 2542a066ba..dc69b52734 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbDatePeriod.java @@ -2,7 +2,7 @@ import io.ebean.annotation.NotNull; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Date; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java index c42510d678..fcff9d5c80 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbInner.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "eemb_inner") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java index 2f6797c334..614d2547ae 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EEmbOuter.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java index 98e3a17337..75571e97be 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EInvoice.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Cache diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java index edb13ac1bc..cb0cfb0afa 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EMain.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EMain.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_main") diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java index b3d4ca3e3d..7d6e7e6e4d 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerAddr.java @@ -1,9 +1,9 @@ package org.tests.model.embedded; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EPerAddr { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java index ef5e82a80f..ee6ad5d63e 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java index b532ceff66..3f0fa37f24 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson2.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson2 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java index 59e793384f..2604fadca8 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EPerson3.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class EPerson3 { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java b/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java index 574a557a6c..d7108f062f 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/Eembeddable.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class Eembeddable { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java b/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java index 09ff8312f5..0750888ce4 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/EmbArrayMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbArray; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java index 912e95e87e..bb4e2e2e3b 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/PrimaryRevision.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class PrimaryRevision { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java b/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java index dd624cabb8..637aab32d8 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/RevisionId.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public class RevisionId { diff --git a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java index 341f0670eb..183643e706 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLive.java @@ -3,8 +3,8 @@ import io.ebean.Model; import io.ebean.annotation.WhenCreated; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java index b67046834b..80375f0e3e 100644 --- a/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java +++ b/ebean-test/src/test/java/org/tests/model/embedded/UserInterestLiveKey.java @@ -1,6 +1,6 @@ package org.tests.model.embedded; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java index f4f62d71b5..ec61ec0c22 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ChildPerson.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class ChildPerson extends InheritablePerson { diff --git a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java index 621d818850..16ee7e8766 100644 --- a/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/GrandParentPerson.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java index 113e95bc09..a9ab1e796c 100644 --- a/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/InheritablePerson.java @@ -2,9 +2,9 @@ import org.tests.model.basic.EBasic; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java index 4f48c9d33b..8955af81d7 100644 --- a/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java +++ b/ebean-test/src/test/java/org/tests/model/family/ParentPerson.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Formula; import org.tests.model.basic.EBasic; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/generated/MyPart.java b/ebean-test/src/test/java/org/tests/model/generated/MyPart.java index 5d9f2af8df..712d8d2201 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/MyPart.java +++ b/ebean-test/src/test/java/org/tests/model/generated/MyPart.java @@ -3,10 +3,10 @@ import io.ebean.annotation.DbPartition; import io.ebean.annotation.PartitionMode; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.time.Instant; @DbPartition(mode = PartitionMode.MONTH, property = "eventTime") diff --git a/ebean-test/src/test/java/org/tests/model/generated/User.java b/ebean-test/src/test/java/org/tests/model/generated/User.java index be1336f440..ab0004a518 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/User.java +++ b/ebean-test/src/test/java/org/tests/model/generated/User.java @@ -1,6 +1,6 @@ package org.tests.model.generated; -import javax.persistence.*; +import jakarta.persistence.*; /** * @author Vilmos Nagy diff --git a/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java b/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java index a18dee6530..524c6151b6 100644 --- a/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java +++ b/ebean-test/src/test/java/org/tests/model/generated/WhoPropsOneToMany.java @@ -5,7 +5,7 @@ import io.ebean.annotation.WhoCreated; import io.ebean.annotation.WhoModified; -import javax.persistence.*; +import jakarta.persistence.*; import java.sql.Timestamp; /** diff --git a/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java index da17e75577..c36d87365c 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java +++ b/ebean-test/src/test/java/org/tests/model/history/HEmbiBean.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.History; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; @Entity @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java b/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java index 6754e8e526..eaa052a74b 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java +++ b/ebean-test/src/test/java/org/tests/model/history/HEmbiId.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Length; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/ebean-test/src/test/java/org/tests/model/history/HeDoc.java b/ebean-test/src/test/java/org/tests/model/history/HeDoc.java index 35944a322f..7cfc28139e 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HeDoc.java +++ b/ebean-test/src/test/java/org/tests/model/history/HeDoc.java @@ -2,8 +2,8 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/history/HeLink.java b/ebean-test/src/test/java/org/tests/model/history/HeLink.java index 8bc4e20110..d831d703d0 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HeLink.java +++ b/ebean-test/src/test/java/org/tests/model/history/HeLink.java @@ -5,9 +5,9 @@ import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.Table; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiDoc.java b/ebean-test/src/test/java/org/tests/model/history/HiDoc.java index 4d68e02d48..7f87b71305 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiDoc.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiDoc.java @@ -2,8 +2,8 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/history/HiLink.java b/ebean-test/src/test/java/org/tests/model/history/HiLink.java index 9d62ea2355..7970ed7d62 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiLink.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiLink.java @@ -3,8 +3,8 @@ import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTOne.java b/ebean-test/src/test/java/org/tests/model/history/HiTOne.java index 36018af058..c5300af5d4 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTOne.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTThree.java b/ebean-test/src/test/java/org/tests/model/history/HiTThree.java index 2b7ae54732..a4d3b67bb3 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTThree.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTThree.java @@ -3,7 +3,7 @@ import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java b/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java index 18c2d299d7..6af3bc0837 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java +++ b/ebean-test/src/test/java/org/tests/model/history/HiTTwo.java @@ -3,9 +3,9 @@ import io.ebean.annotation.History; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java index aabe3d1975..2159c1d570 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistoryOneToOne.java @@ -1,9 +1,9 @@ package org.tests.model.history; import io.ebean.annotation.History; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; import org.tests.model.draftable.BaseDomain; @History diff --git a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java index f9053cb327..85054a0aa3 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java +++ b/ebean-test/src/test/java/org/tests/model/history/HistorylessOneToOne.java @@ -2,9 +2,9 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class HistorylessOneToOne extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java b/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java index c315110e0c..deb7ff058a 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java +++ b/ebean-test/src/test/java/org/tests/model/history/HsdSetting.java @@ -4,8 +4,8 @@ import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/history/HsdUser.java b/ebean-test/src/test/java/org/tests/model/history/HsdUser.java index 377bcf4ee1..899765e918 100644 --- a/ebean-test/src/test/java/org/tests/model/history/HsdUser.java +++ b/ebean-test/src/test/java/org/tests/model/history/HsdUser.java @@ -4,10 +4,10 @@ import io.ebean.annotation.SoftDelete; import org.tests.model.draftable.BaseDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; @History @Entity diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java index ea26510399..831dbcb1c9 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCompany.java @@ -4,7 +4,7 @@ import io.ebean.Model; import io.ebean.annotation.JsonIgnore; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoContact.java b/ebean-test/src/test/java/org/tests/model/info/InfoContact.java index bc742aeb63..f12c56731c 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoContact.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoContact.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class InfoContact extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java index bf93c9c587..fddace0c71 100644 --- a/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/info/InfoCustomer.java @@ -3,7 +3,7 @@ import io.ebean.Finder; import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class InfoCustomer extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java index b409840cdf..c03817e0f1 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXPhoto.java @@ -1,7 +1,7 @@ package org.tests.model.inheritexposedtype; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("photo") diff --git a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java index e2c052a494..83fdef809e 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java +++ b/ebean-test/src/test/java/org/tests/model/inheritexposedtype/IXResource.java @@ -1,6 +1,6 @@ package org.tests.model.inheritexposedtype; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java index e9734b902b..2088ee72c8 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRelated.java @@ -1,8 +1,8 @@ package org.tests.model.inheritmany; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class IMRelated { diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java index f8d38fab51..2d86ddc904 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRoot.java @@ -1,6 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java index 1eb67687ef..c5ed5a2e03 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootOne.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("ONE") diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java index e63891f67a..2a125ea94b 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/IMRootTwo.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; import java.util.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java index 8bfb682e29..d20c079da4 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MBase.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class MBase { diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java index 95e3b97e8a..c01f7000b9 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MMedia.java @@ -1,6 +1,6 @@ package org.tests.model.inheritmany; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java index 422e935582..dbefb0b736 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MPicture.java @@ -1,7 +1,7 @@ package org.tests.model.inheritmany; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java b/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java index d0c561c656..be4f5b8ede 100644 --- a/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java +++ b/ebean-test/src/test/java/org/tests/model/inheritmany/MProfile.java @@ -1,8 +1,8 @@ package org.tests.model.inheritmany; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class MProfile extends MBase { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Address.java b/ebean-test/src/test/java/org/tests/model/interfaces/Address.java index 78bc0ba808..e39408094d 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Address.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Address.java @@ -1,9 +1,9 @@ package org.tests.model.interfaces; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Address implements IAddress { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Person.java b/ebean-test/src/test/java/org/tests/model/interfaces/Person.java index a977661297..e46c9d9fe1 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Person.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Person.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java b/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java index 015d8ada09..9d29730a83 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/Persona.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class Persona implements IPersona { diff --git a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java index 0950feaabf..3f6be3bc92 100644 --- a/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java +++ b/ebean-test/src/test/java/org/tests/model/interfaces/SelfManyMany.java @@ -1,6 +1,6 @@ package org.tests.model.interfaces; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java b/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java index 74ccfedabb..af0f2f61d5 100644 --- a/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java +++ b/ebean-test/src/test/java/org/tests/model/ivo/ESomeConvertType.java @@ -1,7 +1,7 @@ package org.tests.model.ivo; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ESomeConvertType { diff --git a/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java b/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java index bd39796517..18a440b1b3 100644 --- a/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java +++ b/ebean-test/src/test/java/org/tests/model/ivo/converter/MoneyTypeConverter.java @@ -2,7 +2,7 @@ import org.tests.model.ivo.Money; -import javax.persistence.AttributeConverter; +import jakarta.persistence.AttributeConverter; import java.math.BigDecimal; /** diff --git a/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java b/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java index 66bb6db7a3..9039422f22 100644 --- a/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java +++ b/ebean-test/src/test/java/org/tests/model/joda/BasicJodaEntity.java @@ -7,9 +7,9 @@ import org.joda.time.LocalDateTime; import org.joda.time.Period; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class BasicJodaEntity { diff --git a/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java b/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java index 052d91156c..8f2be28db4 100644 --- a/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/AccountAccess.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("A") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/BankAccount.java b/ebean-test/src/test/java/org/tests/model/join/BankAccount.java index 491303be79..9d08c14806 100644 --- a/ebean-test/src/test/java/org/tests/model/join/BankAccount.java +++ b/ebean-test/src/test/java/org/tests/model/join/BankAccount.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("B") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java b/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java index c9336de179..4cda044d1e 100644 --- a/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/CustomerAccess.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @DiscriminatorValue("C") @Entity diff --git a/ebean-test/src/test/java/org/tests/model/join/HAccess.java b/ebean-test/src/test/java/org/tests/model/join/HAccess.java index d0d0608f10..5e047f6e58 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HAccess.java +++ b/ebean-test/src/test/java/org/tests/model/join/HAccess.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/join/HAccount.java b/ebean-test/src/test/java/org/tests/model/join/HAccount.java index 2ca8964035..300cc2e426 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HAccount.java +++ b/ebean-test/src/test/java/org/tests/model/join/HAccount.java @@ -1,6 +1,6 @@ package org.tests.model.join; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance diff --git a/ebean-test/src/test/java/org/tests/model/join/HCustomer.java b/ebean-test/src/test/java/org/tests/model/join/HCustomer.java index 9a5ba3a9d1..974d261771 100644 --- a/ebean-test/src/test/java/org/tests/model/join/HCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/join/HCustomer.java @@ -1,7 +1,7 @@ package org.tests.model.join; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class HCustomer { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java b/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java index ec14bf1362..268cbb5cdf 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicHstore.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbMap; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java index ee4617c0eb..418938447e 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonBString.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonBString { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java index 6a84ff2f7e..a36c31dc7d 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java index 8e801113cc..9a0d5e3b2d 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson2.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.*; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java index 225939bb7a..b8cf1d378f 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonJackson3.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import static io.ebean.annotation.MutationDetection.NONE; import static io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java index 885e85bf87..d62f1247b9 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonList.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJsonB; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.*; import static io.ebean.annotation.MutationDetection.HASH; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java index 30e0f502f1..351265f617 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMap.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbJson; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java index f4df608884..1262082ad4 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapBlob.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java index 6d26bd130e..fa7329d0f3 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapClob.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java index e220af18cd..db9781ecd6 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapDetail.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java index 744ca6af5c..400ca24924 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapJsonB.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java index 2b470ef45c..6da1f23287 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMapVarchar.java @@ -3,9 +3,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java index 7e294914db..d37950daf0 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonMulti.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import static io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java index 97ce8bb81a..ee0d1dbeea 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNode.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNode { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java index 527dcdfd06..d197e119ce 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeBlob.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeBlob { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java index f8f8392dc2..97ca45ab7a 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeJsonB.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.databind.JsonNode; import io.ebean.annotation.DbJsonB; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeJsonB { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java index c8b2939e37..c6f50aaa84 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonNodeVarchar.java @@ -4,9 +4,9 @@ import io.ebean.annotation.DbJson; import io.ebean.annotation.DbJsonType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonNodeVarchar { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java index 45af516dc3..de99274910 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonString.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class EBasicJsonString { diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java index 928f048be8..0eca81645d 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicJsonUnmapped.java @@ -2,9 +2,9 @@ import io.ebean.annotation.UnmappedJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.Map; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java index 614758a1c9..adf2e42fbb 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicOldValue.java @@ -4,8 +4,8 @@ import io.ebean.annotation.DbArray; import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.*; import static io.ebean.annotation.MutationDetection.SOURCE; diff --git a/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java b/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java index 051b4a3446..bd5c323d01 100644 --- a/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java +++ b/ebean-test/src/test/java/org/tests/model/json/EBasicPlain.java @@ -2,9 +2,9 @@ import io.ebean.annotation.DbJson; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import static io.ebean.annotation.MutationDetection.NONE; diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java index ff591d427c..ae4ab5bc71 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ChildWithCache.java @@ -2,10 +2,10 @@ import io.ebean.annotation.Cache; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; /** * Class with @Cache and lazy load property. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java index 6a096113b1..3104c45706 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentA.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithcache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Parent class with ChildWithCache. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java index 521d3d52b6..a0ba851d35 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithcache/ParentB.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithcache; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; /** * Parent class with ChildWithCache. diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java index a51758b3f6..3cd130d597 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/Looney.java @@ -1,8 +1,8 @@ package org.tests.model.lazywithid; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class Looney { diff --git a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java index 65930791fa..a51be7478b 100644 --- a/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java +++ b/ebean-test/src/test/java/org/tests/model/lazywithid/Tune.java @@ -2,7 +2,7 @@ import io.ebean.common.BeanList; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java b/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java index fa078515b8..82043652f7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DCredit.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DRol.java b/ebean-test/src/test/java/org/tests/model/m2m/DRol.java index f4abd56a23..ffee165ab6 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DRol.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DRol.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/DRot.java b/ebean-test/src/test/java/org/tests/model/m2m/DRot.java index bb2629fac6..0f7032646d 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/DRot.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/DRot.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java b/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java index a8cd7d51bd..67070bae57 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MailBox.java @@ -1,8 +1,8 @@ package org.tests.model.m2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class MailBox { diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java index 2f51929df2..6e600ce381 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MailUser.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java index d29c2d1b7e..925724e3b4 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyA.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java index d6a1c1bd7b..bf25a6460c 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyB.java @@ -3,10 +3,10 @@ import io.ebean.annotation.Identity; import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java index b582a16b0f..42dee37a70 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyC.java @@ -3,8 +3,8 @@ import io.ebean.annotation.Identity; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java index c048d4ac79..6c89b54a1c 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyEdge.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity @Index(unique = true, columnNames = {"from_id", "to_id"}) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java index 71444320fe..95a3bb089a 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyNode.java @@ -5,7 +5,7 @@ import io.ebean.annotation.Where; import io.ebean.annotation.ext.IntersectionFactory; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Identity(start = 1000) diff --git a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java index e4710130c8..fe58eb5cf0 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/MnyTopic.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java index 2bf201542e..617a670d3b 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Permission.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Permission.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Role.java b/ebean-test/src/test/java/org/tests/model/m2m/Role.java index 1b32e7ef92..c16f2d8e9a 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Role.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Role.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java index 32db7e3529..904a81fca7 100644 --- a/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java +++ b/ebean-test/src/test/java/org/tests/model/m2m/Tenant.java @@ -1,6 +1,6 @@ package org.tests.model.m2m; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/m2o/Addr.java b/ebean-test/src/test/java/org/tests/model/m2o/Addr.java index 83e06d26bb..86a629fe47 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/Addr.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/Addr.java @@ -1,9 +1,9 @@ package org.tests.model.m2o; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class Addr { diff --git a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java index bf9b5b2c7b..ddd4a0d0e6 100644 --- a/ebean-test/src/test/java/org/tests/model/m2o/Empl.java +++ b/ebean-test/src/test/java/org/tests/model/m2o/Empl.java @@ -1,6 +1,6 @@ package org.tests.model.m2o; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/map/MpRole.java b/ebean-test/src/test/java/org/tests/model/map/MpRole.java index d30c79a4bd..7f272137a5 100644 --- a/ebean-test/src/test/java/org/tests/model/map/MpRole.java +++ b/ebean-test/src/test/java/org/tests/model/map/MpRole.java @@ -1,7 +1,7 @@ package org.tests.model.map; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MpRole { diff --git a/ebean-test/src/test/java/org/tests/model/map/MpUser.java b/ebean-test/src/test/java/org/tests/model/map/MpUser.java index 94edddb19e..aa5c1357de 100644 --- a/ebean-test/src/test/java/org/tests/model/map/MpUser.java +++ b/ebean-test/src/test/java/org/tests/model/map/MpUser.java @@ -1,6 +1,6 @@ package org.tests.model.map; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.LinkedHashMap; import java.util.Map; diff --git a/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java index 1c865f073c..322105751e 100644 --- a/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java +++ b/ebean-test/src/test/java/org/tests/model/mappedsuper/ASimpleBean.java @@ -1,7 +1,7 @@ package org.tests.model.mappedsuper; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class ASimpleBean extends NotEnhancedMappedSuper { diff --git a/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java b/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java index 5a6aaf114a..421fc80ac9 100644 --- a/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java +++ b/ebean-test/src/test/java/org/tests/model/mappedsuper/NotEnhancedMappedSuper.java @@ -1,7 +1,7 @@ package org.tests.model.mappedsuper; -import javax.persistence.MappedSuperclass; -//import javax.persistence.Transient; +import jakarta.persistence.MappedSuperclass; +//import jakarta.persistence.Transient; @MappedSuperclass public class NotEnhancedMappedSuper { diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java index 71116ea0df..599a8f819f 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EFile2NoFk.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Formula; import io.ebean.annotation.Index; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java index c6823500ba..a6b2411793 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EFileNoFk.java @@ -2,10 +2,10 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java index 73371c7400..ef06ec7b66 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFk.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java index dfc9832c5c..b29ac64e8a 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/EUserNoFkSoftDel.java @@ -5,9 +5,9 @@ import io.ebean.annotation.Platform; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; import static io.ebean.annotation.IdentityGenerated.BY_DEFAULT; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java index aeda58f12a..bc1fd31160 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/Test2NoFk.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java index 66f85692c8..d5c5851e8c 100644 --- a/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java +++ b/ebean-test/src/test/java/org/tests/model/nofk/TestNoFk.java @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java b/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java index b43c344a58..70cee6afdb 100644 --- a/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java +++ b/ebean-test/src/test/java/org/tests/model/noid/NoIdBean.java @@ -2,8 +2,8 @@ import io.ebean.annotation.WhenCreated; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/Account.java b/ebean-test/src/test/java/org/tests/model/onetoone/Account.java index a6173400cb..e564e3ea43 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/Account.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/Account.java @@ -3,9 +3,9 @@ import io.ebean.Finder; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_account") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java index 22cc9fc8b8..1a174ebfb9 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OCompany.java @@ -2,8 +2,8 @@ import org.tests.model.basic.BasicDomain; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity public class OCompany extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java b/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java index 7a0b406aa4..225a55e0b4 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/ORoadShowMsg.java @@ -2,10 +2,10 @@ import org.tests.model.basic.BasicDomain; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; @Entity public class ORoadShowMsg extends BasicDomain { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java index fd0b0c58b1..3b1409fdcd 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAone.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java index ac00af5d12..45357ad75c 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoAtwo.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java index 108c91a940..c4bdee7019 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBChild.java @@ -3,7 +3,7 @@ import io.ebean.annotation.Identity; import io.ebean.annotation.IdentityGenerated; -import javax.persistence.*; +import jakarta.persistence.*; @Identity(generated = IdentityGenerated.BY_DEFAULT) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java index d7b5d39f62..e22cd1cab2 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoBMaster.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoBMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java index 5126f3b2b4..eb72bab1b3 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChild.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class OtoChild { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java index f64a6a81ed..0e9a00472f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoChildVersion.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java index 49d6eb502c..89fd880012 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCust.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoCust { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java index 25bba8431a..5a69c8f9c5 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoCustAddress.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OtoCustAddress { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java index 516c5f9aba..e3fa41232a 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMaster.java @@ -1,9 +1,9 @@ package org.tests.model.onetoone; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class OtoMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java index aa26d4ad5a..4620152d7b 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoMasterVersion.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Where; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java index 5f137af726..59e2225448 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoNotification.java @@ -1,7 +1,7 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OtoNotification { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java index 3c1cbc1936..995ad6ed14 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrime.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoPrime { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java index b09cf22752..8f29f18978 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoPrimeExtra.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Identity; import io.ebean.annotation.IdentityGenerated; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Identity(generated = IdentityGenerated.BY_DEFAULT) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java index 2d60a7dfa2..cacbe07acc 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdChild.java @@ -3,10 +3,10 @@ import io.ebean.Finder; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class OtoSdChild { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java index 6dea4f1462..cd8e0a5f78 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoSdMaster.java @@ -2,7 +2,7 @@ import io.ebean.Finder; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class OtoSdMaster { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java index 4f8b8d7d65..1cc3159171 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThMany.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OtoThMany extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java index 933a8d7897..ed915162c6 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThOne.java @@ -2,8 +2,8 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; @Entity public class OtoThOne extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java index 099a7aca8f..8ee8b1149d 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoThTop.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java index afc224ab45..ae2dbdc77f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrime.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java index ef8532a15f..554d86a67e 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUBPrimeExtra.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java index f8ad34b0fd..61614100ac 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrime.java @@ -2,7 +2,7 @@ import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java index 311a4f6dbe..15d4140f2f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtra.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Formula; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtraWithConstraint.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtraWithConstraint.java index 9b69a3e7c7..cc7e738d29 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtraWithConstraint.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeExtraWithConstraint.java @@ -1,8 +1,8 @@ package org.tests.model.onetoone; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeOptionalExtra.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeOptionalExtra.java index 7ec0d0f1e3..5bb1f70e09 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeOptionalExtra.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeOptionalExtra.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeWithConstraint.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeWithConstraint.java index 29babe5685..933afdd68f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeWithConstraint.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUPrimeWithConstraint.java @@ -1,6 +1,6 @@ package org.tests.model.onetoone; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java index 58a9b06a99..9048b1b5e0 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUser.java @@ -2,10 +2,10 @@ import org.tests.model.BaseModel; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user_model") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java index 9b21ba4406..2297b8a509 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/OtoUserOptional.java @@ -2,8 +2,8 @@ import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user_model_optional") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java index 3a9a4d6df2..e458d28e1d 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/TestOneToOnePrimaryKeyJoinOptional.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.persistence.EntityNotFoundException; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityNotFoundException; +import jakarta.persistence.PersistenceException; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/User.java b/ebean-test/src/test/java/org/tests/model/onetoone/User.java index f367492857..b273f4f347 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/User.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/User.java @@ -3,9 +3,9 @@ import io.ebean.Finder; import org.tests.model.BaseModel; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oto_user") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java index 4445f8d3b6..6628346349 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/Album.java @@ -2,10 +2,10 @@ import io.ebean.Finder; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToOne; @Entity public class Album extends BaseModel { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java index 3b316eb91e..95e26fe53f 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/BaseModel.java @@ -6,8 +6,8 @@ import io.ebean.annotation.WhenModified; import org.joda.time.DateTime; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class BaseModel extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java b/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java index bfbcfd0029..ecd24912d3 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/album/Cover.java @@ -6,9 +6,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PreRemove; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PreRemove; @Entity public class Cover extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java index eef657be55..ad023f0d33 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDData.java @@ -4,7 +4,7 @@ import io.ebean.annotation.ConstraintMode; import io.ebean.annotation.DbForeignKey; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "calcd_data") diff --git a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java index 00704eb27a..83fda8d6f7 100644 --- a/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java +++ b/ebean-test/src/test/java/org/tests/model/onetoone/calcd/CalcDInput.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "calcd_input") diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java index d131ed6d80..851d85c089 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderEntity.java @@ -1,6 +1,6 @@ package org.tests.model.orderentity; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java index eb8543c64c..9fe853adbf 100644 --- a/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java +++ b/ebean-test/src/test/java/org/tests/model/orderentity/OrderItemEntity.java @@ -1,6 +1,6 @@ package org.tests.model.orderentity; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.math.BigDecimal; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java index 75790e26ac..c4b07d3cdd 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListChild.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmBeanListChild extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java index 6a9cd478f5..1aacb79d66 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OmBeanListParent.java @@ -2,13 +2,13 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmBeanListParent extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java index 5a22543a10..7086754b7e 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail.java @@ -1,9 +1,9 @@ package org.tests.model.orphanremoval; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java index 6fe3be4dd5..ce709fccbf 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpDetail2.java @@ -1,8 +1,8 @@ package org.tests.model.orphanremoval; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java index 96384d261c..630fdc7f84 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java index 9565a6a42b..5642729d05 100644 --- a/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java +++ b/ebean-test/src/test/java/org/tests/model/orphanremoval/OrpMaster2.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java index de541ec3ce..cbd9020bed 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinter.java @@ -1,6 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MPrinter { diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java index 3bef094f5e..05ac1b808a 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MPrinterState.java @@ -1,6 +1,6 @@ package org.tests.model.prnt; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class MPrinterState { diff --git a/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java b/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java index 5efcd73409..982004a1fa 100644 --- a/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java +++ b/ebean-test/src/test/java/org/tests/model/prnt/MSomeOther.java @@ -1,7 +1,7 @@ package org.tests.model.prnt; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class MSomeOther { diff --git a/ebean-test/src/test/java/org/tests/model/pview/Paggview.java b/ebean-test/src/test/java/org/tests/model/pview/Paggview.java index cc317f7181..e253151593 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Paggview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Paggview.java @@ -1,9 +1,9 @@ package org.tests.model.pview; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; @Entity @Table(name = "paggview") diff --git a/ebean-test/src/test/java/org/tests/model/pview/Pview.java b/ebean-test/src/test/java/org/tests/model/pview/Pview.java index a985fb76ca..5545cf66ea 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Pview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Pview.java @@ -1,6 +1,6 @@ package org.tests.model.pview; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/pview/Wview.java b/ebean-test/src/test/java/org/tests/model/pview/Wview.java index 10f8b62378..59d4bdf2a0 100644 --- a/ebean-test/src/test/java/org/tests/model/pview/Wview.java +++ b/ebean-test/src/test/java/org/tests/model/pview/Wview.java @@ -1,6 +1,6 @@ package org.tests.model.pview; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.Size; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java b/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java index 35a4449963..ee8a0dafce 100644 --- a/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java +++ b/ebean-test/src/test/java/org/tests/model/rawsql/ERawSqlAggBean.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.time.LocalDate; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java index 80cbd64c84..ba49af4588 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/BaseResourceFile.java @@ -1,8 +1,8 @@ package org.tests.model.selfref; -import javax.persistence.Column; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java index 2efff0071b..8c2022887d 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/ResourceFile.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java index 7999dcb80f..a9e7674085 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfParent.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java index f29430aed2..619c0d403d 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefCustomer.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "self_ref_customer") diff --git a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java index 2e054e5ad6..08eef4990b 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/SelfRefExample.java @@ -1,6 +1,6 @@ package org.tests.model.selfref; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java index 256fe56343..1ed17e9234 100644 --- a/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java +++ b/ebean-test/src/test/java/org/tests/model/selfref/TestSelfRefExample.java @@ -5,7 +5,7 @@ import io.ebean.Query; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/model/site/DataContainer.java b/ebean-test/src/test/java/org/tests/model/site/DataContainer.java index 47c91a6e19..040d4b728a 100644 --- a/ebean-test/src/test/java/org/tests/model/site/DataContainer.java +++ b/ebean-test/src/test/java/org/tests/model/site/DataContainer.java @@ -1,7 +1,7 @@ package org.tests.model.site; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/site/Site.java b/ebean-test/src/test/java/org/tests/model/site/Site.java index 1b950f821c..eaf05e05a9 100644 --- a/ebean-test/src/test/java/org/tests/model/site/Site.java +++ b/ebean-test/src/test/java/org/tests/model/site/Site.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java b/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java index 179706233d..d7767f65bc 100644 --- a/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java +++ b/ebean-test/src/test/java/org/tests/model/site/SiteAddress.java @@ -1,7 +1,7 @@ package org.tests.model.site; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java b/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java index fb08f91744..5ec01a4c89 100644 --- a/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java +++ b/ebean-test/src/test/java/org/tests/model/site/TreeEntity.java @@ -2,13 +2,13 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class TreeEntity extends Model { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java index 0ca927b7b1..e637ff4003 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/BaseSoftDelete.java @@ -2,9 +2,9 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @MappedSuperclass public class BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java index 6c1670f1d6..4c918b3441 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicNoSDChild.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class EBasicNoSDChild { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java index f70f9c491e..ddabcee36f 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSDChild.java @@ -1,7 +1,7 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EBasicSDChild extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java index 78d9ae6eef..7b5d42e231 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EBasicSoftDelete.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java index 1c50b91dcc..cd8de963a1 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelBook.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java index bdc49070a6..4632ca9cc5 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelDown.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ESoftDelDown extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java index af19536f4b..ed6208e630 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelMid.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java index 6de6824292..a51133cb72 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneA.java @@ -2,7 +2,7 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class ESoftDelOneA { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java index b89192b31b..c9982fb38f 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelOneB.java @@ -1,9 +1,9 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class ESoftDelOneB { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java index 3b90c42407..b056a3b6ea 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelRole.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java index 31e36afe89..493ee11038 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelTop.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java index c7b14cc462..eae7d82353 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUp.java @@ -1,6 +1,6 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ESoftDelUp extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java index bcac7764a1..84b357c8f8 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelUser.java @@ -1,8 +1,8 @@ package org.tests.model.softdelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java index 8b9ce71e7d..ad3827f0a1 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelX.java @@ -2,10 +2,10 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java index 608343d56b..dc23490ca7 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelY.java @@ -2,10 +2,10 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; @Entity public class ESoftDelY { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java index 5ce11c1751..fe0365f3f1 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/ESoftDelZ.java @@ -2,8 +2,8 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java index ec96fa3e9b..604732292c 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EsdDetail.java @@ -1,7 +1,7 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; @Entity public class EsdDetail extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java b/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java index 29632338b8..36bb2b1a47 100644 --- a/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java +++ b/ebean-test/src/test/java/org/tests/model/softdelete/EsdMaster.java @@ -1,10 +1,10 @@ package org.tests.model.softdelete; -import javax.persistence.Entity; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class EsdMaster extends BaseSoftDelete { diff --git a/ebean-test/src/test/java/org/tests/model/survey/Category.java b/ebean-test/src/test/java/org/tests/model/survey/Category.java index 9cbeca792a..e6f07d66c1 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Category.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Category.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/survey/Group.java b/ebean-test/src/test/java/org/tests/model/survey/Group.java index 5b1fb9e999..8c60ef6ed5 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Group.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Group.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/survey/Question.java b/ebean-test/src/test/java/org/tests/model/survey/Question.java index 1f5c9d081b..fcc73cefd4 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Question.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Question.java @@ -1,9 +1,9 @@ package org.tests.model.survey; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class Question { diff --git a/ebean-test/src/test/java/org/tests/model/survey/Survey.java b/ebean-test/src/test/java/org/tests/model/survey/Survey.java index 328dd2ab27..626e0e5b31 100644 --- a/ebean-test/src/test/java/org/tests/model/survey/Survey.java +++ b/ebean-test/src/test/java/org/tests/model/survey/Survey.java @@ -1,6 +1,6 @@ package org.tests.model.survey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java b/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java index 04721196e5..253ef06ff9 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEvent.java @@ -1,9 +1,9 @@ package org.tests.model.tevent; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Version; @Entity public class TEvent { diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java index 6e34922297..c68e683219 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventMany.java @@ -1,9 +1,9 @@ package org.tests.model.tevent; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; import java.math.BigDecimal; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java index 678ca9677c..5896f84480 100644 --- a/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java +++ b/ebean-test/src/test/java/org/tests/model/tevent/TEventOne.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Aggregation; -import javax.persistence.*; +import jakarta.persistence.*; import java.math.BigDecimal; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java index 4b2cc1f5b9..eb5f8543bd 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomeFileBean.java @@ -1,9 +1,9 @@ package org.tests.model.types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Version; import java.io.File; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java index 1a0fee0bf0..baac0af7f8 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomeNewTypesBean.java @@ -1,9 +1,9 @@ package org.tests.model.types; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.nio.file.Path; import java.sql.Date; import java.time.*; diff --git a/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java b/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java index 678e0321c8..ce29e9af9f 100644 --- a/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java +++ b/ebean-test/src/test/java/org/tests/model/types/SomePeriodBean.java @@ -1,8 +1,8 @@ package org.tests.model.types; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; import java.time.MonthDay; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java index dd28ae1845..ac5f4f3625 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChild.java @@ -4,7 +4,7 @@ import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java index 152ba6212a..c0bddb2704 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibChildSibling.java @@ -4,9 +4,9 @@ import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; import java.io.Serializable; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java index 7f8332c6f2..495b88571a 100644 --- a/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java +++ b/ebean-test/src/test/java/org/tests/model/uuidsibling/USibParent.java @@ -4,10 +4,10 @@ import io.ebean.Model; import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.io.Serializable; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java index 26223b8012..41e52d89ff 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionChild.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionChild.java @@ -1,6 +1,6 @@ package org.tests.model.version; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java index fdcce67824..e96ab10bc0 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionParent.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionParent.java @@ -1,6 +1,6 @@ package org.tests.model.version; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/version/VersionToy.java b/ebean-test/src/test/java/org/tests/model/version/VersionToy.java index b7491ecb3c..cb4a2ef11b 100644 --- a/ebean-test/src/test/java/org/tests/model/version/VersionToy.java +++ b/ebean-test/src/test/java/org/tests/model/version/VersionToy.java @@ -1,9 +1,9 @@ package org.tests.model.version; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class VersionToy { diff --git a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java index 1700e0f2d7..12fea41af2 100644 --- a/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java +++ b/ebean-test/src/test/java/org/tests/model/view/EOrderAgg.java @@ -4,7 +4,7 @@ import io.ebean.annotation.View; import org.tests.model.basic.Order; -import javax.persistence.*; +import jakarta.persistence.*; @Cache(enableQueryCache = true) @Entity diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/AbstractVirtualBase.java b/ebean-test/src/test/java/org/tests/model/virtualprop/AbstractVirtualBase.java index 7842cd0bb0..dc53eaa28b 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/AbstractVirtualBase.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/AbstractVirtualBase.java @@ -2,8 +2,8 @@ import io.ebean.bean.extend.ExtendableBean; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class AbstractVirtualBase implements ExtendableBean { diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBase.java b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBase.java index 9912949766..b78a73b707 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBase.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBase.java @@ -1,6 +1,6 @@ package org.tests.model.virtualprop; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class VirtualBase extends AbstractVirtualBase { diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseA.java b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseA.java index 4e3b2d2b76..ef3a62e6a1 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseA.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseA.java @@ -1,7 +1,7 @@ package org.tests.model.virtualprop; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("A") diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseB.java b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseB.java index 17c86f2936..8b4dc4da58 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseB.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseB.java @@ -1,7 +1,7 @@ package org.tests.model.virtualprop; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("B") diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseInherit.java b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseInherit.java index 9dce83fc60..2256a406dc 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseInherit.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/VirtualBaseInherit.java @@ -1,9 +1,9 @@ package org.tests.model.virtualprop; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension2.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension2.java index 0681c3f5b2..c67fad4def 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension2.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension2.java @@ -4,8 +4,8 @@ import io.ebean.bean.extend.EntityExtension; import org.tests.model.virtualprop.VirtualBase; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; import java.util.List; /** diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension3.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension3.java index 2f0826b303..cb5f4ea751 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension3.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension3.java @@ -5,7 +5,7 @@ import io.ebean.bean.extend.EntityExtension; import org.tests.model.virtualprop.VirtualBase; -import javax.persistence.OneToOne; +import jakarta.persistence.OneToOne; /** * This class will add the fields 'virtualExtendOne' and 'firstName' to 'VirtualBase' by EntityExtension diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension5.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension5.java index 4f7be500e5..04bc147dba 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension5.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/Extension5.java @@ -4,7 +4,7 @@ import io.ebean.bean.extend.EntityExtension; import org.tests.model.virtualprop.VirtualBaseA; -import javax.persistence.OneToMany; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualAExtendOne.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualAExtendOne.java index 6bc41a156a..64dd3c32a3 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualAExtendOne.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualAExtendOne.java @@ -2,9 +2,9 @@ import org.tests.model.virtualprop.VirtualBaseA; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class VirtualAExtendOne { diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendManyToMany.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendManyToMany.java index ae0573e1b2..5fe1e51096 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendManyToMany.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendManyToMany.java @@ -2,9 +2,9 @@ import org.tests.model.virtualprop.VirtualBase; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToMany; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendOne.java b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendOne.java index 28c16e4ba6..73156dbe4b 100644 --- a/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendOne.java +++ b/ebean-test/src/test/java/org/tests/model/virtualprop/ext/VirtualExtendOne.java @@ -2,10 +2,10 @@ import org.tests.model.virtualprop.VirtualBase; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; -import javax.persistence.PrimaryKeyJoinColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrimaryKeyJoinColumn; @Entity public class VirtualExtendOne { diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java index 3f961f85ed..3ef3e757fb 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZero.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZero.java @@ -1,6 +1,6 @@ package org.tests.model.zero; -import javax.persistence.*; +import jakarta.persistence.*; @Entity public class WithZero { diff --git a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java index c6ea438216..247be873af 100644 --- a/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java +++ b/ebean-test/src/test/java/org/tests/model/zero/WithZeroParent.java @@ -1,6 +1,6 @@ package org.tests.model.zero; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/OMVertex.java b/ebean-test/src/test/java/org/tests/o2m/OMVertex.java index 95d57d1335..643ca97cb6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OMVertex.java +++ b/ebean-test/src/test/java/org/tests/o2m/OMVertex.java @@ -1,9 +1,9 @@ package org.tests.o2m; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; import java.util.UUID; diff --git a/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java b/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java index 95ec6d1012..231906f2fd 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java +++ b/ebean-test/src/test/java/org/tests/o2m/OMVertexOther.java @@ -1,7 +1,7 @@ package org.tests.o2m; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.util.UUID; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java index 8c6c908b69..e301781f9c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmAccountChildDBO.java @@ -1,8 +1,8 @@ package org.tests.o2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class OmAccountChildDBO { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java b/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java index b2aa63d003..24d4bd6d02 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmAccountDBO.java @@ -2,12 +2,12 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmAccountDBO extends Model { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java index b94ca0a66d..f40dcba43a 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmBasicChild.java @@ -1,9 +1,9 @@ package org.tests.o2m; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class OmBasicChild { diff --git a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java index 76f23c86ad..6fbb944560 100644 --- a/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java +++ b/ebean-test/src/test/java/org/tests/o2m/OmBasicParent.java @@ -2,13 +2,13 @@ import io.ebean.annotation.Where; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Version; import java.util.List; -import static javax.persistence.CascadeType.ALL; +import static jakarta.persistence.CascadeType.ALL; @Entity public class OmBasicParent { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java b/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java index 4116954281..a281cbb8a1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/Attachment.java @@ -1,6 +1,6 @@ package org.tests.o2m.dm; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class Attachment extends HistoryColumns { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java index 28482c8050..70d3a8ba79 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/GoodsEntity.java @@ -1,6 +1,6 @@ package org.tests.o2m.dm; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java b/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java index 31d8f127e0..77ade92bf2 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/HistoryColumns.java @@ -2,10 +2,10 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public class HistoryColumns extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java index 6b71ab2382..4dc015cc39 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/PersonEntity.java @@ -2,7 +2,7 @@ import org.tests.model.draftable.BaseDomain; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class PersonEntity extends BaseDomain { diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java index 1cb1bfa1a1..7001f70989 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowEntity.java @@ -2,10 +2,10 @@ import io.ebean.annotation.SoftDelete; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java index 325d0b8119..6aa5116e75 100644 --- a/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java +++ b/ebean-test/src/test/java/org/tests/o2m/dm/WorkflowOperationEntity.java @@ -3,9 +3,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.ebean.annotation.SoftDelete; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; @Entity public class WorkflowOperationEntity extends HistoryColumns { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java index eda26cf3dd..8240cb659f 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkey.java @@ -1,9 +1,9 @@ package org.tests.o2m.jointable; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Version; @Entity @Table(name="monkey") diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java index 4e335aa0c3..336f8e78ad 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtMonkeyGroup.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java index 5782c220fe..5f44e6b5e1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTrainer.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java index db64e6be2e..f52ecfd4bc 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/JtTroop.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java index 14644d2003..d05c1aac18 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassA.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ClassA extends ClassSuper { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java index 305b33999b..da4008ed0c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassB.java @@ -1,6 +1,6 @@ package org.tests.o2m.jointable.inheritance; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity public class ClassB extends ClassSuper { diff --git a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java index 2b62d81bfe..94ed3eb67c 100644 --- a/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java +++ b/ebean-test/src/test/java/org/tests/o2m/jointable/inheritance/ClassSuper.java @@ -2,7 +2,7 @@ import org.tests.o2m.jointable.JtMonkey; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Inheritance diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java index b5b18eb6d7..2301dac7d1 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBar.java @@ -1,6 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java index 7d2e40a42c..eb6de80a81 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlBaz.java @@ -1,9 +1,9 @@ package org.tests.o2m.lazy; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "oml_baz") diff --git a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java index c460d5d508..1cf44412e6 100644 --- a/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java +++ b/ebean-test/src/test/java/org/tests/o2m/lazy/OmlFoo.java @@ -1,6 +1,6 @@ package org.tests.o2m.lazy; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java index a08a0a58fd..7b0d40f880 100644 --- a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java +++ b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItem.java @@ -1,6 +1,6 @@ package org.tests.o2m.recurse; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java index aa77c3e738..6d789d5d68 100644 --- a/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java +++ b/ebean-test/src/test/java/org/tests/o2m/recurse/RMItemHolder.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Version; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Version; @Entity public class RMItemHolder extends Model { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java index 6be6928fd1..693084324f 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelA.java @@ -1,10 +1,10 @@ package org.tests.o2o; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class OtoLevelA { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java index 5f7899cbf2..fbb1fa6f13 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelB.java @@ -1,9 +1,9 @@ package org.tests.o2o; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; @Entity public class OtoLevelB { diff --git a/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java b/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java index b5caa688e6..bbbe2b2cb5 100644 --- a/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java +++ b/ebean-test/src/test/java/org/tests/o2o/OtoLevelC.java @@ -1,7 +1,7 @@ package org.tests.o2o; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; @Entity public class OtoLevelC { diff --git a/ebean-test/src/test/java/org/tests/order/OrderMaster.java b/ebean-test/src/test/java/org/tests/order/OrderMaster.java index 71a6978a9b..976ccf0b8c 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderMaster.java +++ b/ebean-test/src/test/java/org/tests/order/OrderMaster.java @@ -1,9 +1,9 @@ package org.tests.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java index 4e1751cab1..caea178fa4 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedChild.java @@ -1,6 +1,6 @@ package org.tests.order; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java index 19ea3481c4..e20aa6e85f 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java +++ b/ebean-test/src/test/java/org/tests/order/OrderReferencedParent.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Index; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/order/OrderToy.java b/ebean-test/src/test/java/org/tests/order/OrderToy.java index a305b47c93..6c226fdfd2 100644 --- a/ebean-test/src/test/java/org/tests/order/OrderToy.java +++ b/ebean-test/src/test/java/org/tests/order/OrderToy.java @@ -1,8 +1,8 @@ package org.tests.order; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; @Entity public class OrderToy { diff --git a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java index 2557d17822..6a1ac7c852 100644 --- a/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java +++ b/ebean-test/src/test/java/org/tests/query/TestInvalidFetchPath.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.Customer; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java index 59307d83cc..cd6bce0657 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindIterate.java @@ -15,7 +15,7 @@ import org.tests.model.basic.OrderShipment; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java index 6297765774..4b9cba7196 100644 --- a/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java +++ b/ebean-test/src/test/java/org/tests/query/TestQueryFindPagedList.java @@ -10,7 +10,7 @@ import org.tests.model.basic.Order; import org.tests.model.basic.ResetBasicData; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/ebean-test/src/test/java/org/tests/query/cache/Acl.java b/ebean-test/src/test/java/org/tests/query/cache/Acl.java index 0594164fc8..07c1bcf648 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Acl.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Acl.java @@ -1,8 +1,8 @@ package org.tests.query.cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; @Entity public class Acl { diff --git a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java index 53d8f95e86..a8ba08dde1 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java +++ b/ebean-test/src/test/java/org/tests/query/cache/AclContainerRelation.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; import javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/query/cache/Contract.java b/ebean-test/src/test/java/org/tests/query/cache/Contract.java index 71cfcb727e..f43eb70e99 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Contract.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Contract.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; diff --git a/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java b/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java index 409715391f..9050d49aa1 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java +++ b/ebean-test/src/test/java/org/tests/query/cache/ContractCosts.java @@ -1,9 +1,9 @@ package org.tests.query.cache; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; import javax.validation.constraints.NotNull; @Entity diff --git a/ebean-test/src/test/java/org/tests/query/cache/Position.java b/ebean-test/src/test/java/org/tests/query/cache/Position.java index 288582d0d4..700f605293 100644 --- a/ebean-test/src/test/java/org/tests/query/cache/Position.java +++ b/ebean-test/src/test/java/org/tests/query/cache/Position.java @@ -1,6 +1,6 @@ package org.tests.query.cache; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_position") diff --git a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java index 31260a3a6e..5e57a7e4c9 100644 --- a/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java +++ b/ebean-test/src/test/java/org/tests/query/cancel/SqlQueryCancelTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.tests.model.basic.EBasic; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.SQLException; import java.util.UUID; import java.util.concurrent.ExecutionException; diff --git a/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java b/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java index 50ca71d5d7..f8ccd25aa5 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java +++ b/ebean-test/src/test/java/org/tests/rawsql/A2Customer.java @@ -2,7 +2,7 @@ import io.ebean.annotation.Sql; -import javax.persistence.Entity; +import jakarta.persistence.Entity; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java b/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java index bbff6f0d3f..eaa2c90e8c 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java +++ b/ebean-test/src/test/java/org/tests/rawsql/ACustomer.java @@ -2,8 +2,8 @@ import io.ebean.annotation.Sql; -import javax.persistence.Column; -import javax.persistence.Entity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; @Entity @Sql diff --git a/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java b/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java index a119896e8b..436319732a 100644 --- a/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java +++ b/ebean-test/src/test/java/org/tests/rawsql/transport/SampleReport.java @@ -1,6 +1,6 @@ package org.tests.rawsql.transport; -import javax.persistence.Entity; +import jakarta.persistence.Entity; import java.sql.Date; @Entity diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java index 694246b5b6..1582f4b8f4 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocation.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java index 553a77852b..f21f0fe224 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/PalletLocationExternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("EXT") diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java index b79e599505..63443db325 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Warehouse.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Set; @Entity diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java index f0f820ded2..8ee4c52254 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/Zone.java @@ -1,6 +1,6 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Inheritance(strategy = InheritanceType.SINGLE_TABLE) diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java index 26599cf733..b7248bf1cb 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneExternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("EXT") diff --git a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java index eb558952b9..6072f13b35 100644 --- a/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java +++ b/ebean-test/src/test/java/org/tests/singleTableInheritance/model/ZoneInternal.java @@ -1,7 +1,7 @@ package org.tests.singleTableInheritance.model; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; @Entity @DiscriminatorValue("INT") diff --git a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java index a45108d280..3949426e23 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java +++ b/ebean-test/src/test/java/org/tests/sp/model/IdEntity.java @@ -1,6 +1,6 @@ package org.tests.sp.model; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @MappedSuperclass diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java index 415dcecba2..8f3ef6fe9b 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Car.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Car.java @@ -2,7 +2,7 @@ import org.tests.sp.model.IdEntity; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.List; @Entity diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Door.java b/ebean-test/src/test/java/org/tests/sp/model/car/Door.java index db8576e65c..463cad68c9 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Door.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Door.java @@ -2,8 +2,8 @@ import org.tests.sp.model.IdEntity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "sp_car_door") diff --git a/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java b/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java index 46d8ad41f9..1f7699ff5a 100644 --- a/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java +++ b/ebean-test/src/test/java/org/tests/sp/model/car/Wheel.java @@ -2,8 +2,8 @@ import org.tests.sp.model.IdEntity; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Table(name = "sp_car_wheel") diff --git a/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java b/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java index 4a2d303137..d934c9b8cb 100644 --- a/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java +++ b/ebean-test/src/test/java/org/tests/timezone/MLocalTime.java @@ -1,8 +1,8 @@ package org.tests.timezone; import javax.annotation.Nullable; -import javax.persistence.Entity; -import javax.persistence.Id; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; import java.time.LocalTime; @Entity diff --git a/ebean-test/src/test/java/org/tests/timezone/TzBean.java b/ebean-test/src/test/java/org/tests/timezone/TzBean.java index e760b5789d..e57120451c 100644 --- a/ebean-test/src/test/java/org/tests/timezone/TzBean.java +++ b/ebean-test/src/test/java/org/tests/timezone/TzBean.java @@ -1,9 +1,9 @@ package org.tests.timezone; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.sql.Timestamp; @Entity diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java index cdcf7bbdc9..f15da28af2 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeanStateReset.java @@ -10,7 +10,7 @@ import org.tests.model.m2m.MnyB; import org.tests.model.m2m.MnyC; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.List; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java index 74e4803403..aef2254a29 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestBeginTransactionWithExisting.java @@ -6,7 +6,7 @@ import io.ebean.annotation.TxIsolation; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.Connection; import static org.assertj.core.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestNested.java b/ebean-test/src/test/java/org/tests/transaction/TestNested.java index c346880830..7987698317 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestNested.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestNested.java @@ -4,7 +4,7 @@ import io.ebean.DB; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.util.concurrent.Callable; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java index 4edd37ae91..2717cbc036 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionCallback.java @@ -6,7 +6,7 @@ import io.ebean.TransactionCallbackAdapter; import org.junit.jupiter.api.Test; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java index 3ae5e80d2f..cbc86d998b 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java +++ b/ebean-test/src/test/java/org/tests/transaction/TestTransactionalNever.java @@ -9,7 +9,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java index 3a2d3e83de..622faee6df 100644 --- a/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java +++ b/ebean-test/src/test/java/org/tests/transaction/TransactionNotTerminatedAfterRollback.java @@ -6,10 +6,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.PersistenceException; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PersistenceException; +import jakarta.persistence.Table; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; diff --git a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java index 904ae23509..9282e810ee 100644 --- a/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java +++ b/ebean-test/src/test/java/org/tests/types/PasswordStoreModel.java @@ -2,9 +2,9 @@ import org.tests.model.BaseModel; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Lob; import javax.validation.constraints.Size; @Entity diff --git a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java index f078d2b9d8..721446c754 100644 --- a/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java +++ b/ebean-test/src/test/java/org/tests/unitinternal/TestTxTypeOnTransactional.java @@ -10,7 +10,7 @@ import org.tests.model.basic.xtra.DummyDao; import org.tests.model.basic.xtra.OptimisticLockExceptionThrowingDao; -import javax.persistence.OptimisticLockException; +import jakarta.persistence.OptimisticLockException; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.fail; diff --git a/ebean-test/src/test/java/org/tests/update/EPersonOnline.java b/ebean-test/src/test/java/org/tests/update/EPersonOnline.java index 2322266520..f9d77ff269 100644 --- a/ebean-test/src/test/java/org/tests/update/EPersonOnline.java +++ b/ebean-test/src/test/java/org/tests/update/EPersonOnline.java @@ -3,9 +3,9 @@ import io.ebean.annotation.Index; import io.ebean.annotation.WhenModified; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import java.time.Instant; diff --git a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java index 36dab37d0e..df45afd86c 100644 --- a/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java +++ b/ebean-test/src/test/java/org/tests/update/TestStatelessUpdate.java @@ -11,7 +11,7 @@ import org.tests.model.basic.EBasic.Status; import org.tests.model.basic.ResetBasicData; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.*; import static org.assertj.core.api.Assertions.assertThat; @@ -100,7 +100,7 @@ public void delete_NoRowsDeleted_expect_false() { /** * I am expecting that Ebean detects there aren't any changes and don't execute any query. - * Currently a {@link javax.persistence.PersistenceException} with message 'Invalid value "null" for parameter "SQL"' is thrown. + * Currently a {@link jakarta.persistence.PersistenceException} with message 'Invalid value "null" for parameter "SQL"' is thrown. */ @Test public void testWithoutChangesAndIgnoreNullValues() { diff --git a/ebean-test/src/test/java/org/tests/update/objects/Child.java b/ebean-test/src/test/java/org/tests/update/objects/Child.java index 87166bfda2..1b4ef1049d 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Child.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Child.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_d") diff --git a/ebean-test/src/test/java/org/tests/update/objects/Parent.java b/ebean-test/src/test/java/org/tests/update/objects/Parent.java index 6a582a9812..1e7d9c4345 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/Parent.java +++ b/ebean-test/src/test/java/org/tests/update/objects/Parent.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_c") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java index 71fb728167..fb06607cbb 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingA.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_a") diff --git a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java index cbd32a7fb9..bf28b7abf9 100644 --- a/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java +++ b/ebean-test/src/test/java/org/tests/update/objects/SiblingB.java @@ -1,6 +1,6 @@ package org.tests.update.objects; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Table(name = "e_save_test_b") diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java index 3299802d5c..d1e5362215 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java @@ -6,12 +6,12 @@ interface Constants { String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")"; String GENERATED = "io.ebean.typequery.Generated"; - String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass"; - String DISCRIMINATOR_VALUE = "javax.persistence.DiscriminatorValue"; - String INHERITANCE = "javax.persistence.Inheritance"; - String ENTITY = "javax.persistence.Entity"; - String EMBEDDABLE = "javax.persistence.Embeddable"; - String CONVERTER = "javax.persistence.Converter"; + String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass"; + String DISCRIMINATOR_VALUE = "jakarta.persistence.DiscriminatorValue"; + String INHERITANCE = "jakarta.persistence.Inheritance"; + String ENTITY = "jakarta.persistence.Entity"; + String EMBEDDABLE = "jakarta.persistence.Embeddable"; + String CONVERTER = "jakarta.persistence.Converter"; String EBEAN_COMPONENT = "io.ebean.annotation.EbeanComponent"; String DBARRAY = "io.ebean.annotation.DbArray"; diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 8e5439deab..e946197158 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -200,7 +200,7 @@ private boolean isStaticOrTransient(VariableElement field) { return ( modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.TRANSIENT) || - hasAnnotations(field, "javax.persistence.Transient") + hasAnnotations(field, "jakarta.persistence.Transient") ); } diff --git a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java index 6f8bc9f095..cd28bccab5 100644 --- a/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java +++ b/platforms/postgres/src/main/java/io/ebean/platform/postgres/PostgresPlatformProvider.java @@ -6,7 +6,7 @@ import io.ebean.platform.cockroach.CockroachPlatform; import io.ebean.platform.yugabyte.YugabytePlatform; -import javax.persistence.PersistenceException; +import jakarta.persistence.PersistenceException; import java.sql.*; import java.util.Locale; diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java index b456dbeb68..204d5595c1 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/Constants.java @@ -7,12 +7,12 @@ interface Constants { String AT_TYPEQUERYBEAN = "@TypeQueryBean(\"v1\")"; String GENERATED = "io.ebean.typequery.Generated"; - String MAPPED_SUPERCLASS = "javax.persistence.MappedSuperclass"; - String DISCRIMINATOR_VALUE = "javax.persistence.DiscriminatorValue"; - String INHERITANCE = "javax.persistence.Inheritance"; - String ENTITY = "javax.persistence.Entity"; - String EMBEDDABLE = "javax.persistence.Embeddable"; - String CONVERTER = "javax.persistence.Converter"; + String MAPPED_SUPERCLASS = "jakarta.persistence.MappedSuperclass"; + String DISCRIMINATOR_VALUE = "jakarta.persistence.DiscriminatorValue"; + String INHERITANCE = "jakarta.persistence.Inheritance"; + String ENTITY = "jakarta.persistence.Entity"; + String EMBEDDABLE = "jakarta.persistence.Embeddable"; + String CONVERTER = "jakarta.persistence.Converter"; String EBEAN_COMPONENT = "io.ebean.annotation.EbeanComponent"; String DBARRAY = "io.ebean.annotation.DbArray"; diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java index 416d09af90..a92b25793b 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/ProcessingContext.java @@ -157,7 +157,7 @@ private boolean isStaticOrTransient(VariableElement field) { return ( modifiers.contains(Modifier.STATIC) || modifiers.contains(Modifier.TRANSIENT) || - hasAnnotations(field, "javax.persistence.Transient") + hasAnnotations(field, "jakarta.persistence.Transient") ); } diff --git a/tests/test-java16/src/main/java/org/example/records/Address.java b/tests/test-java16/src/main/java/org/example/records/Address.java index 2ac5314021..8d46b4bb17 100644 --- a/tests/test-java16/src/main/java/org/example/records/Address.java +++ b/tests/test-java16/src/main/java/org/example/records/Address.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record Address (String line1, String line2, String city) { diff --git a/tests/test-java16/src/main/java/org/example/records/BaseModel.java b/tests/test-java16/src/main/java/org/example/records/BaseModel.java index a2698576ca..d04e6705d9 100644 --- a/tests/test-java16/src/main/java/org/example/records/BaseModel.java +++ b/tests/test-java16/src/main/java/org/example/records/BaseModel.java @@ -3,9 +3,9 @@ import io.ebean.Model; import io.ebean.annotation.Identity; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; @Identity(start = 1000, cache = 100) @MappedSuperclass diff --git a/tests/test-java16/src/main/java/org/example/records/Contact.java b/tests/test-java16/src/main/java/org/example/records/Contact.java index 4b054511fe..044da173bc 100644 --- a/tests/test-java16/src/main/java/org/example/records/Contact.java +++ b/tests/test-java16/src/main/java/org/example/records/Contact.java @@ -2,10 +2,10 @@ import io.ebean.Model; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Version; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Version; @Entity public class Contact extends Model { diff --git a/tests/test-java16/src/main/java/org/example/records/Course.java b/tests/test-java16/src/main/java/org/example/records/Course.java index e3798c02c0..d9aa30e267 100644 --- a/tests/test-java16/src/main/java/org/example/records/Course.java +++ b/tests/test-java16/src/main/java/org/example/records/Course.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Length; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import java.util.HashMap; import java.util.Map; diff --git a/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java b/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java index dc95a87235..d1639d901e 100644 --- a/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java +++ b/tests/test-java16/src/main/java/org/example/records/CourseRecordEntity.java @@ -2,9 +2,9 @@ import io.ebean.annotation.Identity; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; @Identity(start = 1000) @Entity diff --git a/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java b/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java index d3436db7b9..4b48ccce0b 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomAccessors.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record CustomAccessors(String line1, String line2, String city) { diff --git a/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java b/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java index 964821c69d..7a3c3a96c8 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomConstructor.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @Embeddable diff --git a/tests/test-java16/src/main/java/org/example/records/CustomEquals.java b/tests/test-java16/src/main/java/org/example/records/CustomEquals.java index 1883a708c8..e528e5da9a 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomEquals.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomEquals.java @@ -2,7 +2,7 @@ import io.avaje.lang.NonNullApi; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.Objects; @NonNullApi diff --git a/tests/test-java16/src/main/java/org/example/records/CustomToString.java b/tests/test-java16/src/main/java/org/example/records/CustomToString.java index 8712fa38aa..eebbb610e0 100644 --- a/tests/test-java16/src/main/java/org/example/records/CustomToString.java +++ b/tests/test-java16/src/main/java/org/example/records/CustomToString.java @@ -2,7 +2,7 @@ import io.avaje.lang.NonNullApi; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @NonNullApi @Embeddable diff --git a/tests/test-java16/src/main/java/org/example/records/UserRole.java b/tests/test-java16/src/main/java/org/example/records/UserRole.java index 1d25f6e976..8c05a19e6c 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserRole.java +++ b/tests/test-java16/src/main/java/org/example/records/UserRole.java @@ -2,9 +2,9 @@ import io.ebean.Model; -import javax.persistence.EmbeddedId; -import javax.persistence.Entity; -import javax.persistence.Version; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.Version; @Entity public class UserRole extends Model { diff --git a/tests/test-java16/src/main/java/org/example/records/UserRoleId.java b/tests/test-java16/src/main/java/org/example/records/UserRoleId.java index a0807de0a9..0b27543eaa 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserRoleId.java +++ b/tests/test-java16/src/main/java/org/example/records/UserRoleId.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; @Embeddable public record UserRoleId(Integer userId, String roleId) { diff --git a/tests/test-java16/src/main/java/org/example/records/UserSite.java b/tests/test-java16/src/main/java/org/example/records/UserSite.java index fb881c32e9..536709b23f 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserSite.java +++ b/tests/test-java16/src/main/java/org/example/records/UserSite.java @@ -2,7 +2,7 @@ import io.ebean.Model; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @IdClass(UserSiteId.class) diff --git a/tests/test-java16/src/main/java/org/example/records/UserSiteId.java b/tests/test-java16/src/main/java/org/example/records/UserSiteId.java index 36c4dd599c..c43e452d2d 100644 --- a/tests/test-java16/src/main/java/org/example/records/UserSiteId.java +++ b/tests/test-java16/src/main/java/org/example/records/UserSiteId.java @@ -1,6 +1,6 @@ package org.example.records; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import java.util.UUID; @Embeddable diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt index c70290d630..6629ef6ad6 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/Address.kt @@ -1,7 +1,7 @@ package org.example.domain; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import javax.validation.constraints.Size; import org.example.otherpackage.GenericType; diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt index 44789893f7..b50b8dfc0e 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/BaseModel.kt @@ -2,9 +2,9 @@ package org.example.domain; import java.time.Instant; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; -import javax.persistence.Version; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.Version; import io.ebean.Model; import io.ebean.annotation.WhenCreated; diff --git a/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt b/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt index b96fd987c9..c50b3c6005 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/domain/MyKotInner.kt @@ -1,6 +1,6 @@ package org.example.domain -import javax.persistence.* +import jakarta.persistence.* @Entity @Table(name = "t_inner") diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt index a24154449c..0accb25462 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/GenericTypeAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class GenericTypeAttributeConverter : AttributeConverter, String> { diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt index 55981a0a87..f6173c64b0 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/PhoneAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class PhoneAttributeConverter : AttributeConverter { diff --git a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt index 690978ce33..7b0594a593 100644 --- a/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt +++ b/tests/test-kotlin/src/main/kotlin/org/example/otherpackage/ValidEmailAttributeConverter.kt @@ -1,7 +1,7 @@ package org.example.otherpackage -import javax.persistence.AttributeConverter -import javax.persistence.Converter +import jakarta.persistence.AttributeConverter +import jakarta.persistence.Converter @Converter class ValidEmailAttributeConverter : AttributeConverter { diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt index 514739a392..bd3348f7a9 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/Customer.kt @@ -1,8 +1,8 @@ package org.example.order -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.Version +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Version import org.example.api.ICustomer @Entity diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt index a5e87f9d9c..1c846069c1 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/Order.kt @@ -1,12 +1,12 @@ package org.example.order -import javax.persistence.CascadeType -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.ManyToOne -import javax.persistence.OneToMany -import javax.persistence.Table -import javax.persistence.Version +import jakarta.persistence.CascadeType +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.ManyToOne +import jakarta.persistence.OneToMany +import jakarta.persistence.Table +import jakarta.persistence.Version @Entity @Table(name = "t_order") diff --git a/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt b/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt index 6a7e123ecf..7d5a9c9bfb 100644 --- a/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt +++ b/tests/test-kotlin/src/test/kotlin/org/example/order/OrderItem.kt @@ -1,9 +1,9 @@ package org.example.order import java.math.BigDecimal -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.ManyToOne +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.ManyToOne @Entity class OrderItem( From bf880ba8e29ab483b577acb426c9e5fdff5bb720 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Mon, 18 Sep 2023 09:48:01 +0200 Subject: [PATCH 046/123] Updated poms --- 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 | 12 +++---- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-bom/pom.xml | 50 ++++++++++++++--------------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 12 +++---- ebean-ddl-generator/pom.xml | 8 ++--- ebean-jackson-mapper/pom.xml | 4 +-- ebean-postgis/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++--- ebean-redis/pom.xml | 12 +++---- ebean-spring-txn/pom.xml | 6 ++-- ebean-test/pom.xml | 12 +++---- kotlin-querybean-generator/pom.xml | 10 +++--- 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/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 6 ++-- 47 files changed, 192 insertions(+), 192 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index 90e48f5812..335c794562 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-clickhouse @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-clickhouse - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index 87e44b412f..9d144b2bdd 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-cockroach @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-postgres - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index 94fb57f7f8..2fc5982443 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-db2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-db2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 4f4e4a20e0..86e9ad9c78 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-h2 @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-h2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index e3c7a55f38..515decd282 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-hana @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-hana - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 8ddea015cc..9cbf5305c5 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-mariadb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-mariadb - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index d6b0f8a27e..a83b8a0a0e 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-mysql @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-mysql - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index 9b47036d78..3b6ab0e1c5 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-nuodb @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-nuodb - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index 0ac6b9a78a..f70413f5fe 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-oracle @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-oracle - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index 5f3f1b24c5..fc4f697347 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-postgres @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-postgres - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index d61dd8f448..feaa3a3f6b 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-sqlite @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-sqlite - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 2357294b8b..96ccc2a66b 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-sqlserver @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-sqlserver - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index 8a44e83d99..fcb26197f8 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-yugabyte @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -41,13 +41,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-postgres - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 0d270f015a..856c470f72 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean (all platforms) @@ -16,13 +16,13 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -40,7 +40,7 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -59,13 +59,13 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-all - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/composites/pom.xml b/composites/pom.xml index f00a4e7de0..c2700b6a76 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 3618abc749..127bcd1aa3 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 7a5a500902..cc39738cc0 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core-type - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-ddl-generator - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -155,46 +155,46 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean querybean-generator - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided io.ebean kotlin-querybean-generator - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided io.ebean ebean-test - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean ebean-postgis - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-redis - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-spring-txn - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-db2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-h2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-hana - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-mariadb - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-mysql - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-nuodb - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-oracle - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-postgres - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-sqlite - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-sqlserver - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index e7af4a0748..cd0c86d685 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index cc65888615..10ba232154 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean ebean-platform-postgres - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean ebean-platform-sqlserver - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 47aeeca05e..0bf3e19390 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index bb95b55e5a..c18b8b038d 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index e3802f68b7..a91f0f6eb6 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 0a49c018e3..ba37ab19d6 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean querybean-generator - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean ebean-test - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 98dacb4720..7ef21a6cdd 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean querybean-generator - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean ebean-test - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 748689bc29..cb9fd76f21 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 511a0f28a9..bee8658f5e 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 provided io.ebean ebean-ddl-generator - 13.20.2-FOC4-SNAPSHOT + 13.22.0 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean ebean-platform-all - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 033fb3c142..f9bd803fbb 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test io.ebean ebean-ddl-generator - 13.20.2-FOC4-SNAPSHOT + 13.22.0 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 2890799f1f..ebbe71a62b 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-platform-all @@ -14,67 +14,67 @@ io.ebean ebean-platform-h2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-clickhouse - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-db2 - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-hana - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-hsqldb - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-mysql - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-mariadb - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-nuodb - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-oracle - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-postgres - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-sqlanywhere - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-sqlite - 13.20.2-FOC4-SNAPSHOT + 13.22.0 io.ebean ebean-platform-sqlserver - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index dbd0cee7b2..bec9a2d580 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-platform-clickhouse @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 8a36a91aa3..f9a85d7cc7 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-platform-db2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 1691d3c09f..8cd2955805 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.20.2-FOC4-SNAPSHOT + 13.22.0 ebean-platform-h2 @@ -14,7 +14,7 @@ io.ebean ebean-api - 13.20.2-FOC4-SNAPSHOT + 13.22.0 diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 1055136e71..b2dcf4b0a7 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -91,9 +91,9 @@ 4.0.0 - com.sun.xml.bind - jaxb-impl - 4.0.0 + org.glassfish.jaxb + jaxb-runtime + 4.0.3 runtime From 4fdbd23fae1a4def1566e9e942802dacc6569f33 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Mon, 18 Sep 2023 10:52:32 +0200 Subject: [PATCH 049/123] Bump version to 13.22.0-FOC1 --- 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 | 12 +++---- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-bom/pom.xml | 50 ++++++++++++++--------------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 12 +++---- ebean-ddl-generator/pom.xml | 8 ++--- ebean-jackson-mapper/pom.xml | 4 +-- ebean-postgis/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++--- ebean-redis/pom.xml | 12 +++---- ebean-spring-txn/pom.xml | 6 ++-- ebean-test/pom.xml | 12 +++---- kotlin-querybean-generator/pom.xml | 10 +++--- 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/pom.xml | 2 +- tests/test-java16/pom.xml | 6 ++-- tests/test-kotlin/pom.xml | 6 ++-- 47 files changed, 192 insertions(+), 192 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index f6256dbbc3..e803044be9 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-clickhouse - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index 206e9fb196..6265e57778 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-postgres - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index b95d23f079..d490deeeb6 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-db2 - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index d718cb2b20..bb08b6fe40 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-h2 - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index 3783c69c5a..41c33cb5c8 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-hana - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 39fa689724..cf8e40d539 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-mariadb - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index 1474b3e5cc..e8249225f0 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-mysql - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index e1e1cec780..0a819cfe7b 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-nuodb - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index 615e0becdf..e1e97bcb6c 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-oracle - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index 0dd3b2fd54..22370e573d 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-postgres - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index 67f411b748..73f6e7e151 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-sqlite - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 78cf0349f4..6537675c71 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-sqlserver - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index 4bea00c480..9d2a0939f3 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-postgres - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 8ec3ae8c18..51d03ea3e1 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 @@ -41,7 +41,7 @@ io.ebean ebean-jackson-mapper - 13.22.0 + 13.22.0-FOC1 @@ -60,13 +60,13 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-all - 13.22.0 + 13.22.0-FOC1 diff --git a/composites/pom.xml b/composites/pom.xml index c2700b6a76..1f4f5c8f16 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 127bcd1aa3..dc2ac4fd00 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index cc39738cc0..75bd785d43 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core-type - 13.22.0 + 13.22.0-FOC1 @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-ddl-generator - 13.22.0 + 13.22.0-FOC1 @@ -155,46 +155,46 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 io.ebean querybean-generator - 13.22.0 + 13.22.0-FOC1 provided io.ebean kotlin-querybean-generator - 13.22.0 + 13.22.0-FOC1 provided io.ebean ebean-test - 13.22.0 + 13.22.0-FOC1 test io.ebean ebean-postgis - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-redis - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-spring-txn - 13.22.0 + 13.22.0-FOC1 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-db2 - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-h2 - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-hana - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-mariadb - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-mysql - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-nuodb - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-oracle - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-postgres - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-sqlite - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-sqlserver - 13.22.0 + 13.22.0-FOC1 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index cd0c86d685..152bb79f8a 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 10ba232154..82f67872e3 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.22.0 + 13.22.0-FOC1 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.22.0 + 13.22.0-FOC1 test io.ebean ebean-platform-postgres - 13.22.0 + 13.22.0-FOC1 test io.ebean ebean-platform-sqlserver - 13.22.0 + 13.22.0-FOC1 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index a6158b8c66..5ff664eb76 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.22.0 + 13.22.0-FOC1 provided io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.22.0 + 13.22.0-FOC1 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index c18b8b038d..d3719de21b 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.22.0 + 13.22.0-FOC1 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index e015cb359e..c5c7c845c2 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.22.0 + 13.22.0-FOC1 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 58de13e2bf..3875023599 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.22.0 + 13.22.0-FOC1 test io.ebean querybean-generator - 13.22.0 + 13.22.0-FOC1 test io.ebean ebean-test - 13.22.0 + 13.22.0-FOC1 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 7f4f3b2e10..573fb97570 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 provided io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 provided io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 test io.ebean querybean-generator - 13.22.0 + 13.22.0-FOC1 test io.ebean ebean-test - 13.22.0 + 13.22.0-FOC1 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index cce70abdaa..6fbd498b48 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.22.0 + 13.22.0-FOC1 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index b2dcf4b0a7..02a972b72d 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 provided io.ebean ebean-ddl-generator - 13.22.0 + 13.22.0-FOC1 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.22.0 + 13.22.0-FOC1 test io.ebean ebean-platform-all - 13.22.0 + 13.22.0-FOC1 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index f9bd803fbb..a7356543b1 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.22.0 + 13.22.0-FOC1 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.22.0 + 13.22.0-FOC1 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.22.0 + 13.22.0-FOC1 test io.ebean ebean-ddl-generator - 13.22.0 + 13.22.0-FOC1 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index ec2f015d3f..4a44d223fc 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-clickhouse - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-db2 - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-hana - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-hsqldb - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-mysql - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-mariadb - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-nuodb - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-oracle - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-postgres - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-sqlanywhere - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-sqlite - 13.22.0 + 13.22.0-FOC1 io.ebean ebean-platform-sqlserver - 13.22.0 + 13.22.0-FOC1 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 1429168c5a..d400ee84c6 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 66b776c6c1..fc9eca510e 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index f478dedb2c..d7230608d7 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0 + 13.22.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0 + 13.22.0-FOC1 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-db2 - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-h2 - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-hana - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-mariadb - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-mysql - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-nuodb - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-oracle - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-postgres - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-sqlite - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-sqlserver - 13.22.0-FOC1 + 13.22.0-FOC2 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 152bb79f8a..39a1badb5c 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.22.0-FOC1 + 13.22.0-FOC2 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 82f67872e3..4154454994 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.22.0-FOC1 + 13.22.0-FOC2 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.22.0-FOC1 + 13.22.0-FOC2 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC1 + 13.22.0-FOC2 test io.ebean ebean-platform-postgres - 13.22.0-FOC1 + 13.22.0-FOC2 test io.ebean ebean-platform-sqlserver - 13.22.0-FOC1 + 13.22.0-FOC2 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 5ff664eb76..6f375150a5 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.22.0-FOC1 + 13.22.0-FOC2 provided io.ebean ebean-core - 13.22.0-FOC1 + 13.22.0-FOC2 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.22.0-FOC1 + 13.22.0-FOC2 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index d3719de21b..2633c2d6e6 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.22.0-FOC1 + 13.22.0-FOC2 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index c5c7c845c2..545ae4b32d 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-core - 13.22.0-FOC1 + 13.22.0-FOC2 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.22.0-FOC1 + 13.22.0-FOC2 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 3875023599..672de3b4d8 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.22.0-FOC1 + 13.22.0-FOC2 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.22.0-FOC1 + 13.22.0-FOC2 test io.ebean querybean-generator - 13.22.0-FOC1 + 13.22.0-FOC2 test io.ebean ebean-test - 13.22.0-FOC1 + 13.22.0-FOC2 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 573fb97570..ec5d745226 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.22.0-FOC1 + 13.22.0-FOC2 provided io.ebean ebean-core - 13.22.0-FOC1 + 13.22.0-FOC2 provided io.ebean ebean-querybean - 13.22.0-FOC1 + 13.22.0-FOC2 test io.ebean querybean-generator - 13.22.0-FOC1 + 13.22.0-FOC2 test io.ebean ebean-test - 13.22.0-FOC1 + 13.22.0-FOC2 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 6fbd498b48..b9efbda33c 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.22.0-FOC1 + 13.22.0-FOC2 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.22.0-FOC1 + 13.22.0-FOC2 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 02a972b72d..894001122c 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-core - 13.22.0-FOC1 + 13.22.0-FOC2 provided io.ebean ebean-ddl-generator - 13.22.0-FOC1 + 13.22.0-FOC2 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.22.0-FOC1 + 13.22.0-FOC2 test io.ebean ebean-platform-all - 13.22.0-FOC1 + 13.22.0-FOC2 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index a7356543b1..2980aa2a7c 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.22.0-FOC1 + 13.22.0-FOC2 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.22.0-FOC1 + 13.22.0-FOC2 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC1 + 13.22.0-FOC2 test io.ebean ebean-ddl-generator - 13.22.0-FOC1 + 13.22.0-FOC2 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 4a44d223fc..709e466b9e 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-clickhouse - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-db2 - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-hana - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-hsqldb - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-mysql - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-mariadb - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-nuodb - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-oracle - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-postgres - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-sqlanywhere - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-sqlite - 13.22.0-FOC1 + 13.22.0-FOC2 io.ebean ebean-platform-sqlserver - 13.22.0-FOC1 + 13.22.0-FOC2 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index d400ee84c6..7736ea353a 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC1 + 13.22.0-FOC2 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index fc9eca510e..86bd0a5442 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC1 + 13.22.0-FOC2 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index d7230608d7..d038b72a35 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC1 + 13.22.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC1 + 13.22.0-FOC2 @@ -202,67 +202,67 @@ io.ebean ebean-clickhouse - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-db2 - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-h2 - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-hana - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-mariadb - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-mysql - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-nuodb - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-oracle - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-postgres - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-sqlite - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-sqlserver - 13.22.0-FOC2 + 13.22.0-FOC3 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 39a1badb5c..a2bfd1c1b1 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.22.0-FOC2 + 13.22.0-FOC3 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 4154454994..3f591a46dc 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.22.0-FOC2 + 13.22.0-FOC3 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.22.0-FOC2 + 13.22.0-FOC3 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC2 + 13.22.0-FOC3 test io.ebean ebean-platform-postgres - 13.22.0-FOC2 + 13.22.0-FOC3 test io.ebean ebean-platform-sqlserver - 13.22.0-FOC2 + 13.22.0-FOC3 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 6f375150a5..fb61ad48b3 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.22.0-FOC2 + 13.22.0-FOC3 provided io.ebean ebean-core - 13.22.0-FOC2 + 13.22.0-FOC3 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.22.0-FOC2 + 13.22.0-FOC3 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 2633c2d6e6..b769024855 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.22.0-FOC2 + 13.22.0-FOC3 provided diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 545ae4b32d..41bde481ed 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ebean postgis @@ -22,14 +22,14 @@ io.ebean ebean-platform-postgres - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-core - 13.22.0-FOC2 + 13.22.0-FOC3 provided @@ -65,7 +65,7 @@ io.ebean ebean-test - 13.22.0-FOC2 + 13.22.0-FOC3 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 672de3b4d8..d1b396eccc 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.22.0-FOC2 + 13.22.0-FOC3 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.22.0-FOC2 + 13.22.0-FOC3 test io.ebean querybean-generator - 13.22.0-FOC2 + 13.22.0-FOC3 test io.ebean ebean-test - 13.22.0-FOC2 + 13.22.0-FOC3 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index ec5d745226..68772bc270 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.22.0-FOC2 + 13.22.0-FOC3 provided io.ebean ebean-core - 13.22.0-FOC2 + 13.22.0-FOC3 provided io.ebean ebean-querybean - 13.22.0-FOC2 + 13.22.0-FOC3 test io.ebean querybean-generator - 13.22.0-FOC2 + 13.22.0-FOC3 test io.ebean ebean-test - 13.22.0-FOC2 + 13.22.0-FOC3 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index b9efbda33c..0baa62550d 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.22.0-FOC2 + 13.22.0-FOC3 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.22.0-FOC2 + 13.22.0-FOC3 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 894001122c..8ad0ed20c1 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-core - 13.22.0-FOC2 + 13.22.0-FOC3 provided io.ebean ebean-ddl-generator - 13.22.0-FOC2 + 13.22.0-FOC3 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.22.0-FOC2 + 13.22.0-FOC3 test io.ebean ebean-platform-all - 13.22.0-FOC2 + 13.22.0-FOC3 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 2980aa2a7c..fbd36bd7d9 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.22.0-FOC2 + 13.22.0-FOC3 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.22.0-FOC2 + 13.22.0-FOC3 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC2 + 13.22.0-FOC3 test io.ebean ebean-ddl-generator - 13.22.0-FOC2 + 13.22.0-FOC3 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 709e466b9e..ff6d4a990c 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-clickhouse - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-db2 - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-hana - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-hsqldb - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-mysql - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-mariadb - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-nuodb - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-oracle - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-postgres - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-sqlanywhere - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-sqlite - 13.22.0-FOC2 + 13.22.0-FOC3 io.ebean ebean-platform-sqlserver - 13.22.0-FOC2 + 13.22.0-FOC3 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 7736ea353a..49122bd6ed 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC2 + 13.22.0-FOC3 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 86bd0a5442..27420d5438 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC2 + 13.22.0-FOC3 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index d038b72a35..5d3cf5982c 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC2 + 13.22.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC2 + 13.22.0-FOC3 @@ -196,61 +196,61 @@ io.ebean ebean-clickhouse - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-db2 - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-h2 - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-hana - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-mariadb - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-mysql - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-nuodb - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-oracle - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-postgres - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-postgis - 13.22.0 + 13.23.0-jakarta @@ -262,13 +262,13 @@ io.ebean ebean-sqlite - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-sqlserver - 13.22.0-FOC3 + 13.23.0-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index a4612a75a1..fce314ce81 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.22.0-FOC3 + 13.23.0-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 0e9402d33d..4ad05af19b 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.22.0-FOC3 + 13.23.0-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.22.0-FOC3 + 13.23.0-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC3 + 13.23.0-jakarta test io.ebean ebean-platform-postgres - 13.22.0-FOC3 + 13.23.0-jakarta test io.ebean ebean-platform-sqlserver - 13.22.0-FOC3 + 13.23.0-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index fb61ad48b3..c9c6253164 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.22.0-FOC3 + 13.23.0-jakarta provided io.ebean ebean-core - 13.22.0-FOC3 + 13.23.0-jakarta provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.22.0-FOC3 + 13.23.0-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index b769024855..916f34041e 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.22.0-FOC3 + 13.23.0-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 9f3a0a4d2a..eeefac37c6 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0-FOC3 + 13.23.0-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.22.0-FOC3 + 13.23.0-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index d1b396eccc..f5bd276ca6 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.22.0-FOC3 + 13.23.0-jakarta provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.22.0-FOC3 + 13.23.0-jakarta test io.ebean querybean-generator - 13.22.0-FOC3 + 13.23.0-jakarta test io.ebean ebean-test - 13.22.0-FOC3 + 13.23.0-jakarta test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 68772bc270..f69a4206f7 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.22.0-FOC3 + 13.23.0-jakarta provided io.ebean ebean-core - 13.22.0-FOC3 + 13.23.0-jakarta provided io.ebean ebean-querybean - 13.22.0-FOC3 + 13.23.0-jakarta test io.ebean querybean-generator - 13.22.0-FOC3 + 13.23.0-jakarta test io.ebean ebean-test - 13.22.0-FOC3 + 13.23.0-jakarta test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 0baa62550d..820a3a75c4 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.22.0-FOC3 + 13.23.0-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.22.0-FOC3 + 13.23.0-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 982356922b..420e460d70 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-core - 13.22.0-FOC3 + 13.23.0-jakarta provided io.ebean ebean-ddl-generator - 13.22.0-FOC3 + 13.23.0-jakarta @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.22.0-FOC3 + 13.23.0-jakarta test io.ebean ebean-platform-all - 13.22.0-FOC3 + 13.23.0-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index fbd36bd7d9..c626c8f4d8 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.22.0-FOC3 + 13.23.0-jakarta test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.22.0-FOC3 + 13.23.0-jakarta test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC3 + 13.23.0-jakarta test io.ebean ebean-ddl-generator - 13.22.0-FOC3 + 13.23.0-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index ff6d4a990c..a5f5bfa09c 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-clickhouse - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-db2 - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-hana - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-hsqldb - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-mysql - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-mariadb - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-nuodb - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-oracle - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-postgres - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-sqlanywhere - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-sqlite - 13.22.0-FOC3 + 13.23.0-jakarta io.ebean ebean-platform-sqlserver - 13.22.0-FOC3 + 13.23.0-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 49122bd6ed..6cde78d817 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC3 + 13.23.0-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 27420d5438..853a536efd 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC3 + 13.23.0-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 5d3cf5982c..b83a835c38 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.22.0-FOC3 + 13.23.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.22.0-FOC3 + 13.23.0-jakarta @@ -196,79 +196,79 @@ io.ebean ebean-clickhouse - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-db2 - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-h2 - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-hana - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-mariadb - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-mysql - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-nuodb - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-oracle - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-postgres - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-postgis - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-postgis-types - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-sqlite - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-sqlserver - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index fce314ce81..2b56984b91 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 4ad05af19b..216c73a6d1 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index c9c6253164..b3ec5ade27 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided io.ebean ebean-core - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 916f34041e..f57d981153 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index eeefac37c6..30ff31ea2a 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index f5bd276ca6..2ea580c08d 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test io.ebean querybean-generator - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test io.ebean ebean-test - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index f69a4206f7..d9b96771a7 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided io.ebean ebean-core - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test io.ebean querybean-generator - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test io.ebean ebean-test - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 820a3a75c4..baa374d1f1 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 420e460d70..5986007e24 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test io.ebean ebean-platform-all - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index c626c8f4d8..fd7729561b 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test io.ebean ebean-ddl-generator - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index a5f5bfa09c..b9c12117e0 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-db2 - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-hana - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-mysql - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-oracle - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 6cde78d817..2a0fc62c5e 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 853a536efd..5ed5a6d251 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index b83a835c38..9d3a3ab877 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-jakarta + 13.23.0-FOC1-SNAPSHOT @@ -196,79 +196,79 @@ io.ebean ebean-clickhouse - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-db2 - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-h2 - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-hana - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-mariadb - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-mysql - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-nuodb - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-oracle - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-postgres - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-postgis - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-postgis-types - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-sqlite - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-sqlserver - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 2b56984b91..999c7445aa 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 216c73a6d1..0c1ff13cd0 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.23.0-FOC1 io.ebean ebean-api - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test io.ebean ebean-platform-postgres - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test io.ebean ebean-platform-sqlserver - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index b3ec5ade27..cb0707a56b 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided io.ebean ebean-core - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index f57d981153..9b17849f33 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 30ff31ea2a..2697f6def2 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-core - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 2ea580c08d..f2e7afe7d1 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test io.ebean querybean-generator - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test io.ebean ebean-test - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index d9b96771a7..55c2a50800 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided io.ebean ebean-core - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided io.ebean ebean-querybean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test io.ebean querybean-generator - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test io.ebean ebean-test - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index baa374d1f1..103026dba9 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 5986007e24..4720f885b1 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-core - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 provided io.ebean ebean-ddl-generator - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test io.ebean ebean-platform-all - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index fd7729561b..0937af6186 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test io.ebean ebean-ddl-generator - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index b9c12117e0..239ea1fbba 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-clickhouse - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-db2 - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-hana - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-hsqldb - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-mysql - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-mariadb - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-nuodb - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-oracle - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-postgres - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-sqlanywhere - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-sqlite - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 io.ebean ebean-platform-sqlserver - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 2a0fc62c5e..b4d1e761ad 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 5ed5a6d251..0d60b62ff8 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 9d3a3ab877..f700549a0c 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC1-SNAPSHOT + 13.23.0-FOC1 @@ -196,79 +196,79 @@ io.ebean ebean-clickhouse - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-db2 - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-h2 - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-hana - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-mariadb - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-mysql - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-nuodb - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-oracle - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-postgres - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-postgis - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-postgis-types - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-sqlite - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-sqlserver - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 999c7445aa..e9623d5c5e 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 0c1ff13cd0..7abd5fe67a 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.23.0-FOC1 + HEAD io.ebean ebean-api - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test io.ebean ebean-platform-postgres - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index cb0707a56b..4ad0071b73 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided io.ebean ebean-core - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 9b17849f33..81d3ddd503 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 2697f6def2..0b5455d116 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-core - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index f2e7afe7d1..63154a523a 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test io.ebean querybean-generator - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test io.ebean ebean-test - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 55c2a50800..861846a774 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided io.ebean ebean-core - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided io.ebean ebean-querybean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test io.ebean querybean-generator - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test io.ebean ebean-test - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 103026dba9..9f48068845 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 4720f885b1..5e247c5d47 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-core - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test io.ebean ebean-platform-all - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 0937af6186..ac2e9fd28d 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test io.ebean ebean-ddl-generator - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 239ea1fbba..9dbfa4dedf 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-db2 - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-hana - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-mysql - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-mariadb - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-nuodb - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-oracle - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-postgres - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlite - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index b4d1e761ad..85f4035c86 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 0d60b62ff8..4ca35edd1c 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index f700549a0c..7e89f8f78e 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC1 + 13.23.0-FOC2-SNAPSHOT @@ -196,79 +196,79 @@ io.ebean ebean-clickhouse - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-db2 - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-h2 - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-hana - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-mariadb - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-mysql - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-nuodb - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-oracle - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-postgres - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-postgis - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-postgis-types - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-sqlite - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-sqlserver - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index e9623d5c5e..d830d1c23b 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 7abd5fe67a..8d02ba1fbf 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test io.ebean ebean-platform-postgres - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test io.ebean ebean-platform-sqlserver - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 4ad0071b73..e379e843a7 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided io.ebean ebean-core - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided @@ -72,7 +72,7 @@ io.ebean ebean-platform-all - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 81d3ddd503..ab7dea8604 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 0b5455d116..2d7470cfe8 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-core - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 63154a523a..31e3677c5a 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided @@ -63,21 +63,21 @@ io.ebean ebean-ddl-generator - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test io.ebean querybean-generator - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test io.ebean ebean-test - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 861846a774..681a284796 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided io.ebean ebean-core - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided io.ebean ebean-querybean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test io.ebean querybean-generator - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test io.ebean ebean-test - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 9f48068845..48bee12dbc 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 5e247c5d47..24cc86cd00 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ebean test @@ -28,20 +28,20 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-core - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta provided io.ebean ebean-ddl-generator - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta @@ -132,14 +132,14 @@ io.ebean ebean-jackson-mapper - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test io.ebean ebean-platform-all - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index ac2e9fd28d..9550e27c48 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test @@ -43,7 +43,7 @@ io.ebean ebean-core - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test @@ -64,14 +64,14 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test io.ebean ebean-ddl-generator - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 9dbfa4dedf..c114a9112a 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-clickhouse - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-db2 - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-hana - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-hsqldb - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-mysql - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-mariadb - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-nuodb - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-oracle - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-postgres - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-sqlanywhere - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-sqlite - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta io.ebean ebean-platform-sqlserver - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 85f4035c86..561d3a4b52 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 4ca35edd1c..457b8ee258 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 7e89f8f78e..01f7ef8887 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.23.0-FOC2-SNAPSHOT + 13.25.0-jakarta + 13.20.1-FOC1 13.25.0 false From 788ecafd1433530bcb6c1d9d290f796ec9d7d555 Mon Sep 17 00:00:00 2001 From: Noemi Praml Date: Mon, 20 Nov 2023 16:17:09 +0100 Subject: [PATCH 069/123] doppelte version --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index b91a3b45f9..84b28e3d03 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,6 @@ 13.11.1 7.1 8.9 - 13.20.1-FOC1 13.25.0 false From 6a96b64389263ed74a4dbc6bc9080de3f46fe003 Mon Sep 17 00:00:00 2001 From: Noemi Praml Date: Mon, 20 Nov 2023 16:21:38 +0100 Subject: [PATCH 070/123] bump version to 13.25.0-FOC1-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-postgis/pom.xml | 12 +++---- 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 | 12 +++---- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-bom/pom.xml | 52 ++++++++++++++--------------- ebean-core-type/pom.xml | 4 +-- ebean-core/pom.xml | 12 +++---- ebean-ddl-generator/pom.xml | 8 ++--- ebean-jackson-mapper/pom.xml | 4 +-- ebean-postgis-types/pom.xml | 8 ++--- ebean-querybean/pom.xml | 10 +++--- ebean-redis/pom.xml | 12 +++---- ebean-spring-txn/pom.xml | 6 ++-- ebean-test/pom.xml | 12 +++---- kotlin-querybean-generator/pom.xml | 10 +++--- 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/pom.xml | 2 +- tests/test-java16/pom.xml | 8 ++--- tests/test-kotlin/pom.xml | 6 ++-- 48 files changed, 200 insertions(+), 200 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index 94595b91e6..4df6d31ba1 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index e92e5e7484..9538b418c2 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index 61745fa3cd..c13f662a13 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-db2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 9dd44bce68..b2f6741236 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index 6dbe8eb921..5a92aa379f 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-hana - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index d1990a0453..ed3d425bc7 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index ce5c67eb68..78eb7c7f41 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-mysql - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index eab241f55e..625f3894f5 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index 8a46df5346..8ceb2346a1 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-oracle - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-postgis/pom.xml b/composites/ebean-postgis/pom.xml index bd48a49c40..260bf25ec0 100644 --- a/composites/ebean-postgis/pom.xml +++ b/composites/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -22,13 +22,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -47,19 +47,19 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-postgis-types - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index f24c9c9b05..d2ea0a1689 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index 33625c0852..c00c8c4af7 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 35bf6d25c4..eba6a7d9ba 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index c284138dd7..bbace0ebd1 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -42,13 +42,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 41e99c03de..195321a4fd 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -17,13 +17,13 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -41,7 +41,7 @@ io.ebean ebean-jackson-mapper - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -60,13 +60,13 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-all - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/composites/pom.xml b/composites/pom.xml index 7df080bbc3..feefe7af69 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 75e29cfaa2..a3f16c471f 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean api diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 76be7fa030..e53a3a4dfe 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean bom @@ -89,25 +89,25 @@ io.ebean ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core-type - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -125,13 +125,13 @@ io.ebean ebean-jackson-mapper - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-ddl-generator - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -155,37 +155,37 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean querybean-generator - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean kotlin-querybean-generator - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-test - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-redis - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-spring-txn - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-db2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-h2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-hana - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-mariadb - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-mysql - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-nuodb - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-oracle - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-postgres - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-postgis - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-postgis-types - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-sqlite - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-sqlserver - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 15c4ace589..3ab62a9a36 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 0d29ffc4a2..8e3e052753 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index dbaabcc4fb..f3c876100e 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index a1a68c50ad..2e669f8728 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 17546dcb53..5c56cc69f3 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index b6872d8464..0e87e976c0 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test io.ebean ebean-test - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 7b54f41171..f6548d6e2e 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test io.ebean ebean-test - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 03694ce61b..e6670968dd 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 73d4dcdb42..9ccbeecb5f 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test io.ebean ebean-platform-all - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 91192b956f..574c4f5b58 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test io.ebean ebean-ddl-generator - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index c114a9112a..3e1e354d10 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-db2 - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-hana - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-mysql - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-oracle - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 561d3a4b52..bc06149d90 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 457b8ee258..d093829ae2 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 4db043b17f..e8af9e852f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-jakarta + 13.25.0-FOC1-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-db2 - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-h2 - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-hana - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-mariadb - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-mysql - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-nuodb - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-oracle - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-postgres - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-postgis - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-postgis-types - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-sqlite - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-sqlserver - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 3ab62a9a36..6effe86f1c 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 8e3e052753..04ecd343bf 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.25.0-FOC1 io.ebean ebean-api - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test io.ebean ebean-platform-postgres - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test io.ebean ebean-platform-sqlserver - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index f3c876100e..396c657d78 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided io.ebean ebean-core - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 2e669f8728..89d5dc3d91 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 5c56cc69f3..04769b068b 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-core - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 0e87e976c0..667fa37703 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test io.ebean ebean-test - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index f6548d6e2e..0ffa425d77 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided io.ebean ebean-core - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided io.ebean ebean-querybean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test io.ebean ebean-test - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index e6670968dd..a013357483 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 9ccbeecb5f..6954c65ca4 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-core - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 provided io.ebean ebean-ddl-generator - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test io.ebean ebean-platform-all - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 574c4f5b58..768622365e 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test io.ebean ebean-ddl-generator - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 3e1e354d10..2ebf9b70be 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-clickhouse - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-db2 - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-hana - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-hsqldb - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-mysql - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-mariadb - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-nuodb - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-oracle - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-postgres - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-sqlite - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 io.ebean ebean-platform-sqlserver - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index bc06149d90..6b850a3b8a 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index d093829ae2..be504dae99 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index e8af9e852f..c9a778fe4a 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC1-SNAPSHOT + 13.25.0-FOC1 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-db2 - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-h2 - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-hana - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-mariadb - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-mysql - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-nuodb - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-oracle - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-postgres - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-postgis - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-postgis-types - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-sqlite - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-sqlserver - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 6effe86f1c..c5ec1968f4 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 04ecd343bf..c78a0f8414 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.25.0-FOC1 + HEAD io.ebean ebean-api - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test io.ebean ebean-platform-postgres - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 396c657d78..55f6c994e6 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 89d5dc3d91..de75d76738 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 04769b068b..286416590f 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 667fa37703..f8f205bae5 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 0ffa425d77..2526e4f1fe 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided io.ebean ebean-querybean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index a013357483..385436e7c2 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 6954c65ca4..b63384ed15 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test io.ebean ebean-platform-all - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 768622365e..499ec04d41 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test io.ebean ebean-ddl-generator - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 2ebf9b70be..8b595c3321 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-db2 - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-hana - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-mysql - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-mariadb - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-nuodb - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-oracle - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlite - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 6b850a3b8a..7eaba6d9ce 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index be504dae99..e5a13b7b01 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index c9a778fe4a..e9048ff66c 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC1 + 13.25.0-FOC2-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-db2 - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-h2 - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-hana - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-mariadb - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-mysql - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-nuodb - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-oracle - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-postgres - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-postgis - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-postgis-types - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-sqlite - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-sqlserver - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index c5ec1968f4..7a70627b7e 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index c78a0f8414..3c6713a5a8 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.25.0-FOC2 io.ebean ebean-api - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test io.ebean ebean-platform-postgres - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test io.ebean ebean-platform-sqlserver - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 55f6c994e6..cbf083c324 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided io.ebean ebean-core - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index de75d76738..71d1f30c5c 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 286416590f..6dfd13a031 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-core - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index f8f205bae5..94860d106a 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test io.ebean ebean-test - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 2526e4f1fe..d109510de0 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided io.ebean ebean-core - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided io.ebean ebean-querybean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test io.ebean ebean-test - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 385436e7c2..c9811e97cb 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index b63384ed15..8a840eadb6 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-core - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 provided io.ebean ebean-ddl-generator - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test io.ebean ebean-platform-all - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 499ec04d41..a84203d322 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test io.ebean ebean-ddl-generator - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 8b595c3321..46cee06482 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-clickhouse - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-db2 - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-hana - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-hsqldb - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-mysql - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-mariadb - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-nuodb - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-oracle - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-postgres - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-sqlite - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 io.ebean ebean-platform-sqlserver - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 7eaba6d9ce..599dfdd1d2 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index e5a13b7b01..b8adc02581 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index e9048ff66c..1afaa17ff8 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC2-SNAPSHOT + 13.25.0-FOC2 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-db2 - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-h2 - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-hana - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-mariadb - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-mysql - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-nuodb - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-oracle - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-postgres - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-postgis - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-postgis-types - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-sqlite - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-sqlserver - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 7a70627b7e..c466883f13 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 3c6713a5a8..67bb14c4da 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.25.0-FOC2 + HEAD io.ebean ebean-api - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test io.ebean ebean-platform-postgres - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index cbf083c324..115320d40f 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 71d1f30c5c..1f8ef4eeb9 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 6dfd13a031..05501be57a 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 94860d106a..46a6721e17 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index d109510de0..4d8ec68301 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided io.ebean ebean-querybean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index c9811e97cb..fbcb0f08fc 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 8a840eadb6..8e151cbe26 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test io.ebean ebean-platform-all - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index a84203d322..919e473977 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test io.ebean ebean-ddl-generator - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 46cee06482..e0e87b14d4 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-db2 - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-hana - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-mysql - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-mariadb - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-nuodb - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-oracle - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-sqlite - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 599dfdd1d2..1fa6523707 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index b8adc02581..43036a24e9 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 1afaa17ff8..6e4bac0e9f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC2 + 13.25.0-FOC3-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-db2 - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-h2 - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-hana - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-mariadb - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-mysql - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-nuodb - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-oracle - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-postgres - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-postgis - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-postgis-types - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-sqlite - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-sqlserver - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index c466883f13..27e33d9de8 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 67bb14c4da..b606c59dcd 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.25.0-FOC3 io.ebean ebean-api - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test io.ebean ebean-platform-postgres - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test io.ebean ebean-platform-sqlserver - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 115320d40f..66aa122f68 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided io.ebean ebean-core - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 1f8ef4eeb9..69f30be30b 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 05501be57a..a467cae30c 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-core - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 46a6721e17..4cfeab3b4d 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test io.ebean ebean-test - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 4d8ec68301..aa59c4ef25 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided io.ebean ebean-core - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided io.ebean ebean-querybean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test io.ebean ebean-test - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index fbcb0f08fc..a3fbe74606 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 8e151cbe26..739452bc31 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-core - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 provided io.ebean ebean-ddl-generator - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test io.ebean ebean-platform-all - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 919e473977..246eedf72c 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test io.ebean ebean-ddl-generator - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index e0e87b14d4..f8f4b0f55f 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-clickhouse - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-db2 - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-hana - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-hsqldb - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-mysql - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-mariadb - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-nuodb - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-oracle - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-postgres - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-sqlite - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 io.ebean ebean-platform-sqlserver - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 1fa6523707..3c0c3f9d93 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 43036a24e9..d7d65ac3fd 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 6e4bac0e9f..2bee97b7e0 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC3-SNAPSHOT + 13.25.0-FOC3 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-db2 - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-h2 - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-hana - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-mariadb - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-mysql - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-nuodb - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-oracle - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-postgres - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-postgis - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-postgis-types - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-sqlite - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-sqlserver - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 27e33d9de8..7d3089e7a2 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index b606c59dcd..f2a01506cf 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.25.0-FOC3 + HEAD io.ebean ebean-api - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test io.ebean ebean-platform-postgres - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 66aa122f68..66707c9d95 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 69f30be30b..273cb0657d 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index a467cae30c..9ff8346e6a 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 4cfeab3b4d..657ed01a09 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index aa59c4ef25..7d6ffc6db9 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided io.ebean ebean-querybean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index a3fbe74606..b7ece03c8a 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 739452bc31..41939d5831 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test io.ebean ebean-platform-all - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 246eedf72c..8a27197514 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test io.ebean ebean-ddl-generator - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index f8f4b0f55f..11581878ca 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-db2 - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-hana - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-mysql - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-mariadb - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-nuodb - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-oracle - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-sqlite - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 3c0c3f9d93..9463aae9c2 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index d7d65ac3fd..2fd6bad495 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 2bee97b7e0..f0e00fd0c5 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC3 + 13.25.0-FOC4-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-db2 - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-h2 - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-hana - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-mariadb - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-mysql - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-nuodb - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-oracle - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-postgres - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-postgis - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-postgis-types - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-sqlite - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-sqlserver - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 7d3089e7a2..59b6169123 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index f2a01506cf..61f2df0bfc 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.25.0-FOC4 io.ebean ebean-api - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test io.ebean ebean-platform-postgres - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test io.ebean ebean-platform-sqlserver - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 66707c9d95..e62920c648 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided io.ebean ebean-core - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 273cb0657d..c198f4050d 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 9ff8346e6a..be96743b8d 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-core - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 657ed01a09..a58eea0c73 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test io.ebean ebean-test - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 7d6ffc6db9..1898e553a3 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided io.ebean ebean-core - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided io.ebean ebean-querybean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test io.ebean ebean-test - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index b7ece03c8a..88a5422509 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 41939d5831..5b33f7d7f6 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-core - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 provided io.ebean ebean-ddl-generator - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test io.ebean ebean-platform-all - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 8a27197514..0365ff2026 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test io.ebean ebean-ddl-generator - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 11581878ca..9beb50dc92 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-clickhouse - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-db2 - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-hana - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-hsqldb - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-mysql - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-mariadb - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-nuodb - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-oracle - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-postgres - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-sqlite - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 io.ebean ebean-platform-sqlserver - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 9463aae9c2..afff0ce59d 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 2fd6bad495..a36b15b4aa 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index f0e00fd0c5..8e445f37ec 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC4-SNAPSHOT + 13.25.0-FOC4 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-db2 - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-h2 - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-hana - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-mariadb - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-mysql - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-nuodb - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-oracle - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-postgres - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-postgis - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-postgis-types - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-sqlite - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-sqlserver - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 59b6169123..976c84789e 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 61f2df0bfc..70b85598dc 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.25.0-FOC4 + HEAD io.ebean ebean-api - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test io.ebean ebean-platform-postgres - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index e62920c648..53c088a1cb 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index c198f4050d..39b4e8cf4a 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index be96743b8d..dcc1e738f6 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index a58eea0c73..5de0de3dad 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 1898e553a3..eb84d5747c 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided io.ebean ebean-querybean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 88a5422509..d96ab742b0 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 5b33f7d7f6..2c99c8ea48 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test io.ebean ebean-platform-all - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 0365ff2026..550c92673d 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test io.ebean ebean-ddl-generator - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 9beb50dc92..b9f9d42d35 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-db2 - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-hana - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-mysql - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-mariadb - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-nuodb - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-oracle - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-sqlite - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index afff0ce59d..e9b74d26db 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index a36b15b4aa..a11a90af5c 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 8e445f37ec..2d79040c95 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC4 + 13.25.0-FOC5-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-db2 - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-h2 - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-hana - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-mariadb - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-mysql - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-nuodb - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-oracle - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-postgres - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-postgis - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-postgis-types - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-sqlite - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-sqlserver - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 976c84789e..1be1031b84 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 70b85598dc..79754d6cf6 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.25.0-FOC5 io.ebean ebean-api - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test io.ebean ebean-platform-postgres - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test io.ebean ebean-platform-sqlserver - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 53c088a1cb..1d3aef986e 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided io.ebean ebean-core - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 39b4e8cf4a..ef86e58a5b 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index dcc1e738f6..c0d09f8582 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-core - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 5de0de3dad..e7e009dcc3 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test io.ebean ebean-test - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index eb84d5747c..f6384830a9 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided io.ebean ebean-core - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided io.ebean ebean-querybean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test io.ebean ebean-test - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index d96ab742b0..b4bde6d198 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 2c99c8ea48..89fe4ed089 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-core - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 provided io.ebean ebean-ddl-generator - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test io.ebean ebean-platform-all - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 550c92673d..080fd1a6fd 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test io.ebean ebean-ddl-generator - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index b9f9d42d35..72610e3d69 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-clickhouse - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-db2 - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-hana - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-hsqldb - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-mysql - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-mariadb - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-nuodb - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-oracle - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-postgres - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-sqlite - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 io.ebean ebean-platform-sqlserver - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index e9b74d26db..30cee297af 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index a11a90af5c..8d74338bf5 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 2d79040c95..e2c850f2b9 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC5-SNAPSHOT + 13.25.0-FOC5 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-db2 - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-h2 - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-hana - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-mariadb - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-mysql - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-nuodb - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-oracle - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-postgres - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-postgis - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-postgis-types - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-sqlite - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-sqlserver - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 1be1031b84..b34bdcc17f 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 79754d6cf6..cb7b26a907 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.25.0-FOC5 + HEAD io.ebean ebean-api - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test io.ebean ebean-platform-postgres - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 1d3aef986e..b57eb2263e 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index ef86e58a5b..925034e0bd 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index c0d09f8582..52874ae3e5 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index e7e009dcc3..7a9dff6905 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index f6384830a9..1f9d9547be 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided io.ebean ebean-core - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided io.ebean ebean-querybean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test io.ebean ebean-test - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index b4bde6d198..efc481e7a0 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 89fe4ed089..cb43d99cb9 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-core - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test io.ebean ebean-platform-all - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 080fd1a6fd..af66a9b662 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test io.ebean ebean-ddl-generator - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 72610e3d69..4bc54e1ec6 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-db2 - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-hana - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-mysql - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-mariadb - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-nuodb - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-oracle - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-postgres - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-sqlite - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 30cee297af..bf0e8d35ae 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 8d74338bf5..7b59bf29af 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index e2c850f2b9..e838f6aac7 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC5 + 13.25.0-FOC6-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-db2 - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-h2 - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-hana - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-mariadb - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-mysql - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-nuodb - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-oracle - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-postgres - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-postgis - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-postgis-types - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-sqlite - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-sqlserver - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index b34bdcc17f..310407dc66 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index cb7b26a907..570f2b858a 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test io.ebean ebean-platform-postgres - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test io.ebean ebean-platform-sqlserver - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index b57eb2263e..e5605da7ec 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided io.ebean ebean-core - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 925034e0bd..9da641e602 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 52874ae3e5..b1bcbb10b8 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-core - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 7a9dff6905..84ca3462f4 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test io.ebean ebean-test - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 1f9d9547be..fab10c2ba9 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided io.ebean ebean-core - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided io.ebean ebean-querybean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test io.ebean ebean-test - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index efc481e7a0..25a1b13aa3 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index cb43d99cb9..9c4ca2b273 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-core - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta provided io.ebean ebean-ddl-generator - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test io.ebean ebean-platform-all - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index af66a9b662..99e3d369a4 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test io.ebean ebean-ddl-generator - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 4bc54e1ec6..0207c04f40 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-clickhouse - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-db2 - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-hana - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-hsqldb - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-mysql - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-mariadb - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-nuodb - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-oracle - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-postgres - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-sqlanywhere - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-sqlite - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta io.ebean ebean-platform-sqlserver - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index bf0e8d35ae..a4be18943e 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 7b59bf29af..0c1264df71 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index e838f6aac7..943a8984e2 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.25.0-FOC6-SNAPSHOT + 13.26.0-jakarta @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-db2 - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-h2 - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-hana - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-mariadb - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-mysql - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-nuodb - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-oracle - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-postgres - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-postgis - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-postgis-types - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-sqlite - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-sqlserver - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 310407dc66..41cc0e9405 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 570f2b858a..ed77d5560f 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ebean-core @@ -22,7 +22,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index e5605da7ec..f67bd01fcc 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided io.ebean ebean-core - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 9da641e602..d7f9d3f896 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index b1bcbb10b8..420a9771a4 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 84ca3462f4..e1331479dc 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test io.ebean ebean-test - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index fab10c2ba9..5aead5dfbe 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided io.ebean ebean-core - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided io.ebean ebean-querybean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test io.ebean ebean-test - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 25a1b13aa3..449c69e984 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 9c4ca2b273..d7bae54631 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-core - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test io.ebean ebean-platform-all - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 99e3d369a4..501ce73968 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test io.ebean ebean-ddl-generator - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 0207c04f40..869e842296 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-db2 - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-hana - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-mysql - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-mariadb - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-nuodb - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-oracle - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-postgres - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlite - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index a4be18943e..8eef419835 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 0c1264df71..0fe006a924 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 943a8984e2..24ea3dd5b4 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-jakarta + 13.26.0-FOC1-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-db2 - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-h2 - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-hana - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-mariadb - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-mysql - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-nuodb - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-oracle - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-postgres - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-postgis - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-postgis-types - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-sqlite - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-sqlserver - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 41cc0e9405..fced208ea1 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index ed77d5560f..e0f9371e60 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.26.0-FOC1 io.ebean ebean-api - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test io.ebean ebean-platform-postgres - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test io.ebean ebean-platform-sqlserver - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index f67bd01fcc..d3bf76d59f 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided io.ebean ebean-core - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index d7f9d3f896..69cc603599 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 420a9771a4..011e5fcda5 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-core - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index e1331479dc..2e54791d90 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test io.ebean ebean-test - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 5aead5dfbe..8c747d190c 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided io.ebean ebean-core - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided io.ebean ebean-querybean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test io.ebean ebean-test - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 449c69e984..e268bbd1e9 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index d7bae54631..dbf258b952 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-core - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 provided io.ebean ebean-ddl-generator - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test io.ebean ebean-platform-all - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 501ce73968..15819bb880 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test io.ebean ebean-ddl-generator - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 869e842296..75fe6cd2a1 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-clickhouse - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-db2 - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-hana - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-hsqldb - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-mysql - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-mariadb - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-nuodb - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-oracle - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-postgres - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-sqlite - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 io.ebean ebean-platform-sqlserver - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 8eef419835..7c16d0f4d6 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 0fe006a924..b2ed90abdf 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 24ea3dd5b4..553a04be86 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC1-SNAPSHOT + 13.26.0-FOC1 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-db2 - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-h2 - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-hana - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-mariadb - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-mysql - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-nuodb - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-oracle - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-postgres - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-postgis - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-postgis-types - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-sqlite - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-sqlserver - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index fced208ea1..e994c7d933 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e0f9371e60..796155c908 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.26.0-FOC1 + HEAD io.ebean ebean-api - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test io.ebean ebean-platform-postgres - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index d3bf76d59f..1be47fdd7a 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 69cc603599..b6b0fd5e37 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 011e5fcda5..d4b766f873 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 2e54791d90..193153aaad 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 8c747d190c..e7934ae3f9 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided io.ebean ebean-querybean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index e268bbd1e9..0fcccdfaae 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index dbf258b952..1ac7953004 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test io.ebean ebean-platform-all - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 15819bb880..6022080750 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test io.ebean ebean-ddl-generator - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 75fe6cd2a1..6fb8924d3b 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-db2 - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-hana - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-mysql - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-mariadb - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-nuodb - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-oracle - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-postgres - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlite - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 7c16d0f4d6..094fb48d37 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index b2ed90abdf..7f72b3715a 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 553a04be86..c92613fcdd 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC1 + 13.26.0-FOC2-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-db2 - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-h2 - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-hana - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-mariadb - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-mysql - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-nuodb - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-oracle - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-postgres - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-postgis - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-postgis-types - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-sqlite - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-sqlserver - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index e994c7d933..5ff30585ef 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 796155c908..e15d75c772 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.26.0-FOC2 io.ebean ebean-api - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test io.ebean ebean-platform-postgres - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test io.ebean ebean-platform-sqlserver - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 1be47fdd7a..2cf015dfaf 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided io.ebean ebean-core - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index b6b0fd5e37..1446f39754 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index d4b766f873..9a64ae46f3 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-core - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 193153aaad..f222f4b90b 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test io.ebean ebean-test - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index e7934ae3f9..664fa2ffd2 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided io.ebean ebean-core - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided io.ebean ebean-querybean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test io.ebean ebean-test - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 0fcccdfaae..dcd272b689 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 1ac7953004..6f475b3a39 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-core - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 provided io.ebean ebean-ddl-generator - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test io.ebean ebean-platform-all - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 6022080750..465048323c 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test io.ebean ebean-ddl-generator - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 6fb8924d3b..4b657bf5c6 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-clickhouse - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-db2 - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-hana - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-hsqldb - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-mysql - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-mariadb - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-nuodb - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-oracle - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-postgres - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-sqlite - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 io.ebean ebean-platform-sqlserver - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 094fb48d37..2e53523b07 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 7f72b3715a..bfe280cb4c 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index c92613fcdd..cf5a21838e 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC2-SNAPSHOT + 13.26.0-FOC2 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-db2 - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-h2 - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-hana - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-mariadb - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-mysql - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-nuodb - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-oracle - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-postgres - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-postgis - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-postgis-types - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-sqlite - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-sqlserver - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 5ff30585ef..2841ec092e 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e15d75c772..820fb9ba49 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.26.0-FOC2 + HEAD io.ebean ebean-api - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test io.ebean ebean-platform-postgres - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 2cf015dfaf..160ade439c 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 1446f39754..40aaa5838f 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 9a64ae46f3..eb3690157d 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index f222f4b90b..fa120dd29f 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 664fa2ffd2..cbb5989f7d 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided io.ebean ebean-querybean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index dcd272b689..6eab867d20 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 6f475b3a39..30cb1b0495 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test io.ebean ebean-platform-all - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 465048323c..a7ed6b3c4b 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test io.ebean ebean-ddl-generator - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 4b657bf5c6..17a936dea9 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-db2 - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-hana - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-mysql - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-mariadb - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-nuodb - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-oracle - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-postgres - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-sqlite - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 2e53523b07..43e93f4f2c 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index bfe280cb4c..4252a01d57 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index cf5a21838e..be9cabf6d6 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC2 + 13.26.0-FOC3-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-db2 - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-h2 - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-hana - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-mariadb - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-mysql - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-nuodb - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-oracle - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-postgres - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-postgis - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-postgis-types - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-sqlite - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-sqlserver - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 2841ec092e..f3e0622a99 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 820fb9ba49..95dc2a4350 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.26.0-FOC3 io.ebean ebean-api - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test io.ebean ebean-platform-postgres - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test io.ebean ebean-platform-sqlserver - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 160ade439c..043fec8928 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided io.ebean ebean-core - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 40aaa5838f..b3d698f536 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index eb3690157d..9180398b26 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-core - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index fa120dd29f..896b6271de 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test io.ebean ebean-test - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index cbb5989f7d..605854d092 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided io.ebean ebean-core - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided io.ebean ebean-querybean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test io.ebean ebean-test - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 6eab867d20..767e9601ef 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 30cb1b0495..6f177857cc 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-core - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 provided io.ebean ebean-ddl-generator - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test io.ebean ebean-platform-all - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index a7ed6b3c4b..9fa778bc40 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test io.ebean ebean-ddl-generator - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 17a936dea9..383f20407f 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-clickhouse - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-db2 - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-hana - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-hsqldb - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-mysql - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-mariadb - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-nuodb - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-oracle - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-postgres - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-sqlite - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 io.ebean ebean-platform-sqlserver - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 43e93f4f2c..2eca8c9ab3 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 4252a01d57..b6718d957a 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index be9cabf6d6..6b70ba0958 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC3-SNAPSHOT + 13.26.0-FOC3 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-db2 - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-h2 - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-hana - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-mariadb - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-mysql - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-nuodb - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-oracle - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-postgres - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-postgis - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-postgis-types - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-sqlite - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-sqlserver - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index f3e0622a99..d32dcb6c19 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 95dc2a4350..e46e68bc9e 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.26.0-FOC3 + HEAD io.ebean ebean-api - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test io.ebean ebean-platform-postgres - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 043fec8928..c2d939abb2 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index b3d698f536..d58732ca92 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 9180398b26..14cab437a2 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 896b6271de..5c26b02bf4 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 605854d092..bacd822874 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided io.ebean ebean-querybean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 767e9601ef..fb2afa3e43 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 6f177857cc..f66446dc16 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test io.ebean ebean-platform-all - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 9fa778bc40..250f5043d0 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test io.ebean ebean-ddl-generator - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 383f20407f..7953eea7bf 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-db2 - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-hana - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-mysql - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-mariadb - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-nuodb - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-oracle - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-postgres - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-sqlite - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 2eca8c9ab3..dc7bd9fa38 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index b6718d957a..b6ff379ab2 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 6b70ba0958..458d382690 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC3 + 13.26.0-FOC4-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-db2 - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-h2 - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-hana - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-mariadb - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-mysql - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-nuodb - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-oracle - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-postgres - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-postgis - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-postgis-types - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-sqlite - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-sqlserver - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index d32dcb6c19..9b4e013dc7 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e46e68bc9e..76f5f77ec1 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.26.0-FOC4 io.ebean ebean-api - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test io.ebean ebean-platform-postgres - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test io.ebean ebean-platform-sqlserver - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index c2d939abb2..17c6adde88 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided io.ebean ebean-core - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index d58732ca92..8d35270f3c 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 14cab437a2..44ce1cca83 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-core - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 5c26b02bf4..235abfae07 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test io.ebean ebean-test - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index bacd822874..2a49663b91 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided io.ebean ebean-core - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided io.ebean ebean-querybean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test io.ebean ebean-test - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index fb2afa3e43..6e98082f9d 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index f66446dc16..679d179922 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-core - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 provided io.ebean ebean-ddl-generator - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test io.ebean ebean-platform-all - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 250f5043d0..dba7fe08f0 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test io.ebean ebean-ddl-generator - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 7953eea7bf..375c956d6f 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-clickhouse - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-db2 - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-hana - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-hsqldb - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-mysql - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-mariadb - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-nuodb - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-oracle - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-postgres - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-sqlite - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 io.ebean ebean-platform-sqlserver - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index dc7bd9fa38..6672f0f2d8 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index b6ff379ab2..534924752f 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 458d382690..9dc4ea4f40 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC4-SNAPSHOT + 13.26.0-FOC4 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-db2 - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-h2 - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-hana - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-mariadb - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-mysql - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-nuodb - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-oracle - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-postgres - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-postgis - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-postgis-types - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-sqlite - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-sqlserver - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 9b4e013dc7..c750e5e346 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 76f5f77ec1..0e632bd0d3 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.26.0-FOC4 + HEAD io.ebean ebean-api - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test io.ebean ebean-platform-postgres - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 17c6adde88..cf86a15f78 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 8d35270f3c..0cbbfa6a4e 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 44ce1cca83..f6c56a9e0c 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 235abfae07..5fcac123f2 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 2a49663b91..4f8cb3ae45 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided io.ebean ebean-querybean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 6e98082f9d..b4b5c185ce 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 679d179922..6e549e3984 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test io.ebean ebean-platform-all - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index dba7fe08f0..30a30888fa 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test io.ebean ebean-ddl-generator - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 375c956d6f..e582f39b4e 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-db2 - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-hana - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-mysql - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-mariadb - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-nuodb - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-oracle - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-postgres - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-sqlite - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 6672f0f2d8..9287dcbd10 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 534924752f..f4fc3e65ac 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 9dc4ea4f40..1df795b012 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC4 + 13.26.0-FOC5-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-db2 - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-h2 - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-hana - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-mariadb - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-mysql - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-nuodb - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-oracle - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-postgres - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-postgis - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-postgis-types - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-sqlite - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-sqlserver - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index c750e5e346..27e0ec70c2 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 0e632bd0d3..9a7e85fdfc 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.26.0-FOC5 io.ebean ebean-api - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test io.ebean ebean-platform-postgres - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test io.ebean ebean-platform-sqlserver - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index cf86a15f78..e4dab8f0fc 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided io.ebean ebean-core - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 0cbbfa6a4e..e783a77774 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index f6c56a9e0c..7b4f823ac9 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-core - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 5fcac123f2..97cd0db128 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test io.ebean ebean-test - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 4f8cb3ae45..2682249d70 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided io.ebean ebean-core - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided io.ebean ebean-querybean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test io.ebean ebean-test - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index b4b5c185ce..16f5434891 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 6e549e3984..c6ed603e73 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-core - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 provided io.ebean ebean-ddl-generator - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test io.ebean ebean-platform-all - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 30a30888fa..46aa0861c9 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test io.ebean ebean-ddl-generator - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index e582f39b4e..99a5634ad5 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-clickhouse - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-db2 - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-hana - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-hsqldb - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-mysql - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-mariadb - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-nuodb - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-oracle - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-postgres - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-sqlite - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 io.ebean ebean-platform-sqlserver - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 9287dcbd10..47518f07bf 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index f4fc3e65ac..c557c59527 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 1df795b012..ebe536bcae 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC5-SNAPSHOT + 13.26.0-FOC5 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-db2 - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-h2 - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-hana - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-mariadb - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-mysql - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-nuodb - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-oracle - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-postgres - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-postgis - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-postgis-types - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-sqlite - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-sqlserver - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 27e0ec70c2..87f9b837ca 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 9a7e85fdfc..87d62cd3ad 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.26.0-FOC5 + HEAD io.ebean ebean-api - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test io.ebean ebean-platform-postgres - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index e4dab8f0fc..bcea4ac31f 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index e783a77774..c74e8c18f8 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 7b4f823ac9..c8043269c3 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 97cd0db128..daef29646c 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 2682249d70..0df1a461e1 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided io.ebean ebean-querybean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 16f5434891..56eed55993 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index c6ed603e73..98f2988af0 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test io.ebean ebean-platform-all - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 46aa0861c9..117dbd4cf7 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test io.ebean ebean-ddl-generator - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 99a5634ad5..eb67f6dd9b 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-db2 - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-hana - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-mysql - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-mariadb - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-nuodb - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-oracle - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-postgres - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-sqlite - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 47518f07bf..c7df5d7a97 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index c557c59527..74136c8234 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index ebe536bcae..f37fa5a52c 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC5 + 13.26.0-FOC6-SNAPSHOT @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-db2 - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-h2 - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-hana - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-mariadb - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-mysql - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-nuodb - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-oracle - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-postgres - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-postgis - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-postgis-types - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-sqlite - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-sqlserver - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 87f9b837ca..a5cfa57b12 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 87d62cd3ad..2667a0a443 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-13.26.0-FOC6 io.ebean ebean-api - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test io.ebean ebean-platform-postgres - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test io.ebean ebean-platform-sqlserver - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index bcea4ac31f..1606350f05 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided io.ebean ebean-core - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index c74e8c18f8..09192bb355 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index c8043269c3..f859d4f6ff 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-core - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index daef29646c..b7f3cce815 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test io.ebean ebean-test - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 0df1a461e1..01dbefac13 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided io.ebean ebean-core - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided io.ebean ebean-querybean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test io.ebean ebean-test - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 56eed55993..c0359c7bf6 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 98f2988af0..4571e7af4e 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-core - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 provided io.ebean ebean-ddl-generator - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test io.ebean ebean-platform-all - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 117dbd4cf7..618aaea9c2 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test io.ebean ebean-ddl-generator - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index eb67f6dd9b..e46a11f318 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-clickhouse - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-db2 - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-hana - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-hsqldb - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-mysql - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-mariadb - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-nuodb - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-oracle - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-postgres - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-sqlite - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 io.ebean ebean-platform-sqlserver - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index c7df5d7a97..0f43f06632 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 74136c8234..eba3595151 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index f37fa5a52c..9bab7f70ea 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC6-SNAPSHOT + 13.26.0-FOC6 @@ -193,79 +193,79 @@ io.ebean ebean-clickhouse - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-db2 - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-h2 - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-hana - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-mariadb - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-mysql - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-nuodb - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-oracle - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-postgres - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-postgis - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-postgis-types - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-sqlite - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-sqlserver - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index a5cfa57b12..972f4d3d16 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 2667a0a443..389b5f9316 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ebean-core @@ -15,14 +15,14 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-13.26.0-FOC6 + HEAD io.ebean ebean-api - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT @@ -46,7 +46,7 @@ io.ebean ebean-core-type - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT @@ -159,21 +159,21 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test io.ebean ebean-platform-postgres - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test io.ebean ebean-platform-sqlserver - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 1606350f05..4a40ade089 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided @@ -65,7 +65,7 @@ io.ebean ebean-platform-all - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 09192bb355..7a96aaf4d6 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT 4.0.0 @@ -14,7 +14,7 @@ io.ebean ebean-core-type - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index f859d4f6ff..07093f0680 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ebean postgis types @@ -19,14 +19,14 @@ io.ebean ebean-platform-postgres - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided @@ -62,7 +62,7 @@ io.ebean ebean-test - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index b7f3cce815..2ae215ae7b 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided @@ -63,14 +63,14 @@ io.ebean ebean-ddl-generator - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test @@ -84,7 +84,7 @@ io.ebean querybean-generator - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 01dbefac13..15159378ca 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ebean-redis @@ -22,28 +22,28 @@ io.ebean ebean-api - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided io.ebean ebean-core - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided io.ebean ebean-querybean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test io.ebean ebean-test - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test @@ -57,7 +57,7 @@ io.ebean querybean-generator - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index c0359c7bf6..0b6b71621e 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ebean-spring-txn @@ -28,7 +28,7 @@ io.ebean ebean-core - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided @@ -77,7 +77,7 @@ io.ebean ebean-test - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 4571e7af4e..559933df14 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ebean test @@ -33,20 +33,20 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-core - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT provided io.ebean ebean-ddl-generator - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT @@ -149,14 +149,14 @@ io.ebean ebean-jackson-mapper - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test io.ebean ebean-platform-all - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 618aaea9c2..2dca2f77f2 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT kotlin querybean generator @@ -21,7 +21,7 @@ io.ebean ebean-querybean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test @@ -35,7 +35,7 @@ io.ebean ebean-core - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test @@ -56,14 +56,14 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test io.ebean ebean-ddl-generator - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT test diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index e46a11f318..bfbaa842dc 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ../.. @@ -15,67 +15,67 @@ io.ebean ebean-platform-h2 - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-clickhouse - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-db2 - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-hana - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-hsqldb - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-mysql - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-mariadb - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-nuodb - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-oracle - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-postgres - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-sqlanywhere - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-sqlite - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT io.ebean ebean-platform-sqlserver - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 0f43f06632..c31a267ec3 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index eba3595151..b6f73a1213 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 9bab7f70ea..83829e82fb 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT ../.. @@ -15,7 +15,7 @@ io.ebean ebean-api - 13.26.0-FOC6 + 13.26.0-FOC7-SNAPSHOT