From e92fd2ef065d7f926f0154033574bd3abb44a43b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 28 Oct 2021 22:19:24 +1300 Subject: [PATCH 01/13] Add github workflows build.yml --- .github/workflows/build.yml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..9349e87d5 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,36 @@ + +name: Maven test and package + +on: [push, pull_request] + +jobs: + build: + + runs-on: ${{ matrix.os }} + permissions: + contents: read + packages: write + strategy: + fail-fast: false + matrix: + java_version: [8, 11, 15] + os: [ubuntu-latest] + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: ${{ matrix.java_version }} + distribution: 'adopt' + - name: Maven cache + uses: actions/cache@v2 + env: + cache-name: maven-cache + with: + path: + ~/.m2 + key: build-${{ env.cache-name }} + - name: Build with Maven + run: mvn package + From 893aa6cb1a1962ba6341bbe0553778542d746278 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 28 Oct 2021 22:26:13 +1300 Subject: [PATCH 02/13] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9349e87d5..4bf65576a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [8, 11, 15] + java_version: [8] os: [ubuntu-latest] steps: From d507452d6392f090ac6ca78f9a5a4f39df964b7f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 28 Oct 2021 22:33:28 +1300 Subject: [PATCH 03/13] Fix test TestExtraScalarTypes for github workflows build --- .../tests/basic/type/TestExtraScalarTypes.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index 133adada4..f3424de46 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -10,16 +10,17 @@ import java.util.List; import java.util.Locale; import java.util.TimeZone; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -public class TestExtraScalarTypes extends BaseTestCase { +class TestExtraScalarTypes extends BaseTestCase { @Test - public void test() { + void test() { - Locale locale = Locale.getDefault(); - Currency currency = Currency.getInstance(locale); + Locale locale = Locale.ENGLISH; + Currency currency = Currency.getInstance(Locale.US); TimeZone tz = TimeZone.getDefault(); ESomeType e = new ESomeType(); @@ -29,20 +30,20 @@ public class TestExtraScalarTypes extends BaseTestCase { DB.save(e); - ESomeType e2 = DB.find(ESomeType.class).setAutoTune(false).setId(e.getId()).findOne(); + ESomeType e2 = DB.find(ESomeType.class).setId(e.getId()).findOne(); assertNotNull(e2.getCurrency()); assertNotNull(e2.getLocale()); assertNotNull(e2.getTimeZone()); List list = DB.find(ESomeType.class) - .setAutoTune(false).where() + .where() .eq("locale", locale) .eq("timeZone", tz.getID()) .eq("currency", currency) .findList(); - assertTrue(!list.isEmpty()); + assertThat(list).isNotEmpty(); } } From 704a138ff04737b487e1cf8354e20b6859233bc6 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 28 Oct 2021 22:34:55 +1300 Subject: [PATCH 04/13] Tidy build.yml and TestExtraScalarTypes --- .github/workflows/build.yml | 4 ++-- .../test/java/org/tests/basic/type/TestExtraScalarTypes.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4bf65576a..12acca8c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,10 @@ jobs: matrix: java_version: [8] os: [ubuntu-latest] - + steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + - name: Set up Java uses: actions/setup-java@v2 with: java-version: ${{ matrix.java_version }} diff --git a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java index f3424de46..d5ee6435a 100644 --- a/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java +++ b/ebean-test/src/test/java/org/tests/basic/type/TestExtraScalarTypes.java @@ -12,7 +12,6 @@ import java.util.TimeZone; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; class TestExtraScalarTypes extends BaseTestCase { From 9907cffe6e144868d7968a5faa9cf94afcccef15 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 28 Oct 2021 22:38:48 +1300 Subject: [PATCH 05/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b707f9a92..b92e5f720 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/ebean-orm/ebean.svg?branch=master)](https://travis-ci.org/ebean-orm/ebean) +[![Build](https://github.com/ebean-orm/ebean/actions/workflows/build.yml/badge.svg)](https://github.com/ebean-orm/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) # Sponsors From 0bb7d79015a3e1487a72f2cfe3d0765ee8bcd1cd Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 28 Oct 2021 22:40:10 +1300 Subject: [PATCH 06/13] Tidy build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 12acca8c6..0c09fbd01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,5 @@ -name: Maven test and package +name: Build on: [push, pull_request] From fd1b5f58bc202bc963b65c507de06d66ba6d5c87 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Wed, 3 Nov 2021 11:34:04 +0100 Subject: [PATCH 07/13] FIX: Subsequent findEach / findList does not work reliable (Regression of #2411) --- .../DefaultPersistenceContext.java | 22 +++++++++++++--- .../tests/basic/TestPersistenceContext.java | 26 +++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java index d10d92ab2..ba654782f 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java @@ -276,11 +276,20 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext { } private void put(Object id, Object b) { + Object existing; if (useReferences) { weakCount++; - map.put(id, new BeanRef(this, id, b, queue)); + existing = map.put(id, new BeanRef(this, id, b, queue)); } else { - map.put(id, b); + existing = map.put(id, b); + } + // when existing BeanRef is replaced, it must not be processed by the queue. + // Removing from queue is not possible, so we set it to "dead" and skip + // this reference in expunge. This prevents us from removing wrong keys. + + if (existing instanceof BeanRef) { + ((BeanRef) existing).setDead(); + weakCount--; } } @@ -330,6 +339,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext { private final ClassContext classContext; private final Object key; + private boolean alive = true; private BeanRef(ClassContext classContext, Object key, Object referent, ReferenceQueue q) { super(referent, q); @@ -337,8 +347,14 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext { this.key = key; } + private void setDead() { + alive = false; + } + private void expunge() { - classContext.remove(key); + if (alive) { + classContext.remove(key); + } } } 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 86e0425a6..2f87bdc08 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -191,4 +191,30 @@ class TestPersistenceContext extends BaseTestCase { assertThat(pc.toString()).contains("Customer=size:200 (0 weak)"); } } + + @Disabled // run manually + @Test + void testPcScopes_with_findEachFindList() throws InterruptedException { + for (int i = 0; i < 5000; i++) { + Customer c = new Customer(); + c.setName("Customer #" + i); + DB.save(c); + Order o = new Order(); + o.setCustomer(c); + DB.save(o); + } + + for (int i = 0; i < 1000; i++) { + try (Transaction txn = DB.beginTransaction()) { + List customers = new ArrayList<>(); + DB.find(Customer.class).select("id").findEach(customers::add); + SpiPersistenceContext pc = ((SpiTransaction) txn).getPersistenceContext(); + assertThat(pc.toString()).contains("Customer=size:5000 (5000 weak)"); + customers.clear(); + customers = DB.find(Customer.class).select("id").findList(); + + assertThat(pc.toString()).contains("Customer=size:5000"); // We expect ALWAYS 5000 entries in the PC + } + } + } } From 2cbb161ed5fefa2d586062b654f1daef1f3fd3f4 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 4 Nov 2021 10:40:04 +1300 Subject: [PATCH 08/13] Follow up to #2437 - Rename internal "dead/alive" to "replaced" --- .../DefaultPersistenceContext.java | 21 ++++++++----------- .../tests/basic/TestPersistenceContext.java | 11 +++++----- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java index ba654782f..3ede05de1 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultPersistenceContext.java @@ -275,20 +275,17 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext { return null; } - private void put(Object id, Object b) { + private void put(Object id, Object bean) { Object existing; if (useReferences) { weakCount++; - existing = map.put(id, new BeanRef(this, id, b, queue)); + existing = map.put(id, new BeanRef(this, id, bean, queue)); } else { - existing = map.put(id, b); + existing = map.put(id, bean); } - // when existing BeanRef is replaced, it must not be processed by the queue. - // Removing from queue is not possible, so we set it to "dead" and skip - // this reference in expunge. This prevents us from removing wrong keys. - if (existing instanceof BeanRef) { - ((BeanRef) existing).setDead(); + // when a BeanRef is replaced, its expunge() must NOT remove an entry + ((BeanRef) existing).setReplaced(); weakCount--; } } @@ -339,7 +336,7 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext { private final ClassContext classContext; private final Object key; - private boolean alive = true; + private boolean replaced; private BeanRef(ClassContext classContext, Object key, Object referent, ReferenceQueue q) { super(referent, q); @@ -347,12 +344,12 @@ public final class DefaultPersistenceContext implements SpiPersistenceContext { this.key = key; } - private void setDead() { - alive = false; + private void setReplaced() { + replaced = true; } private void expunge() { - if (alive) { + if (!replaced) { classContext.remove(key); } } 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 2f87bdc08..82788d8a0 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java +++ b/ebean-test/src/test/java/org/tests/basic/TestPersistenceContext.java @@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.*; class TestPersistenceContext extends BaseTestCase { - @Test void testReload() { ResetBasicData.reset(); @@ -34,7 +33,7 @@ class TestPersistenceContext extends BaseTestCase { assertThat(notes.get(0).getTitle()).isEqualTo("FooBar"); } } - + @Test void test() { ResetBasicData.reset(); @@ -191,10 +190,10 @@ class TestPersistenceContext extends BaseTestCase { assertThat(pc.toString()).contains("Customer=size:200 (0 weak)"); } } - + @Disabled // run manually @Test - void testPcScopes_with_findEachFindList() throws InterruptedException { + void testPcScopes_with_findEachFindList() { for (int i = 0; i < 5000; i++) { Customer c = new Customer(); c.setName("Customer #" + i); @@ -203,7 +202,7 @@ class TestPersistenceContext extends BaseTestCase { o.setCustomer(c); DB.save(o); } - + for (int i = 0; i < 1000; i++) { try (Transaction txn = DB.beginTransaction()) { List customers = new ArrayList<>(); @@ -212,7 +211,7 @@ class TestPersistenceContext extends BaseTestCase { assertThat(pc.toString()).contains("Customer=size:5000 (5000 weak)"); customers.clear(); customers = DB.find(Customer.class).select("id").findList(); - + assertThat(pc.toString()).contains("Customer=size:5000"); // We expect ALWAYS 5000 entries in the PC } } From 0f60e2240ce10781e60efee28b8cea209dfacdd5 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 4 Nov 2021 10:57:48 +1300 Subject: [PATCH 09/13] Bump version to 12.13.0-SNAPSHOT --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 4 ++-- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 8 ++++---- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 8 ++++---- ebean-postgis/pom.xml | 6 +++--- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 6 +++--- ebean/pom.xml | 8 ++++---- pom.xml | 6 +++--- querybean-generator/pom.xml | 2 +- 15 files changed, 57 insertions(+), 57 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index ec4a2cddb..39c151896 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 0c9837d38..a6b3c770a 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 964bcf254..cbf150016 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-api - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-core-type - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-ddl-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-externalmapping-api - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-autotune - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-querybean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean querybean-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided io.ebean ebean-test - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test io.ebean ebean-postgis - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-redis - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index bf7c0da2b..816a90587 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 3e427091b..813b5a726 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean-core @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-core-type - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-externalmapping-api - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 8be7e7749..def3ca086 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 267ff6d13..4bb39d8ad 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index dc5c1c422..ba4023ef3 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test io.ebean ebean-ddl-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 1b964727e..68b50ba19 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 935d5b8f0..b69ddc125 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test io.ebean querybean-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test io.ebean ebean-test - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 99e57f334..1a59ed250 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided io.ebean ebean-querybean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test io.ebean querybean-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test io.ebean ebean-test - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 7b9ddd41d..0310296d1 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index e5a14b42a..5d5ba09a8 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT io.ebean ebean-querybean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 23329efa7..da6021a6c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT pom ebean parent @@ -45,8 +45,8 @@ 12.12.1 4.2 7.3 - 12.12.3 - 12.12.3 + 12.13.0 + 12.13.0 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 9f4d77d2e..dedac1167 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT querybean generator From 8ef71bd451cdb88c084dd905920fc37504435585 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 4 Nov 2021 11:02:45 +1300 Subject: [PATCH 10/13] Bump version to 12.13.0-SNAPSHOT --- tests/test-java16/pom.xml | 6 +++--- tests/test-kotlin/pom.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index fe18418ab..4a416d12e 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -20,7 +20,7 @@ io.ebean ebean - 12.12.3-SNAPSHOT + 12.13.0-SNAPSHOT @@ -32,7 +32,7 @@ io.ebean ebean-test - 12.12.3-SNAPSHOT + 12.13.0-SNAPSHOT test @@ -58,7 +58,7 @@ io.ebean querybean-generator - 12.12.3-SNAPSHOT + 12.13.0-SNAPSHOT diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 828aaf996..1321332b8 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -18,7 +18,7 @@ 11 11 - 12.12.1 + 12.13.0 1.5.31 2.12.1 true @@ -35,14 +35,14 @@ io.ebean ebean-test - 12.12.3-SNAPSHOT + 12.13.0-SNAPSHOT test io.ebean ebean-core - 12.12.3-SNAPSHOT + 12.13.0-SNAPSHOT test From 43742fdc0b90d8ae97e5f747f96c6a42d5b87f71 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 4 Nov 2021 11:16:50 +1300 Subject: [PATCH 11/13] Bump version to 12.13.0-SNAPSHOT --- kotlin-querybean-generator/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index f647da88c..af5d5e3b9 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.12.4-SNAPSHOT + 12.13.0-SNAPSHOT test From ea7b4e8162a8203122770772b3127fd3c379d06d Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 4 Nov 2021 11:19:25 +1300 Subject: [PATCH 12/13] [maven-release-plugin] prepare release ebean-parent-12.13.0 --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 6 +++--- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 10 +++++----- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++++----- ebean-postgis/pom.xml | 6 +++--- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 6 +++--- ebean/pom.xml | 8 ++++---- kotlin-querybean-generator/pom.xml | 8 ++++---- pom.xml | 4 ++-- querybean-generator/pom.xml | 2 +- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 39c151896..4032023f1 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index a6b3c770a..674446494 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.13.0 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index cbf150016..43c35e3d6 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-api - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-core-type - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-ddl-generator - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-externalmapping-api - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-externalmapping-xml - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-autotune - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-querybean - 12.13.0-SNAPSHOT + 12.13.0 io.ebean querybean-generator - 12.13.0-SNAPSHOT + 12.13.0 provided io.ebean kotlin-querybean-generator - 12.13.0-SNAPSHOT + 12.13.0 provided io.ebean ebean-test - 12.13.0-SNAPSHOT + 12.13.0 test io.ebean ebean-postgis - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-redis - 12.13.0-SNAPSHOT + 12.13.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 816a90587..69df3a981 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.13.0-SNAPSHOT + 12.13.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 813b5a726..e0652c6cc 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.13.0 @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-core-type - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-externalmapping-api - 12.13.0-SNAPSHOT + 12.13.0 diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index def3ca086..817bec633 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.13.0-SNAPSHOT + 12.13.0 provided io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 4bb39d8ad..97ef91213 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index ba4023ef3..efbf40888 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.13.0 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.13.0-SNAPSHOT + 12.13.0 @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 test io.ebean ebean-ddl-generator - 12.13.0-SNAPSHOT + 12.13.0 test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 68b50ba19..ae5b78dfc 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.13.0-SNAPSHOT + 12.13.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index b69ddc125..d7bef06dd 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.13.0-SNAPSHOT + 12.13.0 test io.ebean querybean-generator - 12.13.0-SNAPSHOT + 12.13.0 test io.ebean ebean-test - 12.13.0-SNAPSHOT + 12.13.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 1a59ed250..c0c758b35 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.13.0-SNAPSHOT + 12.13.0 provided io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 provided io.ebean ebean-querybean - 12.13.0-SNAPSHOT + 12.13.0 test io.ebean querybean-generator - 12.13.0-SNAPSHOT + 12.13.0 test io.ebean ebean-test - 12.13.0-SNAPSHOT + 12.13.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 0310296d1..63f9a9fad 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 provided io.ebean ebean-ddl-generator - 12.13.0-SNAPSHOT + 12.13.0 diff --git a/ebean/pom.xml b/ebean/pom.xml index 5d5ba09a8..22cc881f9 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 io.ebean ebean-querybean - 12.13.0-SNAPSHOT + 12.13.0 diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index af5d5e3b9..6ef4099e9 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.13.0-SNAPSHOT + 12.13.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.13.0-SNAPSHOT + 12.13.0 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.13.0-SNAPSHOT + 12.13.0 test diff --git a/pom.xml b/pom.xml index da6021a6c..d4cec537d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.13.0-SNAPSHOT + 12.13.0 pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.13.0 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index dedac1167..838f894cd 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0-SNAPSHOT + 12.13.0 querybean generator From 5807874c9e0fd34e99ba6ac3adad859d64c564bf Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 4 Nov 2021 11:19:32 +1300 Subject: [PATCH 13/13] [maven-release-plugin] prepare for next development iteration --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 6 +++--- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 10 +++++----- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 10 +++++----- ebean-postgis/pom.xml | 6 +++--- ebean-querybean/pom.xml | 10 +++++----- ebean-redis/pom.xml | 12 ++++++------ ebean-test/pom.xml | 6 +++--- ebean/pom.xml | 8 ++++---- kotlin-querybean-generator/pom.xml | 8 ++++---- pom.xml | 4 ++-- querybean-generator/pom.xml | 2 +- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 4032023f1..5e0b9430a 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 674446494..71f390c01 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.13.0 + HEAD ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 43c35e3d6..34f8c9564 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-api - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-core-type - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-ddl-generator - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-externalmapping-api - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-autotune - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-querybean - 12.13.0 + 12.13.1-SNAPSHOT io.ebean querybean-generator - 12.13.0 + 12.13.1-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.13.0 + 12.13.1-SNAPSHOT provided io.ebean ebean-test - 12.13.0 + 12.13.1-SNAPSHOT test io.ebean ebean-postgis - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-redis - 12.13.0 + 12.13.1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 69df3a981..09009283c 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.13.0 + 12.13.1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index e0652c6cc..ccef24355 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.13.0 + HEAD @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-core-type - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-externalmapping-api - 12.13.0 + 12.13.1-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 817bec633..b2479c256 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.13.0 + 12.13.1-SNAPSHOT provided io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 97ef91213..16adb312f 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index efbf40888..2bab5aa0b 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.13.0 + HEAD ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.13.0 + 12.13.1-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT test io.ebean ebean-ddl-generator - 12.13.0 + 12.13.1-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index ae5b78dfc..74dad99da 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.13.0 + 12.13.1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index d7bef06dd..bc07795b5 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.13.0 + 12.13.1-SNAPSHOT test io.ebean querybean-generator - 12.13.0 + 12.13.1-SNAPSHOT test io.ebean ebean-test - 12.13.0 + 12.13.1-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index c0c758b35..9956949b3 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.13.0 + 12.13.1-SNAPSHOT provided io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT provided io.ebean ebean-querybean - 12.13.0 + 12.13.1-SNAPSHOT test io.ebean querybean-generator - 12.13.0 + 12.13.1-SNAPSHOT test io.ebean ebean-test - 12.13.0 + 12.13.1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 63f9a9fad..6a2a5679f 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.13.0 + 12.13.1-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index 22cc881f9..398c3a3a3 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT io.ebean ebean-querybean - 12.13.0 + 12.13.1-SNAPSHOT diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 6ef4099e9..b2e022c98 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.13.0 + 12.13.1-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.13.0 + 12.13.1-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.13.0 + 12.13.1-SNAPSHOT test diff --git a/pom.xml b/pom.xml index d4cec537d..f4202a3b6 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.13.0 + 12.13.1-SNAPSHOT pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.13.0 + HEAD diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 838f894cd..51de4c806 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.0 + 12.13.1-SNAPSHOT querybean generator