From e95edad04b3b7250828e34671a31b60a3e1fe635 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 2 Dec 2021 11:23:38 +0100 Subject: [PATCH 01/41] Fix maven warning --- tests/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/pom.xml b/tests/pom.xml index c6f2cdcc5..16a4e2c34 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -2,6 +2,7 @@ 4.0.0 + / org.avaje java8-oss 2.3 From 272b316eccfbe007c046b55946373cfd0ae1b8ef Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Thu, 2 Dec 2021 11:29:45 +0100 Subject: [PATCH 02/41] some more changes --- tests/pom.xml | 2 +- tests/test-kotlin/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/pom.xml b/tests/pom.xml index 16a4e2c34..31199f8b8 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - / + ../../ org.avaje java8-oss 2.3 diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 64981379f..ab6dbdbfe 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -4,6 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + ../../../ org.avaje java11-oss 2.3 From 8cd6d50def81add6595f36ee54e9844c3cea2e84 Mon Sep 17 00:00:00 2001 From: Carl Dea Date: Mon, 6 Dec 2021 14:59:41 -0500 Subject: [PATCH 03/41] Using TCK Tested JDK builds of OpenJDK The AdoptOpenJDK has been discontinued since July 2021 (https://adoptopenjdk.net). Switching the distribution to Azul Zulu. When using Zulu you get all the latest updated (TCK Tested) builds for all versions of OpenJDK --- .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 0c09fbd01..bf03d3b50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: ${{ matrix.java_version }} - distribution: 'adopt' + distribution: 'zulu' - name: Maven cache uses: actions/cache@v2 env: From 888109d70699c63e388f3d2c0b5196f71757d287 Mon Sep 17 00:00:00 2001 From: Carl Dea Date: Mon, 6 Dec 2021 15:00:49 -0500 Subject: [PATCH 04/41] Using TCK Tested JDK builds of OpenJDK The AdoptOpenJDK has been discontinued since July 2021 (https://adoptopenjdk.net). Switching the distribution to Azul Zulu. When using Zulu you get all the latest updated (TCK Tested) builds for all versions of OpenJDK. --- .github/workflows/multi-jdk-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/multi-jdk-build.yml b/.github/workflows/multi-jdk-build.yml index badab5de6..f44cfac89 100644 --- a/.github/workflows/multi-jdk-build.yml +++ b/.github/workflows/multi-jdk-build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - java_version: [8, 11, 17] + java_version: [8.0.192, 8, 11.0.3, 11, 17] os: [ubuntu-latest] steps: @@ -25,7 +25,7 @@ jobs: uses: actions/setup-java@v2 with: java-version: ${{ matrix.java_version }} - distribution: 'adopt' + distribution: 'zulu' - name: Maven cache uses: actions/cache@v2 env: From d28d9a61761080ee3defb31192d685308d3e3e35 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 7 Dec 2021 14:47:49 +1300 Subject: [PATCH 05/41] Follow up to #2448 - Fix maven warning --- tests/pom.xml | 2 +- tests/test-kotlin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pom.xml b/tests/pom.xml index 31199f8b8..b3592f647 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -2,10 +2,10 @@ 4.0.0 - ../../ org.avaje java8-oss 2.3 + io.ebean diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index ab6dbdbfe..3ab10cdf5 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -4,10 +4,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ../../../ org.avaje java11-oss 2.3 + test-kotlin From 103f9651821aae8e0549d251a7debc3fac40deb7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 7 Dec 2021 14:51:53 +1300 Subject: [PATCH 06/41] Add github workflow for JDK 18-ea build --- .github/workflows/jdk-18-ea.yml | 39 +++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/jdk-18-ea.yml diff --git a/.github/workflows/jdk-18-ea.yml b/.github/workflows/jdk-18-ea.yml new file mode 100644 index 000000000..73121f1d4 --- /dev/null +++ b/.github/workflows/jdk-18-ea.yml @@ -0,0 +1,39 @@ + +name: JDK 18-ea + +on: + workflow_dispatch: +# schedule: +# - cron: '30 6 * * *' + +jobs: + build: + + runs-on: ${{ matrix.os }} + permissions: + contents: read + packages: write + strategy: + fail-fast: false + matrix: + java_version: [18-ea] + os: [ubuntu-latest] + + steps: + - uses: actions/checkout@v2 + - name: Set up Java + uses: actions/setup-java@v2 + with: + java-version: ${{ matrix.java_version }} + distribution: 'zulu' + - 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 9d26ab21030ee0df26b0d7196396884fc4b34561 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 7 Dec 2021 15:15:21 +1300 Subject: [PATCH 07/41] Adjust tests for JDK 18-ea build --- .../profile/BasicProfileLocationTest.java | 13 +++++++--- .../org/tests/basic/TestLoadBeanCache.java | 24 ++++++++----------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java index 3762cd51b..7eccc8d83 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java @@ -12,14 +12,21 @@ public class BasicProfileLocationTest { DProfileLocation loc = new DTimedProfileLocation(12, "foo", MetricFactory.get().createTimedMetric("junk")); + String javaVersion = System.getProperty("java.version"); assertThat(loc.obtain()).isTrue(); - assertThat(loc.fullLocation()).endsWith(":12)"); - if (System.getProperty("java.version").startsWith("1.8")) { + if (javaVersion.startsWith("1.8")) { + assertThat(loc.fullLocation()).endsWith("jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method:12)"); assertThat(loc.location()).isEqualTo("sun.reflect.NativeMethodAccessorImpl.invoke0"); + assertThat(loc.label()).isEqualTo("NativeMethodAccessorImpl.invoke0"); + } else if (javaVersion.startsWith("18")){ + assertThat(loc.fullLocation()).endsWith("jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:104)"); + assertThat(loc.location()).isEqualTo("java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke"); + assertThat(loc.label()).isEqualTo("DirectMethodHandleAccessor.invoke"); } else { + assertThat(loc.fullLocation()).endsWith("jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method:12)"); assertThat(loc.location()).isEqualTo("java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0"); + assertThat(loc.label()).isEqualTo("NativeMethodAccessorImpl.invoke0"); } - assertThat(loc.label()).isEqualTo("NativeMethodAccessorImpl.invoke0"); } @Test diff --git a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java index 47eb98793..a72f07264 100644 --- a/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java +++ b/ebean-test/src/test/java/org/tests/basic/TestLoadBeanCache.java @@ -13,13 +13,12 @@ import java.util.List; import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; -public class TestLoadBeanCache extends BaseTestCase { +class TestLoadBeanCache extends BaseTestCase { @Test - public void testLoad() { + void testLoad() { ResetBasicData.reset(); @@ -35,32 +34,29 @@ public class TestLoadBeanCache extends BaseTestCase { // this will hit the cache Country nz = DB.find(Country.class, "NZ"); - assertTrue(loadedNz == nz); + assertSame(loadedNz, nz); } - + @Test - public void testLoadWithFindMap() { + void testLoadWithFindMap() { ResetBasicData.reset(); - + List ids = DB.find(Customer.class).findIds(); - assertEquals(ids.size(), 4); + assertThat(ids).isNotEmpty(); DB.getDefault().pluginApi().cacheManager().clearAll(); - + // hit database LoggedSql.start(); DB.find(Customer.class).where().idIn(ids).findMap(); List sql = LoggedSql.stop(); assertThat(sql).hasSize(1); - + // hit beanCache LoggedSql.start(); DB.find(Customer.class).where().idIn(ids).findMap(); sql = LoggedSql.stop(); assertThat(sql).hasSize(0); - } - - } From e7aa1fdac5f2dda8ae947033955e2165252204de Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 7 Dec 2021 15:21:43 +1300 Subject: [PATCH 08/41] Update badges on README --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2a6045969..30dc2c06b 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,12 @@ [![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) +[![JDK 18-ea](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/jdk-18-ea.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 10.6](https://github.com/ebean-orm/ebean/actions/workflows/mariadb-10.6.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/mariadb-10.6.yml) -[![SqlServer 2017 latest](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver-2017-latest.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver-2017-latest.yml) +[![MariaDB](https://github.com/ebean-orm/ebean/actions/workflows/mariadb-10.6.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/mariadb-10.6.yml) +[![SqlServer](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver-2017-latest.yml/badge.svg)](https://github.com/ebean-orm/ebean/actions/workflows/sqlserver-2017-latest.yml) # Sponsors From 9752eced1f2a3737aff3d39828f2b2dd1c0a7599 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 7 Dec 2021 15:24:19 +1300 Subject: [PATCH 09/41] Adjust tests for JDK 18-ea build --- .../ebeaninternal/server/profile/BasicProfileLocationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java index 7eccc8d83..1f6618d9a 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java @@ -15,7 +15,7 @@ public class BasicProfileLocationTest { String javaVersion = System.getProperty("java.version"); assertThat(loc.obtain()).isTrue(); if (javaVersion.startsWith("1.8")) { - assertThat(loc.fullLocation()).endsWith("jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method:12)"); + assertThat(loc.fullLocation()).endsWith("invoke0(Native Method:12)"); assertThat(loc.location()).isEqualTo("sun.reflect.NativeMethodAccessorImpl.invoke0"); assertThat(loc.label()).isEqualTo("NativeMethodAccessorImpl.invoke0"); } else if (javaVersion.startsWith("18")){ From b9f3ff24e99815b3d38cf6b77748df5a1411be35 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 7 Dec 2021 15:25:02 +1300 Subject: [PATCH 10/41] Tidy test only - BasicProfileLocationTest --- .../server/profile/BasicProfileLocationTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java index 1f6618d9a..3c3055151 100644 --- a/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java +++ b/ebean-test/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java @@ -5,10 +5,10 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -public class BasicProfileLocationTest { +class BasicProfileLocationTest { @Test - public void obtain() { + void obtain() { DProfileLocation loc = new DTimedProfileLocation(12, "foo", MetricFactory.get().createTimedMetric("junk")); @@ -30,7 +30,7 @@ public class BasicProfileLocationTest { } @Test - public void basic_trimPackage() { + void basic_trimPackage() { BasicProfileLocation loc = new BasicProfileLocation("com.foo.Bar.all"); assertThat(loc.obtain()).isFalse(); @@ -40,7 +40,7 @@ public class BasicProfileLocationTest { } @Test - public void basic_trimSinglePackage() { + void basic_trimSinglePackage() { BasicProfileLocation loc = new BasicProfileLocation("foo.Bar.all"); assertThat(loc.obtain()).isFalse(); From b627794f8f6d84c7414f338944495736c3a3d1b0 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 7 Dec 2021 16:25:46 +1300 Subject: [PATCH 11/41] #2451 - Initial add of ebean-kotlin module, home of kotlin extension --- ebean-kotlin/pom.xml | 104 ++++++++++++++++++ .../kotlin/org/example/domain/FooEntity.kt | 18 +++ .../org/example/domain/FooEntityTest.kt | 21 ++++ .../src/test/resources/application-test.yaml | 4 + pom.xml | 2 + 5 files changed, 149 insertions(+) create mode 100644 ebean-kotlin/pom.xml create mode 100644 ebean-kotlin/src/test/kotlin/org/example/domain/FooEntity.kt create mode 100644 ebean-kotlin/src/test/kotlin/org/example/domain/FooEntityTest.kt create mode 100644 ebean-kotlin/src/test/resources/application-test.yaml diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml new file mode 100644 index 000000000..53d2f8cd4 --- /dev/null +++ b/ebean-kotlin/pom.xml @@ -0,0 +1,104 @@ + + + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + 4.0.0 + + ebean-kotlin + + + 11 + 11 + 12.13.0 + 1.6.0 + + + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + provided + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + provided + + + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + + + io.avaje + junit + 1.0 + test + + + + io.ebean + ebean-test + 12.13.2-SNAPSHOT + test + + + + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/test/kotlin + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + 11 + + + + compile + + compile + + + + test-compile + + test-compile + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.13.1 + + + + + + + + diff --git a/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntity.kt b/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntity.kt new file mode 100644 index 000000000..f1bc6d753 --- /dev/null +++ b/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntity.kt @@ -0,0 +1,18 @@ +package org.example.domain + +import io.ebean.Model +import javax.persistence.Entity +import javax.persistence.Id +import javax.persistence.Version + +@Entity +class FooEntity(name: String) : Model() { + + @Id + var id: Long = 0 + + var name: String = name + + @Version + var version: Long = 0 +} diff --git a/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntityTest.kt b/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntityTest.kt new file mode 100644 index 000000000..ef94f3b48 --- /dev/null +++ b/ebean-kotlin/src/test/kotlin/org/example/domain/FooEntityTest.kt @@ -0,0 +1,21 @@ +package org.example.domain + +import io.ebean.DB +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test + +class FooEntityTest { + + @Test + fun iud() { + + val foo = FooEntity("hello") + foo.save() + + val found = DB.find(FooEntity::class.java, foo.id) + assertThat(found).isNotNull + + found?.delete() + + } +} diff --git a/ebean-kotlin/src/test/resources/application-test.yaml b/ebean-kotlin/src/test/resources/application-test.yaml new file mode 100644 index 000000000..310638fcb --- /dev/null +++ b/ebean-kotlin/src/test/resources/application-test.yaml @@ -0,0 +1,4 @@ +ebean: + test: + platform: h2 + diff --git a/pom.xml b/pom.xml index 740ee0b08..ba0c11c58 100644 --- a/pom.xml +++ b/pom.xml @@ -90,6 +90,7 @@ ebean-querybean ebean-postgis ebean-redis + @@ -103,6 +104,7 @@ true + ebean-kotlin tests From 9bdcd6c55e18c6ca3a08765ae2cc50f58f30c76b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 7 Dec 2021 18:13:17 +1300 Subject: [PATCH 12/41] #2452 - server-wide defaultJsonMutation SOURCE is not honored by DbJson scalar types (e.g. List) --- .../server/type/DefaultTypeManager.java | 7 +-- .../server/type/TypeJsonManager.java | 12 ++++ .../org/tests/json/TestJsonSourceDefault.java | 63 +++++++++++++++++++ 3 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java 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 544d8433e..a5b3b35c0 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 @@ -337,11 +337,10 @@ public final class DefaultTypeManager implements TypeManager { Type genericType = prop.getGenericType(); boolean hasJacksonAnnotations = objectMapperPresent && checkJacksonAnnotations(prop); - boolean keepSource = prop.getMutationDetection() == MutationDetection.SOURCE; if (type.equals(List.class)) { DocPropertyType docType = getDocType(genericType); if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) { - return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource); + return ScalarTypeJsonList.typeFor(postgres, dbType, docType, prop.isNullable(), jsonManager.keepSource(prop)); } else { return createJsonObjectMapperType(prop, dbType, docType); } @@ -349,14 +348,14 @@ public final class DefaultTypeManager implements TypeManager { if (type.equals(Set.class)) { DocPropertyType docType = getDocType(genericType); if (!hasJacksonAnnotations && isValueTypeSimple(genericType)) { - return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), keepSource); + return ScalarTypeJsonSet.typeFor(postgres, dbType, docType, prop.isNullable(), jsonManager.keepSource(prop)); } else { return createJsonObjectMapperType(prop, dbType, docType); } } if (type.equals(Map.class)) { if (!hasJacksonAnnotations && isMapValueTypeObject(genericType)) { - return ScalarTypeJsonMap.typeFor(postgres, dbType, keepSource); + return ScalarTypeJsonMap.typeFor(postgres, dbType, jsonManager.keepSource(prop)); } else { return createJsonObjectMapperType(prop, dbType, DocPropertyType.OBJECT); } diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java index 6660a9f39..25034e409 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/TypeJsonManager.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.ebean.ModifyAwareType; import io.ebean.annotation.MutationDetection; import io.ebean.config.dbplatform.DbPlatformType; +import io.ebeaninternal.server.deploy.meta.DeployBeanProperty; final class TypeJsonManager { @@ -25,6 +26,17 @@ final class TypeJsonManager { return objectMapper; } + boolean keepSource(DeployBeanProperty prop) { + if (prop.getMutationDetection() == MutationDetection.SOURCE) { + return true; + } else if (prop.getMutationDetection() == MutationDetection.DEFAULT) { + prop.setMutationDetection(mutationDetection); + return mutationDetection == MutationDetection.SOURCE; + } else { + return false; + } + } + String postgresType(int dbType) { if (postgres) { switch (dbType) { diff --git a/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java b/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java new file mode 100644 index 000000000..9a2d5d6ca --- /dev/null +++ b/ebean-test/src/test/java/org/tests/json/TestJsonSourceDefault.java @@ -0,0 +1,63 @@ +package org.tests.json; + +import io.ebean.Database; +import io.ebean.DatabaseFactory; +import io.ebean.ValuePair; +import io.ebean.annotation.ForPlatform; +import io.ebean.annotation.MutationDetection; +import io.ebean.annotation.Platform; +import io.ebean.config.DatabaseConfig; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.tests.model.json.EBasicJsonList; + +import java.util.List; +import java.util.Map; + +import static org.assertj.core.api.Assertions.assertThat; + +class TestJsonSourceDefault { + + @Test + @ForPlatform(Platform.H2) + @Disabled + void testDirtyValues_diffSource() { + DatabaseConfig config = new DatabaseConfig(); + config.getDataSourceConfig() + .setUsername("sa") + .setPassword("") + .setUrl("jdbc:h2:mem:testJsonSourceDirtyValues"); + + config.setName("jsonSource"); + config.setDefaultServer(false); + config.setRegister(false); + config.setDdlGenerate(true); + config.setDdlRun(true); + config.setDdlExtra(false); + config.addClass(EBasicJsonList.class); + config.setJsonMutationDetection(MutationDetection.SOURCE); + Database db = DatabaseFactory.create(config); + try { + assertThat(db).isNotNull(); + + EBasicJsonList bean = new EBasicJsonList(); + bean.getTags().add("aa"); + bean.getTags().add("bb"); + + db.save(bean); + bean = db.find(EBasicJsonList.class, bean.getId()); + + bean.getTags().add("cc"); + final Map dirtyValues = db.beanState(bean).dirtyValues(); + assertThat(dirtyValues).containsOnlyKeys("tags"); + + final ValuePair diff = dirtyValues.get("tags"); + assertThat(diff.getOldValue()).isInstanceOf(List.class).asList().containsExactly("aa", "bb"); + assertThat(diff.getNewValue()).isInstanceOf(List.class).asList().containsExactly("aa", "bb", "cc"); + } finally { + if (db != null) { + db.shutdown(); + } + } + } +} From c3295f1145e0f8b2f9984047d400d263e0705bd2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 13 Dec 2021 20:54:49 +1300 Subject: [PATCH 13/41] #2445 - Put back DB2 maxTableNameLength=18, maxConstraintNameLength=18 --- .../main/java/io/ebean/config/dbplatform/db2/DB2Platform.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java index 305f38efe..61d14f4a6 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/db2/DB2Platform.java @@ -22,8 +22,8 @@ public class DB2Platform extends DatabasePlatform { this.platform = Platform.DB2; // Note: DB2 (at least LUW supports length up to 128) // TOOD: Check if we need to introduce a new platform (DB2_LUW_11 ?) - this.maxTableNameLength = 128; - this.maxConstraintNameLength = 128; + this.maxTableNameLength = 18; + this.maxConstraintNameLength = 18; this.truncateTable = "truncate table %s reuse storage ignore delete triggers immediate"; this.sqlLimiter = new Db2SqlLimiter(); From 0dbf9822930199d5d50a1718a79204e933c48b3e Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 15 Dec 2021 21:47:58 +1300 Subject: [PATCH 14/41] Javadoc only update in PlatformConfig --- ebean-api/src/main/java/io/ebean/config/PlatformConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/src/main/java/io/ebean/config/PlatformConfig.java b/ebean-api/src/main/java/io/ebean/config/PlatformConfig.java index f609af041..df50db88a 100644 --- a/ebean-api/src/main/java/io/ebean/config/PlatformConfig.java +++ b/ebean-api/src/main/java/io/ebean/config/PlatformConfig.java @@ -378,7 +378,7 @@ public class PlatformConfig { BINARY(false, true, false), /** - * Store using DB BINARY(16). + * Store using DB BINARY(16) with optimized packing. */ BINARY_OPTIMIZED(false, true, true); From b4ebeb00703fda06f5008bab842e6e2ca0353d11 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 15 Dec 2021 21:49:02 +1300 Subject: [PATCH 15/41] #2445 - update test generated ddl as part of ... Put back DB2 maxTableNameLength=18, maxConstraintNameLength=18 --- .../migrationtest/db2/1.0__initial.sql | 28 ++++---- .../dbmigration/migrationtest/db2/1.1.sql | 70 +++++++++---------- .../dbmigration/migrationtest/db2/1.3.sql | 56 +++++++-------- .../migrationtest/db2/idx_db2.migrations | 6 +- 4 files changed, 80 insertions(+), 80 deletions(-) diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql index 20d677cf5..095b581de 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql +++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.0__initial.sql @@ -71,17 +71,17 @@ create table migtest_e_basic ( indextest5 varchar(127), indextest6 varchar(127), user_id integer not null, - constraint ck_migtest_e_basic_status check ( status in ('N','A','I')), - constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')), + constraint ck_mgtst__bsc_stts check ( status in ('N','A','I')), + constraint ck_mgtst__b_z543fg check ( status2 in ('N','A','I')), constraint pk_migtest_e_basic primary key (id) ); --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique (indextest2); --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique (indextest6); +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4aybzy unique (indextest2); +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc02 unique (indextest6); create table migtest_e_enum ( id integer generated by default as identity not null, test_status varchar(1), - constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')), + constraint ck_mgtst__n_773sok check ( test_status in ('N','A','I')), constraint pk_migtest_e_enum primary key (id) ); @@ -129,7 +129,7 @@ create table migtest_e_ref ( name varchar(127) not null, constraint pk_migtest_e_ref primary key (id) ); -alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); +alter table migtest_e_ref add constraint uq_mgtst__rf_nm unique (name); create table migtest_e_softdelete ( id integer generated by default as identity not null, @@ -161,14 +161,14 @@ create table migtest_oto_master ( constraint pk_migtest_oto_master primary key (id) ); -create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); -create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); -create index ix_migtest_fk_cascade_one_id on migtest_fk_cascade (one_id); -alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade; +create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1); +create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5); +create index ix_mgtst_fk_mok1xj on migtest_fk_cascade (one_id); +alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade; -create index ix_migtest_fk_set_null_one_id on migtest_fk_set_null (one_id); -alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null; +create index ix_mgtst_fk_c4p3mv on migtest_fk_set_null (one_id); +alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete set null; -create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id); -alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict; +create index ix_mgtst__bsc_rf_d on migtest_e_basic (eref_id); +alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict; diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql index 27c612f46..605a24af3 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql +++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql @@ -20,31 +20,31 @@ create table migtest_mtm_m_migtest_mtm_c ( alter table migtest_ckey_detail add column one_key integer; alter table migtest_ckey_detail add column two_key varchar(127); -alter table migtest_ckey_detail add constraint fk_migtest_ckey_detail_parent foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict; +alter table migtest_ckey_detail add constraint fk_mgtst_ck_e1qkb5 foreign key (one_key,two_key) references migtest_ckey_parent (one_key,two_key) on delete restrict; alter table migtest_ckey_parent add column assoc_id integer; -alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id; -alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict; -alter table migtest_fk_none add constraint fk_migtest_fk_none_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict; -alter table migtest_fk_none_via_join add constraint fk_migtest_fk_none_via_join_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict; -alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id; -alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete restrict; +alter table migtest_fk_cascade drop constraint fk_mgtst_fk_65kf6l; +alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete restrict; +alter table migtest_fk_none add constraint fk_mgtst_fk_nn_n_d foreign key (one_id) references migtest_fk_one (id) on delete restrict; +alter table migtest_fk_none_via_join add constraint fk_mgtst_fk_9tknzj foreign key (one_id) references migtest_fk_one (id) on delete restrict; +alter table migtest_fk_set_null drop constraint fk_mgtst_fk_wicx8x; +alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete restrict; update migtest_e_basic set status = 'A' where status is null; -alter table migtest_e_basic drop constraint ck_migtest_e_basic_status; +alter table migtest_e_basic drop constraint ck_mgtst__bsc_stts; alter table migtest_e_basic alter column status set default 'A'; alter table migtest_e_basic alter column status set not null; -alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I','?')); -alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2; +alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in ('N','A','I','?')); +alter table migtest_e_basic drop constraint ck_mgtst__b_z543fg; alter table migtest_e_basic alter column status2 varchar(127); alter table migtest_e_basic alter column status2 drop default; alter table migtest_e_basic alter column status2 set null; -- rename all collisions; --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_description unique (description); +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_vs45xo unique (description); insert into migtest_e_user (id) select distinct user_id from migtest_e_basic; -alter table migtest_e_basic add constraint fk_migtest_e_basic_user_id foreign key (user_id) references migtest_e_user (id) on delete restrict; +alter table migtest_e_basic add constraint fk_mgtst__bsc_sr_d foreign key (user_id) references migtest_e_user (id) on delete restrict; alter table migtest_e_basic alter column user_id set null; alter table migtest_e_basic add column new_string_field varchar(255) default 'foo''bar' not null; alter table migtest_e_basic add column new_boolean_field boolean default true not null; @@ -52,16 +52,16 @@ update migtest_e_basic set new_boolean_field = old_boolean; alter table migtest_e_basic add column new_boolean_field2 boolean default true not null; alter table migtest_e_basic add column progress integer default 0 not null; -alter table migtest_e_basic add constraint ck_migtest_e_basic_progress check ( progress in (0,1,2)); +alter table migtest_e_basic add constraint ck_mgtst__b_l39g41 check ( progress in (0,1,2)); alter table migtest_e_basic add column new_integer integer default 42 not null; -alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest2; -alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest6; --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_status_indextest1 unique (status,indextest1); --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_name unique (name); --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest4 unique (indextest4); --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique (indextest5); -alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status; +alter table migtest_e_basic drop constraint uq_mgtst__b_4aybzy; +alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc02; +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_ucfcne unique (status,indextest1); +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__bsc_nm unique (name); +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc00 unique (indextest4); +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc01 unique (indextest5); +alter table migtest_e_enum drop constraint ck_mgtst__n_773sok; comment on column migtest_e_history.test_string is 'Column altered to long now'; alter table migtest_e_history alter column test_string bigint; comment on table migtest_e_history is 'We have history now'; @@ -87,24 +87,24 @@ alter table migtest_e_softdelete add column deleted boolean default false not nu alter table migtest_oto_child add column master_id bigint; -create index ix_migtest_e_basic_indextest3 on migtest_e_basic (indextest3); -create index ix_migtest_e_basic_indextest6 on migtest_e_basic (indextest6); -drop index ix_migtest_e_basic_indextest1; -drop index ix_migtest_e_basic_indextest5; -create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id); -alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict; +create index ix_mgtst__b_eu8css on migtest_e_basic (indextest3); +create index ix_mgtst__b_eu8csv on migtest_e_basic (indextest6); +drop index ix_mgtst__b_eu8csq; +drop index ix_mgtst__b_eu8csu; +create index ix_mgtst_mt_3ug4ok on migtest_mtm_c_migtest_mtm_m (migtest_mtm_c_id); +alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mt_93awga foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict; -create index ix_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id); -alter table migtest_mtm_c_migtest_mtm_m add constraint fk_migtest_mtm_c_migtest_mtm_m_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict; +create index ix_mgtst_mt_3ug4ou on migtest_mtm_c_migtest_mtm_m (migtest_mtm_m_id); +alter table migtest_mtm_c_migtest_mtm_m add constraint fk_mgtst_mt_93awgk foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict; -create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id); -alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_m foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict; +create index ix_mgtst_mt_b7nbcu on migtest_mtm_m_migtest_mtm_c (migtest_mtm_m_id); +alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mt_ggi34k foreign key (migtest_mtm_m_id) references migtest_mtm_m (id) on delete restrict; -create index ix_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id); -alter table migtest_mtm_m_migtest_mtm_c add constraint fk_migtest_mtm_m_migtest_mtm_c_migtest_mtm_c foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict; +create index ix_mgtst_mt_b7nbck on migtest_mtm_m_migtest_mtm_c (migtest_mtm_c_id); +alter table migtest_mtm_m_migtest_mtm_c add constraint fk_mgtst_mt_ggi34a foreign key (migtest_mtm_c_id) references migtest_mtm_c (id) on delete restrict; -create index ix_migtest_ckey_parent_assoc_id on migtest_ckey_parent (assoc_id); -alter table migtest_ckey_parent add constraint fk_migtest_ckey_parent_assoc_id foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict; +create index ix_mgtst_ck_x45o21 on migtest_ckey_parent (assoc_id); +alter table migtest_ckey_parent add constraint fk_mgtst_ck_da00mr foreign key (assoc_id) references migtest_ckey_assoc (id) on delete restrict; -alter table migtest_oto_child add constraint fk_migtest_oto_child_master_id foreign key (master_id) references migtest_oto_master (id) on delete restrict; +alter table migtest_oto_child add constraint fk_mgtst_t__csyl38 foreign key (master_id) references migtest_oto_master (id) on delete restrict; diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql index eaf78b733..9489c8d98 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql +++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql @@ -5,44 +5,44 @@ create table migtest_e_ref ( name varchar(127) not null, constraint pk_migtest_e_ref primary key (id) ); -alter table migtest_e_ref add constraint uq_migtest_e_ref_name unique (name); +alter table migtest_e_ref add constraint uq_mgtst__rf_nm unique (name); -alter table migtest_ckey_detail drop constraint fk_migtest_ckey_detail_parent; -alter table migtest_fk_cascade drop constraint fk_migtest_fk_cascade_one_id; -alter table migtest_fk_cascade add constraint fk_migtest_fk_cascade_one_id foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade; -alter table migtest_fk_none drop constraint fk_migtest_fk_none_one_id; -alter table migtest_fk_none_via_join drop constraint fk_migtest_fk_none_via_join_one_id; -alter table migtest_fk_set_null drop constraint fk_migtest_fk_set_null_one_id; -alter table migtest_fk_set_null add constraint fk_migtest_fk_set_null_one_id foreign key (one_id) references migtest_fk_one (id) on delete set null; -alter table migtest_e_basic drop constraint ck_migtest_e_basic_status; +alter table migtest_ckey_detail drop constraint fk_mgtst_ck_e1qkb5; +alter table migtest_fk_cascade drop constraint fk_mgtst_fk_65kf6l; +alter table migtest_fk_cascade add constraint fk_mgtst_fk_65kf6l foreign key (one_id) references migtest_fk_cascade_one (id) on delete cascade; +alter table migtest_fk_none drop constraint fk_mgtst_fk_nn_n_d; +alter table migtest_fk_none_via_join drop constraint fk_mgtst_fk_9tknzj; +alter table migtest_fk_set_null drop constraint fk_mgtst_fk_wicx8x; +alter table migtest_fk_set_null add constraint fk_mgtst_fk_wicx8x foreign key (one_id) references migtest_fk_one (id) on delete set null; +alter table migtest_e_basic drop constraint ck_mgtst__bsc_stts; alter table migtest_e_basic alter column status drop default; alter table migtest_e_basic alter column status set null; -alter table migtest_e_basic add constraint ck_migtest_e_basic_status check ( status in ('N','A','I')); +alter table migtest_e_basic add constraint ck_mgtst__bsc_stts check ( status in ('N','A','I')); update migtest_e_basic set status2 = 'N' where status2 is null; -alter table migtest_e_basic drop constraint ck_migtest_e_basic_status2; +alter table migtest_e_basic drop constraint ck_mgtst__b_z543fg; alter table migtest_e_basic alter column status2 varchar(1); alter table migtest_e_basic alter column status2 set default 'N'; alter table migtest_e_basic alter column status2 set not null; -alter table migtest_e_basic add constraint ck_migtest_e_basic_status2 check ( status2 in ('N','A','I')); -alter table migtest_e_basic drop constraint uq_migtest_e_basic_description; +alter table migtest_e_basic add constraint ck_mgtst__b_z543fg check ( status2 in ('N','A','I')); +alter table migtest_e_basic drop constraint uq_mgtst__b_vs45xo; update migtest_e_basic set user_id = 23 where user_id is null; -alter table migtest_e_basic drop constraint fk_migtest_e_basic_user_id; +alter table migtest_e_basic drop constraint fk_mgtst__bsc_sr_d; alter table migtest_e_basic alter column user_id set default 23; alter table migtest_e_basic alter column user_id set not null; alter table migtest_e_basic add column old_boolean boolean default false not null; alter table migtest_e_basic add column old_boolean2 boolean; alter table migtest_e_basic add column eref_id integer; -alter table migtest_e_basic drop constraint uq_migtest_e_basic_status_indextest1; -alter table migtest_e_basic drop constraint uq_migtest_e_basic_name; -alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest4; -alter table migtest_e_basic drop constraint uq_migtest_e_basic_indextest5; --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest2 unique (indextest2); --- NOT SUPPORTED alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest6 unique (indextest6); -alter table migtest_e_enum drop constraint ck_migtest_e_enum_test_status; -alter table migtest_e_enum add constraint ck_migtest_e_enum_test_status check ( test_status in ('N','A','I')); +alter table migtest_e_basic drop constraint uq_mgtst__b_ucfcne; +alter table migtest_e_basic drop constraint uq_mgtst__bsc_nm; +alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc00; +alter table migtest_e_basic drop constraint uq_mgtst__b_4ayc01; +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4aybzy unique (indextest2); +-- NOT SUPPORTED alter table migtest_e_basic add constraint uq_mgtst__b_4ayc02 unique (indextest6); +alter table migtest_e_enum drop constraint ck_mgtst__n_773sok; +alter table migtest_e_enum add constraint ck_mgtst__n_773sok check ( test_status in ('N','A','I')); comment on column migtest_e_history.test_string is ''; comment on table migtest_e_history is ''; alter table migtest_e_history2 alter column test_string drop default; @@ -58,10 +58,10 @@ alter table migtest_e_history6 alter column test_number1 set null; update migtest_e_history6 set test_number2 = 7 where test_number2 is null; alter table migtest_e_history6 alter column test_number2 set default 7; alter table migtest_e_history6 alter column test_number2 set not null; -create index ix_migtest_e_basic_indextest1 on migtest_e_basic (indextest1); -create index ix_migtest_e_basic_indextest5 on migtest_e_basic (indextest5); -drop index ix_migtest_e_basic_indextest3; -drop index ix_migtest_e_basic_indextest6; -create index ix_migtest_e_basic_eref_id on migtest_e_basic (eref_id); -alter table migtest_e_basic add constraint fk_migtest_e_basic_eref_id foreign key (eref_id) references migtest_e_ref (id) on delete restrict; +create index ix_mgtst__b_eu8csq on migtest_e_basic (indextest1); +create index ix_mgtst__b_eu8csu on migtest_e_basic (indextest5); +drop index ix_mgtst__b_eu8css; +drop index ix_mgtst__b_eu8csv; +create index ix_mgtst__bsc_rf_d on migtest_e_basic (eref_id); +alter table migtest_e_basic add constraint fk_mgtst__bsc_rf_d foreign key (eref_id) references migtest_e_ref (id) on delete restrict; diff --git a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations index 5c3f38243..ec4208068 100644 --- a/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations +++ b/ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations @@ -1,6 +1,6 @@ --904775387, 1.0__initial.sql -1360307269, 1.1.sql +441570368, 1.0__initial.sql +-94595879, 1.1.sql 578073685, 1.2__dropsFor_1.1.sql --671695671, 1.3.sql +-509420890, 1.3.sql -1475628451, 1.4__dropsFor_1.3.sql From dd43fe4db37d58090f20dde4771dcdec3fb2904a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 15 Dec 2021 21:49:34 +1300 Subject: [PATCH 16/41] Update pom in ebean-kotlin empty module to use java 1.8 --- ebean-kotlin/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 53d2f8cd4..22fafea6c 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -12,8 +12,8 @@ ebean-kotlin - 11 - 11 + 1.8 + 1.8 12.13.0 1.6.0 @@ -68,7 +68,7 @@ kotlin-maven-plugin ${kotlin.version} - 11 + 1.8 From 1a6a426683a36a3740acbe8d9ef939cb1e489522 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 10:43:27 +1300 Subject: [PATCH 17/41] #2458 - Add BeanPersistController.isCascade() to identify cascade vs "top level" persist requests --- .../io/ebean/event/BeanPersistRequest.java | 6 ++ .../server/core/PersistRequestBean.java | 5 ++ .../basic/event/TestPreInsertValidation.java | 38 +++++++++++- .../org/tests/model/basic/TWithPreInsert.java | 26 ++++++++- .../model/basic/TWithPreInsertChild.java | 58 +++++++++++++++++++ .../model/basic/TWithPreInsertCommon.java | 14 +++++ .../event/TWithPreInsertPersistAdapter.java | 25 ++++---- 7 files changed, 154 insertions(+), 18 deletions(-) create mode 100644 ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java create mode 100644 ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java diff --git a/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java b/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java index 57930a107..2f3198b65 100644 --- a/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java +++ b/ebean-api/src/main/java/io/ebean/event/BeanPersistRequest.java @@ -43,6 +43,12 @@ public interface BeanPersistRequest { return transaction(); } + /** + * Return true if this request is due to cascading persist. + * False implies this is a "top level" request. + */ + boolean isCascade(); + /** * For an update or delete of a partially populated bean this is the set of * loaded properties and otherwise returns null. 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 dc14a15ae..2fbf362ee 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 @@ -213,6 +213,11 @@ public final class PersistRequestBean extends PersistRequest implements BeanP return beanDescriptor.docStoreMode(type, txnMode); } + @Override + public boolean isCascade() { + return Flags.isRecurse(flags); + } + /** * Return true if the draftDirty property should be set to true for this request. */ diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index 54f26782e..c67e63c4a 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -5,13 +5,15 @@ import io.ebean.BaseTestCase; import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TWithPreInsert; +import org.tests.model.basic.TWithPreInsertChild; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; -public class TestPreInsertValidation extends BaseTestCase { +class TestPreInsertValidation extends BaseTestCase { @Test - public void test() { + void test() { TWithPreInsert e = new TWithPreInsert(); e.setTitle("Mister"); @@ -22,15 +24,45 @@ public class TestPreInsertValidation extends BaseTestCase { // the save worked and name set in preInsert assertNotNull(e.getId()); assertNotNull(e.getName()); + assertThat(e.requestCascadeState()).isEqualTo(2); TWithPreInsert e1 = DB.find(TWithPreInsert.class, e.getId()); e1.setTitle("Missus"); DB.save(e1); + + assertThat(e1.requestCascadeState()).isEqualTo(12); } @Test - public void testStatelessUpdate() { + void test_cascade() { + + TWithPreInsert e = new TWithPreInsert(); + e.setTitle("ParentCascading"); + e.children().add(new TWithPreInsertChild("Child0")); + // the perInsert should populate the + // name with should not be null + DB.save(e); + + // the save worked and name set in preInsert + assertNotNull(e.getId()); + assertNotNull(e.getName()); + assertThat(e.requestCascadeState()).isEqualTo(2); + assertThat(e.children().get(0).requestCascadeState()).isEqualTo(1); + + TWithPreInsert e1 = DB.find(TWithPreInsert.class, e.getId()); + assert e1 != null; + + e1.setTitle("ParentCascading-changed"); + e1.children().get(0).setName("Child0-changed"); + DB.save(e1); + + assertThat(e1.requestCascadeState()).isEqualTo(12); + assertThat(e1.children().get(0).requestCascadeState()).isEqualTo(11); + } + + @Test + void testStatelessUpdate() { TWithPreInsert e = new TWithPreInsert(); e.setName("BeanForUpdateTest"); 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 f93378240..21398bc7a 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 @@ -2,10 +2,15 @@ package org.tests.model.basic; import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.OneToMany; import javax.validation.constraints.NotNull; +import java.util.ArrayList; +import java.util.List; + +import static javax.persistence.CascadeType.PERSIST; @Entity -public class TWithPreInsert { +public class TWithPreInsert implements TWithPreInsertCommon { @Id private Integer id; @@ -15,6 +20,14 @@ public class TWithPreInsert { private String title; + @OneToMany(cascade = PERSIST) + private List children = new ArrayList<>(); + + /** + * For testing what happened in persist controller. + */ + transient int requestCascadeState; + public Integer getId() { return id; } @@ -39,4 +52,15 @@ public class TWithPreInsert { this.title = title; } + public List children() { + return children; + } + + public int requestCascadeState() { + return requestCascadeState; + } + + public void requestCascadeState(int requestCascadeState) { + this.requestCascadeState = requestCascadeState; + } } 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 new file mode 100644 index 000000000..39a1d8dff --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertChild.java @@ -0,0 +1,58 @@ +package org.tests.model.basic; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.validation.constraints.NotNull; + +@Entity +public class TWithPreInsertChild implements TWithPreInsertCommon { + + @Id + private Integer id; + + @NotNull + private String name; + + private String title; + + /** + * For testing what happened in persist controller. + */ + transient int requestCascadeState; + + public TWithPreInsertChild(String name) { + this.name = name; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public int requestCascadeState() { + return requestCascadeState; + } + + public void requestCascadeState(int requestCascadeState) { + this.requestCascadeState = requestCascadeState; + } +} diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java new file mode 100644 index 000000000..dc61e28ba --- /dev/null +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java @@ -0,0 +1,14 @@ +package org.tests.model.basic; + +public interface TWithPreInsertCommon { + + String getName(); + + void setName(String name); + + String getTitle(); + + void setTitle(String title); + + void requestCascadeState(int requestCascadeState); +} diff --git a/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java index 41b6fe141..03143d385 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java +++ b/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java @@ -2,36 +2,33 @@ package org.tests.model.basic.event; import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; -import org.tests.model.basic.TWithPreInsert; +import org.tests.model.basic.TWithPreInsertCommon; public class TWithPreInsertPersistAdapter extends BeanPersistAdapter { @Override public boolean isRegisterFor(Class cls) { - return TWithPreInsert.class.equals(cls); + return TWithPreInsertCommon.class.isAssignableFrom(cls); } @Override public boolean preInsert(BeanPersistRequest request) { - - TWithPreInsert e = (TWithPreInsert) request.bean(); - if (e.getName() == null) { - e.setName("set on preInsert"); + TWithPreInsertCommon bean = (TWithPreInsertCommon) request.bean(); + if (bean.getName() == null) { + bean.setName("set on preInsert"); } + bean.requestCascadeState(request.isCascade() ? 1 : 2); return true; } @Override public boolean preUpdate(BeanPersistRequest request) { - - TWithPreInsert b = (TWithPreInsert) request.bean(); - System.out.println("preUpdate - title is: " + b.getTitle()); - if (b.getTitle() == null) { - b.setTitle("set on preUpdate"); + TWithPreInsertCommon bean = (TWithPreInsertCommon) request.bean(); + System.out.println("preUpdate - title is: " + bean.getTitle()); + if (bean.getTitle() == null) { + bean.setTitle("set on preUpdate"); } - // request.getEbeanServer().refresh(b); - // System.out.println("title is Mister:"+b.getTitle()); - + bean.requestCascadeState(request.isCascade() ? 11 : 12); return super.preUpdate(request); } From ca6e3963dbc37a239d9942c97b2695f00d1b5185 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 17:26:36 +1300 Subject: [PATCH 18/41] [maven-release-plugin] prepare release ebean-parent-12.13.2 --- ebean-api/pom.xml | 2 +- ebean-api/pom.xml.releaseBackup | 130 +++++++++ ebean-autotune/pom.xml | 6 +- ebean-autotune/pom.xml.releaseBackup | 74 +++++ ebean-bom/pom.xml | 30 +- ebean-bom/pom.xml.releaseBackup | 162 +++++++++++ ebean-core-type/pom.xml | 4 +- ebean-core-type/pom.xml.releaseBackup | 46 +++ ebean-core/pom.xml | 10 +- ebean-core/pom.xml.releaseBackup | 247 +++++++++++++++++ ebean-ddl-generator/pom.xml | 6 +- ebean-ddl-generator/pom.xml.releaseBackup | 106 +++++++ ebean-externalmapping-api/pom.xml | 2 +- .../pom.xml.releaseBackup | 30 ++ ebean-externalmapping-xml/pom.xml | 10 +- .../pom.xml.releaseBackup | 100 +++++++ ebean-postgis/pom.xml | 6 +- ebean-postgis/pom.xml.releaseBackup | 118 ++++++++ ebean-querybean/pom.xml | 10 +- ebean-querybean/pom.xml.releaseBackup | 112 ++++++++ ebean-redis/pom.xml | 12 +- ebean-redis/pom.xml.releaseBackup | 93 +++++++ ebean-test/pom.xml | 6 +- ebean-test/pom.xml.releaseBackup | 261 ++++++++++++++++++ ebean/pom.xml | 8 +- ebean/pom.xml.releaseBackup | 58 ++++ kotlin-querybean-generator/pom.xml | 8 +- .../pom.xml.releaseBackup | 186 +++++++++++++ pom.xml | 4 +- pom.xml.releaseBackup | 114 ++++++++ querybean-generator/pom.xml | 2 +- querybean-generator/pom.xml.releaseBackup | 52 ++++ release.properties | 83 ++++++ 33 files changed, 2035 insertions(+), 63 deletions(-) create mode 100644 ebean-api/pom.xml.releaseBackup create mode 100644 ebean-autotune/pom.xml.releaseBackup create mode 100644 ebean-bom/pom.xml.releaseBackup create mode 100644 ebean-core-type/pom.xml.releaseBackup create mode 100644 ebean-core/pom.xml.releaseBackup create mode 100644 ebean-ddl-generator/pom.xml.releaseBackup create mode 100644 ebean-externalmapping-api/pom.xml.releaseBackup create mode 100644 ebean-externalmapping-xml/pom.xml.releaseBackup create mode 100644 ebean-postgis/pom.xml.releaseBackup create mode 100644 ebean-querybean/pom.xml.releaseBackup create mode 100644 ebean-redis/pom.xml.releaseBackup create mode 100644 ebean-test/pom.xml.releaseBackup create mode 100644 ebean/pom.xml.releaseBackup create mode 100644 kotlin-querybean-generator/pom.xml.releaseBackup create mode 100644 pom.xml.releaseBackup create mode 100644 querybean-generator/pom.xml.releaseBackup create mode 100644 release.properties diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 1e711bc62..f6b63036c 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean api diff --git a/ebean-api/pom.xml.releaseBackup b/ebean-api/pom.xml.releaseBackup new file mode 100644 index 000000000..1e711bc62 --- /dev/null +++ b/ebean-api/pom.xml.releaseBackup @@ -0,0 +1,130 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean api + ebean api + ebean-api + + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + io.avaje + avaje-config + 1.5 + + + + + io.avaje + avaje-lang + 1.0 + + + + io.ebean + persistence-api + 2.2.5 + + + + io.ebean + ebean-annotation + 7.3 + + + + io.ebean + ebean-types + 2.2 + + + + io.ebean + ebean-datasource-api + ${ebean-datasource.version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + true + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + true + + + + + com.h2database + h2 + 1.4.199 + true + + + + javax.transaction + jta + 1.1 + true + + + + javax.servlet + javax.servlet-api + 3.1.0 + true + + + + io.avaje + junit + 1.0 + test + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.avaje.tile:moditech-module:1.0 + + + + + + diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index dc7b6c0ac..f50aa503e 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.13.2 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 provided diff --git a/ebean-autotune/pom.xml.releaseBackup b/ebean-autotune/pom.xml.releaseBackup new file mode 100644 index 000000000..dc7b6c0ac --- /dev/null +++ b/ebean-autotune/pom.xml.releaseBackup @@ -0,0 +1,74 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + + + + + + + scm:git:git@github.com:ebean-orm/ebean.git + HEAD + + + ebean autotune + ebean automatic query tuning module + ebean-autotune + + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + provided + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + provided + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + io.avaje.tile:moditech-module:1.0 + + + + + + + diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 417420c68..9f8cd588d 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-api - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-core-type - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-ddl-generator - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-externalmapping-api - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-externalmapping-xml - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-autotune - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-querybean - 12.13.2-SNAPSHOT + 12.13.2 io.ebean querybean-generator - 12.13.2-SNAPSHOT + 12.13.2 provided io.ebean kotlin-querybean-generator - 12.13.2-SNAPSHOT + 12.13.2 provided io.ebean ebean-test - 12.13.2-SNAPSHOT + 12.13.2 test io.ebean ebean-postgis - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-redis - 12.13.2-SNAPSHOT + 12.13.2 diff --git a/ebean-bom/pom.xml.releaseBackup b/ebean-bom/pom.xml.releaseBackup new file mode 100644 index 000000000..417420c68 --- /dev/null +++ b/ebean-bom/pom.xml.releaseBackup @@ -0,0 +1,162 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean bom + ebean bill of materials pom + ebean-bom + pom + + + + + + + + + io.ebean + ebean-ddl-runner + ${ebean-ddl-runner.version} + + + + io.ebean + ebean-migration-auto + ${ebean-migration-auto.version} + + + + io.ebean + ebean-migration + ${ebean-migration.version} + + + + io.ebean + ebean-datasource-api + ${ebean-datasource.version} + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + + + + io.ebean + ebean-agent + ${ebean-agent.version} + + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + + io.ebean + ebean-test-docker + ${ebean-test-docker.version} + + + + + + io.ebean + ebean + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-api + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-core-type + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-ddl-generator + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-externalmapping-api + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-externalmapping-xml + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-autotune + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-querybean + 12.13.2-SNAPSHOT + + + + io.ebean + querybean-generator + 12.13.2-SNAPSHOT + provided + + + + io.ebean + kotlin-querybean-generator + 12.13.2-SNAPSHOT + provided + + + + io.ebean + ebean-test + 12.13.2-SNAPSHOT + test + + + + io.ebean + ebean-postgis + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-redis + 12.13.2-SNAPSHOT + + + + + + + diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 3d3e11a75..c1b475b76 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.13.2-SNAPSHOT + 12.13.2 diff --git a/ebean-core-type/pom.xml.releaseBackup b/ebean-core-type/pom.xml.releaseBackup new file mode 100644 index 000000000..3d3e11a75 --- /dev/null +++ b/ebean-core-type/pom.xml.releaseBackup @@ -0,0 +1,46 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean-core-type + ebean core type + ebean scalar types api + + + + + io.ebean + ebean-api + 12.13.2-SNAPSHOT + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + true + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.avaje.tile:moditech-module:1.0 + + + + + + diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index b250f7a0a..eff86103b 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.13.2 @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-core-type - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-externalmapping-api - 12.13.2-SNAPSHOT + 12.13.2 diff --git a/ebean-core/pom.xml.releaseBackup b/ebean-core/pom.xml.releaseBackup new file mode 100644 index 000000000..b250f7a0a --- /dev/null +++ b/ebean-core/pom.xml.releaseBackup @@ -0,0 +1,247 @@ + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean-core + jar + + ebean core + ebean core module + https://ebean.io/ + + + scm:git:git@github.com:ebean-orm/ebean.git + HEAD + + + + + + io.ebean + ebean-ddl-runner + 1.2 + + + + io.avaje + classpath-scanner + 6.2 + + + + io.ebean + ebean-migration-auto + 1.1 + + + + io.ebean + ebean-api + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-core-type + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-externalmapping-api + 12.13.2-SNAPSHOT + + + + org.antlr + antlr4-runtime + 4.8-1 + + + + + io.avaje + avaje-jsr305-x + 1.1 + provided + + + + + com.h2database + h2 + 1.4.199 + provided + + + + javax.transaction + javax.transaction-api + 1.3 + true + + + + + javax.validation + validation-api + 2.0.1.Final + true + + + jakarta.validation + jakarta.validation-api + 3.0.0 + true + + + + joda-time + joda-time + 2.9.7 + true + + + + + + + + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + true + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + true + + + + + org.postgresql + postgresql + 42.2.24 + true + + + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + test + process-test-classes + + debug=0 + + + testEnhance + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M4 + + false + false + false + + **/Test*.java + **/*Test.java + **/*Tests.java + + + + + datasource.default + ${datasource.default} + + + + dbClockDelta + ${dbClockDelta} + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + Ebean 12 + src/main/java/io/ebean/overview.html + io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform + true + src/main/java/com/avaje/ebean/overview.html + + + + attach-javadocs + + jar + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.avaje.tile:moditech-module:1.0 + + + + + + + + + diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index fc0e83a5f..9ccda7ce6 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.13.2-SNAPSHOT + 12.13.2 provided io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 provided diff --git a/ebean-ddl-generator/pom.xml.releaseBackup b/ebean-ddl-generator/pom.xml.releaseBackup new file mode 100644 index 000000000..fc0e83a5f --- /dev/null +++ b/ebean-ddl-generator/pom.xml.releaseBackup @@ -0,0 +1,106 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean ddl generation + DDL and DB Migration generation + ebean-ddl-generator + + + + + io.ebean + ebean-ddl-runner + 1.2 + + + + io.ebean + ebean-migration + 12.12.1 + + + + io.ebean + ebean-core-type + 12.13.2-SNAPSHOT + provided + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + provided + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + provided + + + + + io.avaje + junit + 1.0 + test + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + javax.validation + validation-api + 2.0.1.Final + test + + + + + + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + test + process-test-classes + + debug=0 + + + testEnhance + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.avaje.tile:moditech-module:1.0 + + + + + + diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 72278f50b..0369dc1e6 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean external mapping api diff --git a/ebean-externalmapping-api/pom.xml.releaseBackup b/ebean-externalmapping-api/pom.xml.releaseBackup new file mode 100644 index 000000000..72278f50b --- /dev/null +++ b/ebean-externalmapping-api/pom.xml.releaseBackup @@ -0,0 +1,30 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean external mapping api + API for mapping external named queries + ebean-externalmapping-api + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.avaje.tile:moditech-module:1.0 + + + + + + + diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 8155aa728..d9a75a7ac 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.13.2 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.13.2-SNAPSHOT + 12.13.2 @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 test io.ebean ebean-ddl-generator - 12.13.2-SNAPSHOT + 12.13.2 test diff --git a/ebean-externalmapping-xml/pom.xml.releaseBackup b/ebean-externalmapping-xml/pom.xml.releaseBackup new file mode 100644 index 000000000..8155aa728 --- /dev/null +++ b/ebean-externalmapping-xml/pom.xml.releaseBackup @@ -0,0 +1,100 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + + + + + + + scm:git:git@github.com:ebean-orm/ebean.git + HEAD + + + ebean external mapping xml + XML implementation for mapping external named queries + ebean-externalmapping-xml + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + io.ebean + ebean-externalmapping-api + 12.13.2-SNAPSHOT + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + + io.avaje + classpath-scanner + 6.2 + + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + test + + + + io.ebean + ebean-ddl-generator + 12.13.2-SNAPSHOT + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + + io.ebean.tile:enhancement:12.11.3 + io.avaje.tile:moditech-module:1.0 + + + + + + + diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 3d1fa16d0..759c0af54 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.13.2-SNAPSHOT + 12.13.2 test diff --git a/ebean-postgis/pom.xml.releaseBackup b/ebean-postgis/pom.xml.releaseBackup new file mode 100644 index 000000000..3d1fa16d0 --- /dev/null +++ b/ebean-postgis/pom.xml.releaseBackup @@ -0,0 +1,118 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean postgis + ebean postgis module + https://ebean.io/ + + ebean-postgis + + + 2.2.1 + + + + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + provided + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + true + + + + net.postgis + postgis-jdbc + [${postgis.jdbc.version}] + + + + + org.postgresql + postgresql + 42.2.24 + provided + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + + org.geolatte + geolatte-geom + 1.0.6 + provided + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.ebean + ebean-test + 12.13.2-SNAPSHOT + test + + + + org.avaje.composite + logback + 1.1 + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + io.avaje.tile:moditech-module:1.0 + + + + + + + + + diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 5ed7e1669..9340993b6 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.13.2-SNAPSHOT + 12.13.2 test io.ebean querybean-generator - 12.13.2-SNAPSHOT + 12.13.2 test io.ebean ebean-test - 12.13.2-SNAPSHOT + 12.13.2 test diff --git a/ebean-querybean/pom.xml.releaseBackup b/ebean-querybean/pom.xml.releaseBackup new file mode 100644 index 000000000..5ed7e1669 --- /dev/null +++ b/ebean-querybean/pom.xml.releaseBackup @@ -0,0 +1,112 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean querybean + Ebean querybean support + ebean-querybean + + + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + provided + + + + + io.avaje + avaje-lang + 1.0 + + + + joda-time + joda-time + 1.6 + true + + + + javax.validation + validation-api + 2.0.1.Final + true + + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.ebean + ebean-ddl-generator + 12.13.2-SNAPSHOT + test + + + + io.ebean + querybean-generator + 12.13.2-SNAPSHOT + test + + + + io.ebean + ebean-test + 12.13.2-SNAPSHOT + test + + + + io.avaje + junit + 1.0 + test + + + + org.avaje.composite + logback + 1.1 + test + + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + io.avaje.tile:moditech-module:1.0 + + + + + + + + diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 7ada5696b..028ccbca9 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.13.2-SNAPSHOT + 12.13.2 provided io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 provided io.ebean ebean-querybean - 12.13.2-SNAPSHOT + 12.13.2 test io.ebean querybean-generator - 12.13.2-SNAPSHOT + 12.13.2 test io.ebean ebean-test - 12.13.2-SNAPSHOT + 12.13.2 test diff --git a/ebean-redis/pom.xml.releaseBackup b/ebean-redis/pom.xml.releaseBackup new file mode 100644 index 000000000..7ada5696b --- /dev/null +++ b/ebean-redis/pom.xml.releaseBackup @@ -0,0 +1,93 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean-redis + ebean redis + Ebean Redis L2 Cache + + + + + redis.clients + jedis + 3.6.3 + + + + io.ebean + ebean-api + 12.13.2-SNAPSHOT + provided + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + provided + + + + io.ebean + ebean-querybean + 12.13.2-SNAPSHOT + test + + + + io.ebean + querybean-generator + 12.13.2-SNAPSHOT + test + + + + io.ebean + ebean-test + 12.13.2-SNAPSHOT + test + + + + io.avaje + junit + 1.0 + test + + + + org.avaje.composite + logback + 1.1 + test + + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + io.avaje.tile:moditech-module:1.0 + + + + + + + + + diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index b015a4544..54b5de4c0 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 provided io.ebean ebean-ddl-generator - 12.13.2-SNAPSHOT + 12.13.2 diff --git a/ebean-test/pom.xml.releaseBackup b/ebean-test/pom.xml.releaseBackup new file mode 100644 index 000000000..b015a4544 --- /dev/null +++ b/ebean-test/pom.xml.releaseBackup @@ -0,0 +1,261 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean test + Testing support for Ebean + ebean-test + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + provided + + + + io.ebean + ebean-ddl-generator + 12.13.2-SNAPSHOT + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + true + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + true + + + + io.ebean + ebean-test-docker + 4.3 + + + + org.assertj + assertj-core + 3.14.0 + + + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + + + + + com.h2database + h2 + 1.4.199 + + + + + + io.avaje + avaje-jsr305 + 1.1 + test + + + + io.ebean + ebean-migration + 12.12.1 + test + + + + io.avaje + mod-uuid + 1.1 + test + + + + javax.transaction + jta + 1.1 + test + + + + + javax.validation + validation-api + 2.0.1.Final + test + + + + jakarta.validation + jakarta.validation-api + 3.0.0 + test + + + + joda-time + joda-time + 2.9.7 + test + + + + javax.annotation + javax.annotation-api + 1.3.2 + test + + + commons-io + commons-io + 2.7 + test + + + + org.postgresql + postgresql + 42.2.24 + + + org.checkerframework + checker-qual + + + test + + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.0.jre8 + test + + + + mysql + mysql-connector-java + 8.0.26 + test + + + + org.mariadb.jdbc + mariadb-java-client + 2.6.0 + test + + + + com.sap.cloud.db.jdbc + ngdbc + 2.3.48 + test + + + + com.oracle.database.jdbc + + ojdbc8 + 19.12.0.0 + test + + + + com.ibm.db2 + jcc + 11.5.6.0 + test + + + + org.xerial + sqlite-jdbc + 3.36.0.3 + test + + + + com.nuodb.jdbc + nuodb-jdbc + 22.0.0 + test + + + + ru.yandex.clickhouse + clickhouse-jdbc + 0.3.1-patch + test + + + + ch.qos.logback + logback-classic + 1.2.3 + test + + + + io.avaje + junit + 1.0 + test + + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.ebean.tile:enhancement:12.11.3 + io.avaje.tile:moditech-module:1.0 + + + + + + + + diff --git a/ebean/pom.xml b/ebean/pom.xml index bf039e209..844f9b03d 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 io.ebean ebean-querybean - 12.13.2-SNAPSHOT + 12.13.2 diff --git a/ebean/pom.xml.releaseBackup b/ebean/pom.xml.releaseBackup new file mode 100644 index 000000000..bf039e209 --- /dev/null +++ b/ebean/pom.xml.releaseBackup @@ -0,0 +1,58 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + ebean composite + Composite of common runtime dependencies + ebean + + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + + + + io.ebean + ebean-api + 12.13.2-SNAPSHOT + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + + + + + io.ebean + ebean-querybean + 12.13.2-SNAPSHOT + + + + + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.avaje.tile:moditech-module:1.0 + + + + + + diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 0be3286f4..ceb50bece 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.13.2-SNAPSHOT + 12.13.2 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.2 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.13.2-SNAPSHOT + 12.13.2 test diff --git a/kotlin-querybean-generator/pom.xml.releaseBackup b/kotlin-querybean-generator/pom.xml.releaseBackup new file mode 100644 index 000000000..0be3286f4 --- /dev/null +++ b/kotlin-querybean-generator/pom.xml.releaseBackup @@ -0,0 +1,186 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + kotlin querybean generator + Generates Kotlin querybeans + kotlin-querybean-generator + + + 1.6.0 + + + + + + + + io.avaje + junit + 1.0 + test + + + + io.ebean + ebean-querybean + 12.13.2-SNAPSHOT + test + + + + io.ebean + ebean-datasource + ${ebean-datasource.version} + test + + + + io.ebean + ebean-core + 12.13.2-SNAPSHOT + test + + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin.version} + provided + + + + org.jetbrains.kotlin + kotlin-test + ${kotlin.version} + test + + + + io.ebean + ebean-ddl-generator + 12.13.2-SNAPSHOT + test + + + + javax.validation + validation-api + 2.0.1.Final + test + + + + + + + src/test/kotlin + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + test-compile + test-compile + + test-compile + + + + test-kapt + + test-kapt + + + + src/test/kotlin + + + + io.ebean + kotlin-querybean-generator + 12.8.2 + + + + + + compile + compile + + compile + + + + src/main/java + target/generated-sources/kapt/test + target/generated-sources/kaptKotlin/test + + + + + + 1.8 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + + default-testCompile + none + + + java-test-compile + test-compile + + testCompile + + + + compile + compile + + compile + + + + + 1.8 + 1.8 + + -proc:none + + + + + io.ebean + ebean-maven-plugin + ${ebean-maven-plugin.version} + + + test + process-test-classes + + debug=1 + + + testEnhance + + + + + + + + + diff --git a/pom.xml b/pom.xml index ba0c11c58..7199421e1 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.13.2-SNAPSHOT + 12.13.2 pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.13.2 diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup new file mode 100644 index 000000000..ba0c11c58 --- /dev/null +++ b/pom.xml.releaseBackup @@ -0,0 +1,114 @@ + + + 4.0.0 + + org.avaje + java8-oss + 3.2 + + + io.ebean + ebean-parent + 12.13.2-SNAPSHOT + pom + + ebean parent + Parent for ebean modules + https://ebean.io/ + + + scm:git:git@github.com:ebean-orm/ebean.git + HEAD + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + rbygrave + Rob Bygrave + robin.bygrave@gmail.com + + + + + false + 2.12.1 + 1.2 + 1.1 + 12.12.1 + 4.2 + 7.3 + 12.13.0 + 12.13.0 + + + + + + org.slf4j + slf4j-api + 1.7.30 + provided + + + + ch.qos.logback + logback-classic + 1.2.3 + test + + + + com.h2database + h2 + 1.4.199 + test + + + + + + ebean + ebean-api + ebean-bom + ebean-core-type + ebean-core + ebean-ddl-generator + ebean-autotune + ebean-externalmapping-api + ebean-externalmapping-xml + ebean-test + querybean-generator + kotlin-querybean-generator + ebean-querybean + ebean-postgis + ebean-redis + + + + + + + release + + + default + + true + + + ebean-kotlin + tests + + + + + + diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index d61f1d143..99712a4d7 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.2 querybean generator diff --git a/querybean-generator/pom.xml.releaseBackup b/querybean-generator/pom.xml.releaseBackup new file mode 100644 index 000000000..d61f1d143 --- /dev/null +++ b/querybean-generator/pom.xml.releaseBackup @@ -0,0 +1,52 @@ + + + 4.0.0 + + ebean-parent + io.ebean + 12.13.2-SNAPSHOT + + + querybean generator + Querybean generator + querybean-generator + + + + + io.avaje + junit + 1.0 + test + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.2 + + 1.8 + 1.8 + + -proc:none + + + + io.repaint.maven + tiles-maven-plugin + 2.24 + true + + + io.avaje.tile:moditech-module:1.0 + + + + + + + diff --git a/release.properties b/release.properties new file mode 100644 index 000000000..e846a5665 --- /dev/null +++ b/release.properties @@ -0,0 +1,83 @@ +#release configuration +#Fri Dec 17 17:24:24 NZDT 2021 +projectVersionPolicyId=default +project.scm.io.ebean\:ebean-core-type.tag=HEAD +scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} +project.rel.io.ebean\:ebean-ddl-generator=12.13.2 +project.dev.io.ebean\:ebean-core=12.13.3-SNAPSHOT +project.scm.io.ebean\:ebean-api.tag=HEAD +project.scm.io.ebean\:ebean-redis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-querybean.tag=HEAD +project.scm.io.ebean\:ebean-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.dev.io.ebean\:ebean-api=12.13.3-SNAPSHOT +project.rel.io.ebean\:ebean=12.13.2 +project.dev.io.ebean\:ebean-core-type=12.13.3-SNAPSHOT +project.scm.io.ebean\:ebean-ddl-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +exec.activateProfiles=release +project.dev.io.ebean\:ebean-test=12.13.3-SNAPSHOT +project.scm.io.ebean\:kotlin-querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-querybean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-bom.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-core.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.rel.io.ebean\:ebean-core-type=12.13.2 +project.rel.io.ebean\:kotlin-querybean-generator=12.13.2 +project.dev.io.ebean\:querybean-generator=12.13.3-SNAPSHOT +project.scm.io.ebean\:ebean-autotune.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +scm.commentPrefix=[maven-release-plugin] +releaseStrategyId=default +project.rel.io.ebean\:ebean-querybean=12.13.2 +project.scm.io.ebean\:ebean-externalmapping-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.dev.io.ebean\:kotlin-querybean-generator=12.13.3-SNAPSHOT +project.scm.io.ebean\:ebean-core-type.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +completedPhase=generate-release-poms +project.rel.io.ebean\:ebean-redis=12.13.2 +project.scm.io.ebean\:ebean-test.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.scm.io.ebean\:ebean-postgis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.dev.io.ebean\:ebean-autotune=12.13.3-SNAPSHOT +project.rel.io.ebean\:ebean-api=12.13.2 +project.scm.io.ebean\:ebean-postgis.tag=HEAD +project.scm.io.ebean\:querybean-generator.tag=HEAD +project.rel.io.ebean\:querybean-generator=12.13.2 +scm.tag=ebean-parent-12.13.2 +project.rel.io.ebean\:ebean-externalmapping-xml=12.13.2 +project.scm.io.ebean\:ebean-ddl-generator.tag=HEAD +project.rel.io.ebean\:ebean-externalmapping-api=12.13.2 +project.scm.io.ebean\:ebean-externalmapping-xml.tag=HEAD +preparationGoals=clean verify +exec.pomFileName=pom.xml +project.dev.io.ebean\:ebean-externalmapping-api=12.13.3-SNAPSHOT +project.dev.io.ebean\:ebean=12.13.3-SNAPSHOT +project.scm.io.ebean\:ebean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.dev.io.ebean\:ebean-parent=12.13.3-SNAPSHOT +project.dev.io.ebean\:ebean-externalmapping-xml=12.13.3-SNAPSHOT +project.rel.io.ebean\:ebean-core=12.13.2 +project.dev.io.ebean\:ebean-redis=12.13.3-SNAPSHOT +project.dev.io.ebean\:ebean-postgis=12.13.3-SNAPSHOT +project.scm.io.ebean\:ebean-redis.tag=HEAD +project.scm.io.ebean\:ebean-parent.tag=HEAD +pushChanges=true +project.scm.io.ebean\:ebean-externalmapping-xml.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +project.rel.io.ebean\:ebean-test=12.13.2 +project.scm.io.ebean\:kotlin-querybean-generator.tag=HEAD +project.scm.io.ebean\:ebean-bom.tag=HEAD +project.scm.io.ebean\:ebean-autotune.tag=HEAD +project.scm.io.ebean\:ebean.tag=HEAD +project.scm.io.ebean\:ebean-core.tag=HEAD +project.rel.io.ebean\:ebean-autotune=12.13.2 +scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} +remoteTagging=true +project.dev.io.ebean\:ebean-bom=12.13.3-SNAPSHOT +project.dev.io.ebean\:ebean-querybean=12.13.3-SNAPSHOT +project.rel.io.ebean\:ebean-bom=12.13.2 +project.scm.io.ebean\:ebean-parent.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git +scm.url=scm\:git\:git@github.com\:ebean-orm/ebean.git +scm.developmentCommitComment=@{prefix} prepare for next development iteration +project.scm.io.ebean\:ebean-externalmapping-api.tag=HEAD +scm.tagNameFormat=@{project.artifactId}-@{project.version} +project.scm.io.ebean\:ebean-test.tag=HEAD +project.dev.io.ebean\:ebean-ddl-generator=12.13.3-SNAPSHOT +exec.snapshotReleasePluginAllowed=false +scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} +project.rel.io.ebean\:ebean-postgis=12.13.2 +project.rel.io.ebean\:ebean-parent=12.13.2 From 5fddc37037c2ff0362fa987aa90afe3e4867eee2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 17:26:43 +1300 Subject: [PATCH 19/41] [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 f6b63036c..a27749023 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index f50aa503e..5f01ea3cd 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.13.2 + HEAD ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 9f8cd588d..de70b12e4 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-api - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-core-type - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-ddl-generator - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-externalmapping-api - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-autotune - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-querybean - 12.13.2 + 12.13.3-SNAPSHOT io.ebean querybean-generator - 12.13.2 + 12.13.3-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.13.2 + 12.13.3-SNAPSHOT provided io.ebean ebean-test - 12.13.2 + 12.13.3-SNAPSHOT test io.ebean ebean-postgis - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-redis - 12.13.2 + 12.13.3-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index c1b475b76..0e4062b6f 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.13.2 + 12.13.3-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index eff86103b..08752f040 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.13.2 + HEAD @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-core-type - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-externalmapping-api - 12.13.2 + 12.13.3-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 9ccda7ce6..4a189ed69 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.13.2 + 12.13.3-SNAPSHOT provided io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 0369dc1e6..0566534a9 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index d9a75a7ac..5a651b9dc 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.13.2 + HEAD ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.13.2 + 12.13.3-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT test io.ebean ebean-ddl-generator - 12.13.2 + 12.13.3-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 759c0af54..0862a5696 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.13.2 + 12.13.3-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 9340993b6..a6e2507d7 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.13.2 + 12.13.3-SNAPSHOT test io.ebean querybean-generator - 12.13.2 + 12.13.3-SNAPSHOT test io.ebean ebean-test - 12.13.2 + 12.13.3-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 028ccbca9..dca810bd2 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.13.2 + 12.13.3-SNAPSHOT provided io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT provided io.ebean ebean-querybean - 12.13.2 + 12.13.3-SNAPSHOT test io.ebean querybean-generator - 12.13.2 + 12.13.3-SNAPSHOT test io.ebean ebean-test - 12.13.2 + 12.13.3-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 54b5de4c0..af698ce97 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.13.2 + 12.13.3-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index 844f9b03d..2c3dacdf5 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT io.ebean ebean-querybean - 12.13.2 + 12.13.3-SNAPSHOT diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index ceb50bece..e897804e2 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.13.2 + 12.13.3-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.13.2 + 12.13.3-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.13.2 + 12.13.3-SNAPSHOT test diff --git a/pom.xml b/pom.xml index 7199421e1..ce0f1cd64 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.13.2 + 12.13.3-SNAPSHOT pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.13.2 + HEAD diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 99712a4d7..ef25adaa8 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.2 + 12.13.3-SNAPSHOT querybean generator From 6e31de6f2ef8ba24bc6780e31e4b2071443b8ec1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Dec 2021 04:33:53 +0000 Subject: [PATCH 20/41] Bump h2 from 1.4.199 to 2.0.202 in /ebean-test Bumps [h2](https://github.com/h2database/h2database) from 1.4.199 to 2.0.202. - [Release notes](https://github.com/h2database/h2database/releases) - [Commits](https://github.com/h2database/h2database/compare/version-1.4.199...version-2.0.202) --- updated-dependencies: - dependency-name: com.h2database:h2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- ebean-test/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index af698ce97..c91ff68b9 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -76,7 +76,7 @@ com.h2database h2 - 1.4.199 + 2.0.202 From 6a9b5944a3b1d2be077dd236da15d6d3d5a025b2 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 20:55:19 +1300 Subject: [PATCH 21/41] Remove release.properties that somehow got into git after release --- release.properties | 83 ---------------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 release.properties diff --git a/release.properties b/release.properties deleted file mode 100644 index e846a5665..000000000 --- a/release.properties +++ /dev/null @@ -1,83 +0,0 @@ -#release configuration -#Fri Dec 17 17:24:24 NZDT 2021 -projectVersionPolicyId=default -project.scm.io.ebean\:ebean-core-type.tag=HEAD -scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel} -project.rel.io.ebean\:ebean-ddl-generator=12.13.2 -project.dev.io.ebean\:ebean-core=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-api.tag=HEAD -project.scm.io.ebean\:ebean-redis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-querybean.tag=HEAD -project.scm.io.ebean\:ebean-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-api=12.13.3-SNAPSHOT -project.rel.io.ebean\:ebean=12.13.2 -project.dev.io.ebean\:ebean-core-type=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-ddl-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -exec.activateProfiles=release -project.dev.io.ebean\:ebean-test=12.13.3-SNAPSHOT -project.scm.io.ebean\:kotlin-querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-querybean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-bom.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-core.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.rel.io.ebean\:ebean-core-type=12.13.2 -project.rel.io.ebean\:kotlin-querybean-generator=12.13.2 -project.dev.io.ebean\:querybean-generator=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-autotune.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.commentPrefix=[maven-release-plugin] -releaseStrategyId=default -project.rel.io.ebean\:ebean-querybean=12.13.2 -project.scm.io.ebean\:ebean-externalmapping-api.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:querybean-generator.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:kotlin-querybean-generator=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-core-type.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -completedPhase=generate-release-poms -project.rel.io.ebean\:ebean-redis=12.13.2 -project.scm.io.ebean\:ebean-test.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.scm.io.ebean\:ebean-postgis.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-autotune=12.13.3-SNAPSHOT -project.rel.io.ebean\:ebean-api=12.13.2 -project.scm.io.ebean\:ebean-postgis.tag=HEAD -project.scm.io.ebean\:querybean-generator.tag=HEAD -project.rel.io.ebean\:querybean-generator=12.13.2 -scm.tag=ebean-parent-12.13.2 -project.rel.io.ebean\:ebean-externalmapping-xml=12.13.2 -project.scm.io.ebean\:ebean-ddl-generator.tag=HEAD -project.rel.io.ebean\:ebean-externalmapping-api=12.13.2 -project.scm.io.ebean\:ebean-externalmapping-xml.tag=HEAD -preparationGoals=clean verify -exec.pomFileName=pom.xml -project.dev.io.ebean\:ebean-externalmapping-api=12.13.3-SNAPSHOT -project.dev.io.ebean\:ebean=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.dev.io.ebean\:ebean-parent=12.13.3-SNAPSHOT -project.dev.io.ebean\:ebean-externalmapping-xml=12.13.3-SNAPSHOT -project.rel.io.ebean\:ebean-core=12.13.2 -project.dev.io.ebean\:ebean-redis=12.13.3-SNAPSHOT -project.dev.io.ebean\:ebean-postgis=12.13.3-SNAPSHOT -project.scm.io.ebean\:ebean-redis.tag=HEAD -project.scm.io.ebean\:ebean-parent.tag=HEAD -pushChanges=true -project.scm.io.ebean\:ebean-externalmapping-xml.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -project.rel.io.ebean\:ebean-test=12.13.2 -project.scm.io.ebean\:kotlin-querybean-generator.tag=HEAD -project.scm.io.ebean\:ebean-bom.tag=HEAD -project.scm.io.ebean\:ebean-autotune.tag=HEAD -project.scm.io.ebean\:ebean.tag=HEAD -project.scm.io.ebean\:ebean-core.tag=HEAD -project.rel.io.ebean\:ebean-autotune=12.13.2 -scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel} -remoteTagging=true -project.dev.io.ebean\:ebean-bom=12.13.3-SNAPSHOT -project.dev.io.ebean\:ebean-querybean=12.13.3-SNAPSHOT -project.rel.io.ebean\:ebean-bom=12.13.2 -project.scm.io.ebean\:ebean-parent.developerConnection=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.url=scm\:git\:git@github.com\:ebean-orm/ebean.git -scm.developmentCommitComment=@{prefix} prepare for next development iteration -project.scm.io.ebean\:ebean-externalmapping-api.tag=HEAD -scm.tagNameFormat=@{project.artifactId}-@{project.version} -project.scm.io.ebean\:ebean-test.tag=HEAD -project.dev.io.ebean\:ebean-ddl-generator=12.13.3-SNAPSHOT -exec.snapshotReleasePluginAllowed=false -scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel} -project.rel.io.ebean\:ebean-postgis=12.13.2 -project.rel.io.ebean\:ebean-parent=12.13.2 From bd01dfd29a107dc1f02bf3e6b9b53de13afd5f49 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 20:57:46 +1300 Subject: [PATCH 22/41] Bump parent pom, moved to s01.oss.sonatype.org --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce0f1cd64..1b48a5474 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.avaje java8-oss - 3.2 + 3.3 io.ebean From 752d5d4782cd35b10d1275fe7e2c09adbdf689ee Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 21:47:07 +1300 Subject: [PATCH 23/41] Remove pom.xml.releaseBackup from barfed release --- ebean-api/pom.xml.releaseBackup | 130 --------- ebean-autotune/pom.xml.releaseBackup | 74 ----- ebean-bom/pom.xml.releaseBackup | 162 ----------- ebean-core-type/pom.xml.releaseBackup | 46 --- ebean-core/pom.xml.releaseBackup | 247 ----------------- ebean-ddl-generator/pom.xml.releaseBackup | 106 ------- .../pom.xml.releaseBackup | 30 -- .../pom.xml.releaseBackup | 100 ------- ebean-postgis/pom.xml.releaseBackup | 118 -------- ebean-querybean/pom.xml.releaseBackup | 112 -------- ebean-redis/pom.xml.releaseBackup | 93 ------- ebean-test/pom.xml.releaseBackup | 261 ------------------ ebean/pom.xml.releaseBackup | 58 ---- .../pom.xml.releaseBackup | 186 ------------- pom.xml.releaseBackup | 114 -------- querybean-generator/pom.xml.releaseBackup | 52 ---- 16 files changed, 1889 deletions(-) delete mode 100644 ebean-api/pom.xml.releaseBackup delete mode 100644 ebean-autotune/pom.xml.releaseBackup delete mode 100644 ebean-bom/pom.xml.releaseBackup delete mode 100644 ebean-core-type/pom.xml.releaseBackup delete mode 100644 ebean-core/pom.xml.releaseBackup delete mode 100644 ebean-ddl-generator/pom.xml.releaseBackup delete mode 100644 ebean-externalmapping-api/pom.xml.releaseBackup delete mode 100644 ebean-externalmapping-xml/pom.xml.releaseBackup delete mode 100644 ebean-postgis/pom.xml.releaseBackup delete mode 100644 ebean-querybean/pom.xml.releaseBackup delete mode 100644 ebean-redis/pom.xml.releaseBackup delete mode 100644 ebean-test/pom.xml.releaseBackup delete mode 100644 ebean/pom.xml.releaseBackup delete mode 100644 kotlin-querybean-generator/pom.xml.releaseBackup delete mode 100644 pom.xml.releaseBackup delete mode 100644 querybean-generator/pom.xml.releaseBackup diff --git a/ebean-api/pom.xml.releaseBackup b/ebean-api/pom.xml.releaseBackup deleted file mode 100644 index 1e711bc62..000000000 --- a/ebean-api/pom.xml.releaseBackup +++ /dev/null @@ -1,130 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean api - ebean api - ebean-api - - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.avaje - avaje-config - 1.5 - - - - - io.avaje - avaje-lang - 1.0 - - - - io.ebean - persistence-api - 2.2.5 - - - - io.ebean - ebean-annotation - 7.3 - - - - io.ebean - ebean-types - 2.2 - - - - io.ebean - ebean-datasource-api - ${ebean-datasource.version} - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - - com.h2database - h2 - 1.4.199 - true - - - - javax.transaction - jta - 1.1 - true - - - - javax.servlet - javax.servlet-api - 3.1.0 - true - - - - io.avaje - junit - 1.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - diff --git a/ebean-autotune/pom.xml.releaseBackup b/ebean-autotune/pom.xml.releaseBackup deleted file mode 100644 index dc7b6c0ac..000000000 --- a/ebean-autotune/pom.xml.releaseBackup +++ /dev/null @@ -1,74 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - - - - - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - ebean autotune - ebean automatic query tuning module - ebean-autotune - - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - diff --git a/ebean-bom/pom.xml.releaseBackup b/ebean-bom/pom.xml.releaseBackup deleted file mode 100644 index 417420c68..000000000 --- a/ebean-bom/pom.xml.releaseBackup +++ /dev/null @@ -1,162 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean bom - ebean bill of materials pom - ebean-bom - pom - - - - - - - - - io.ebean - ebean-ddl-runner - ${ebean-ddl-runner.version} - - - - io.ebean - ebean-migration-auto - ${ebean-migration-auto.version} - - - - io.ebean - ebean-migration - ${ebean-migration.version} - - - - io.ebean - ebean-datasource-api - ${ebean-datasource.version} - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-agent - ${ebean-agent.version} - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - - io.ebean - ebean-test-docker - ${ebean-test-docker.version} - - - - - - io.ebean - ebean - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-core-type - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-externalmapping-api - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-externalmapping-xml - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-autotune - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-querybean - 12.13.2-SNAPSHOT - - - - io.ebean - querybean-generator - 12.13.2-SNAPSHOT - provided - - - - io.ebean - kotlin-querybean-generator - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-test - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-postgis - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-redis - 12.13.2-SNAPSHOT - - - - - - - diff --git a/ebean-core-type/pom.xml.releaseBackup b/ebean-core-type/pom.xml.releaseBackup deleted file mode 100644 index 3d3e11a75..000000000 --- a/ebean-core-type/pom.xml.releaseBackup +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean-core-type - ebean core type - ebean scalar types api - - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - diff --git a/ebean-core/pom.xml.releaseBackup b/ebean-core/pom.xml.releaseBackup deleted file mode 100644 index b250f7a0a..000000000 --- a/ebean-core/pom.xml.releaseBackup +++ /dev/null @@ -1,247 +0,0 @@ - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean-core - jar - - ebean core - ebean core module - https://ebean.io/ - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - - - - io.ebean - ebean-ddl-runner - 1.2 - - - - io.avaje - classpath-scanner - 6.2 - - - - io.ebean - ebean-migration-auto - 1.1 - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-core-type - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-externalmapping-api - 12.13.2-SNAPSHOT - - - - org.antlr - antlr4-runtime - 4.8-1 - - - - - io.avaje - avaje-jsr305-x - 1.1 - provided - - - - - com.h2database - h2 - 1.4.199 - provided - - - - javax.transaction - javax.transaction-api - 1.3 - true - - - - - javax.validation - validation-api - 2.0.1.Final - true - - - jakarta.validation - jakarta.validation-api - 3.0.0 - true - - - - joda-time - joda-time - 2.9.7 - true - - - - - - - - - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - - org.postgresql - postgresql - 42.2.24 - true - - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=0 - - - testEnhance - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M4 - - false - false - false - - **/Test*.java - **/*Test.java - **/*Tests.java - - - - - datasource.default - ${datasource.default} - - - - dbClockDelta - ${dbClockDelta} - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.1.1 - - Ebean 12 - src/main/java/io/ebean/overview.html - io.ebeaninternal.*:io.ebeanservice:io.ebean.common:io.ebean.bean:io.ebean.service:io.ebean.metric:io.ebean.util:io.ebean.config.properties:io.ebean.config.dbplatform - true - src/main/java/com/avaje/ebean/overview.html - - - - attach-javadocs - - jar - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - - - - diff --git a/ebean-ddl-generator/pom.xml.releaseBackup b/ebean-ddl-generator/pom.xml.releaseBackup deleted file mode 100644 index fc0e83a5f..000000000 --- a/ebean-ddl-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean ddl generation - DDL and DB Migration generation - ebean-ddl-generator - - - - - io.ebean - ebean-ddl-runner - 1.2 - - - - io.ebean - ebean-migration - 12.12.1 - - - - io.ebean - ebean-core-type - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - provided - - - - - io.avaje - junit - 1.0 - test - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - javax.validation - validation-api - 2.0.1.Final - test - - - - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=0 - - - testEnhance - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - diff --git a/ebean-externalmapping-api/pom.xml.releaseBackup b/ebean-externalmapping-api/pom.xml.releaseBackup deleted file mode 100644 index 72278f50b..000000000 --- a/ebean-externalmapping-api/pom.xml.releaseBackup +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean external mapping api - API for mapping external named queries - ebean-externalmapping-api - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - - diff --git a/ebean-externalmapping-xml/pom.xml.releaseBackup b/ebean-externalmapping-xml/pom.xml.releaseBackup deleted file mode 100644 index 8155aa728..000000000 --- a/ebean-externalmapping-xml/pom.xml.releaseBackup +++ /dev/null @@ -1,100 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - - - - - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - ebean external mapping xml - XML implementation for mapping external named queries - ebean-externalmapping-xml - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.ebean - ebean-externalmapping-api - 12.13.2-SNAPSHOT - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - - - - io.avaje - classpath-scanner - 6.2 - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - diff --git a/ebean-postgis/pom.xml.releaseBackup b/ebean-postgis/pom.xml.releaseBackup deleted file mode 100644 index 3d1fa16d0..000000000 --- a/ebean-postgis/pom.xml.releaseBackup +++ /dev/null @@ -1,118 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean postgis - ebean postgis module - https://ebean.io/ - - ebean-postgis - - - 2.2.1 - - - - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - com.fasterxml.jackson.core - jackson-core - ${jackson.version} - true - - - - net.postgis - postgis-jdbc - [${postgis.jdbc.version}] - - - - - org.postgresql - postgresql - 42.2.24 - provided - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - - org.geolatte - geolatte-geom - 1.0.6 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-test - 12.13.2-SNAPSHOT - test - - - - org.avaje.composite - logback - 1.1 - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - - - diff --git a/ebean-querybean/pom.xml.releaseBackup b/ebean-querybean/pom.xml.releaseBackup deleted file mode 100644 index 5ed7e1669..000000000 --- a/ebean-querybean/pom.xml.releaseBackup +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean querybean - Ebean querybean support - ebean-querybean - - - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - - io.avaje - avaje-lang - 1.0 - - - - joda-time - joda-time - 1.6 - true - - - - javax.validation - validation-api - 2.0.1.Final - true - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - test - - - - io.ebean - querybean-generator - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-test - 12.13.2-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - org.avaje.composite - logback - 1.1 - test - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - - diff --git a/ebean-redis/pom.xml.releaseBackup b/ebean-redis/pom.xml.releaseBackup deleted file mode 100644 index 7ada5696b..000000000 --- a/ebean-redis/pom.xml.releaseBackup +++ /dev/null @@ -1,93 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean-redis - ebean redis - Ebean Redis L2 Cache - - - - - redis.clients - jedis - 3.6.3 - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-querybean - 12.13.2-SNAPSHOT - test - - - - io.ebean - querybean-generator - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-test - 12.13.2-SNAPSHOT - test - - - - io.avaje - junit - 1.0 - test - - - - org.avaje.composite - logback - 1.1 - test - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - - - diff --git a/ebean-test/pom.xml.releaseBackup b/ebean-test/pom.xml.releaseBackup deleted file mode 100644 index b015a4544..000000000 --- a/ebean-test/pom.xml.releaseBackup +++ /dev/null @@ -1,261 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean test - Testing support for Ebean - ebean-test - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - provided - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - true - - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - true - - - - io.ebean - ebean-test-docker - 4.3 - - - - org.assertj - assertj-core - 3.14.0 - - - - - org.glassfish.jaxb - jaxb-runtime - 2.3.2 - - - - - com.h2database - h2 - 1.4.199 - - - - - - io.avaje - avaje-jsr305 - 1.1 - test - - - - io.ebean - ebean-migration - 12.12.1 - test - - - - io.avaje - mod-uuid - 1.1 - test - - - - javax.transaction - jta - 1.1 - test - - - - - javax.validation - validation-api - 2.0.1.Final - test - - - - jakarta.validation - jakarta.validation-api - 3.0.0 - test - - - - joda-time - joda-time - 2.9.7 - test - - - - javax.annotation - javax.annotation-api - 1.3.2 - test - - - commons-io - commons-io - 2.7 - test - - - - org.postgresql - postgresql - 42.2.24 - - - org.checkerframework - checker-qual - - - test - - - - com.microsoft.sqlserver - mssql-jdbc - 9.4.0.jre8 - test - - - - mysql - mysql-connector-java - 8.0.26 - test - - - - org.mariadb.jdbc - mariadb-java-client - 2.6.0 - test - - - - com.sap.cloud.db.jdbc - ngdbc - 2.3.48 - test - - - - com.oracle.database.jdbc - - ojdbc8 - 19.12.0.0 - test - - - - com.ibm.db2 - jcc - 11.5.6.0 - test - - - - org.xerial - sqlite-jdbc - 3.36.0.3 - test - - - - com.nuodb.jdbc - nuodb-jdbc - 22.0.0 - test - - - - ru.yandex.clickhouse - clickhouse-jdbc - 0.3.1-patch - test - - - - ch.qos.logback - logback-classic - 1.2.3 - test - - - - io.avaje - junit - 1.0 - test - - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.ebean.tile:enhancement:12.11.3 - io.avaje.tile:moditech-module:1.0 - - - - - - - - diff --git a/ebean/pom.xml.releaseBackup b/ebean/pom.xml.releaseBackup deleted file mode 100644 index bf039e209..000000000 --- a/ebean/pom.xml.releaseBackup +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - ebean composite - Composite of common runtime dependencies - ebean - - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - - - - io.ebean - ebean-api - 12.13.2-SNAPSHOT - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - - - - - io.ebean - ebean-querybean - 12.13.2-SNAPSHOT - - - - - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - diff --git a/kotlin-querybean-generator/pom.xml.releaseBackup b/kotlin-querybean-generator/pom.xml.releaseBackup deleted file mode 100644 index 0be3286f4..000000000 --- a/kotlin-querybean-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,186 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - kotlin querybean generator - Generates Kotlin querybeans - kotlin-querybean-generator - - - 1.6.0 - - - - - - - - io.avaje - junit - 1.0 - test - - - - io.ebean - ebean-querybean - 12.13.2-SNAPSHOT - test - - - - io.ebean - ebean-datasource - ${ebean-datasource.version} - test - - - - io.ebean - ebean-core - 12.13.2-SNAPSHOT - test - - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin.version} - provided - - - - org.jetbrains.kotlin - kotlin-test - ${kotlin.version} - test - - - - io.ebean - ebean-ddl-generator - 12.13.2-SNAPSHOT - test - - - - javax.validation - validation-api - 2.0.1.Final - test - - - - - - - src/test/kotlin - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - test-compile - test-compile - - test-compile - - - - test-kapt - - test-kapt - - - - src/test/kotlin - - - - io.ebean - kotlin-querybean-generator - 12.8.2 - - - - - - compile - compile - - compile - - - - src/main/java - target/generated-sources/kapt/test - target/generated-sources/kaptKotlin/test - - - - - - 1.8 - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - - default-testCompile - none - - - java-test-compile - test-compile - - testCompile - - - - compile - compile - - compile - - - - - 1.8 - 1.8 - - -proc:none - - - - - io.ebean - ebean-maven-plugin - ${ebean-maven-plugin.version} - - - test - process-test-classes - - debug=1 - - - testEnhance - - - - - - - - - diff --git a/pom.xml.releaseBackup b/pom.xml.releaseBackup deleted file mode 100644 index ba0c11c58..000000000 --- a/pom.xml.releaseBackup +++ /dev/null @@ -1,114 +0,0 @@ - - - 4.0.0 - - org.avaje - java8-oss - 3.2 - - - io.ebean - ebean-parent - 12.13.2-SNAPSHOT - pom - - ebean parent - Parent for ebean modules - https://ebean.io/ - - - scm:git:git@github.com:ebean-orm/ebean.git - HEAD - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - rbygrave - Rob Bygrave - robin.bygrave@gmail.com - - - - - false - 2.12.1 - 1.2 - 1.1 - 12.12.1 - 4.2 - 7.3 - 12.13.0 - 12.13.0 - - - - - - org.slf4j - slf4j-api - 1.7.30 - provided - - - - ch.qos.logback - logback-classic - 1.2.3 - test - - - - com.h2database - h2 - 1.4.199 - test - - - - - - ebean - ebean-api - ebean-bom - ebean-core-type - ebean-core - ebean-ddl-generator - ebean-autotune - ebean-externalmapping-api - ebean-externalmapping-xml - ebean-test - querybean-generator - kotlin-querybean-generator - ebean-querybean - ebean-postgis - ebean-redis - - - - - - - release - - - default - - true - - - ebean-kotlin - tests - - - - - - diff --git a/querybean-generator/pom.xml.releaseBackup b/querybean-generator/pom.xml.releaseBackup deleted file mode 100644 index d61f1d143..000000000 --- a/querybean-generator/pom.xml.releaseBackup +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - ebean-parent - io.ebean - 12.13.2-SNAPSHOT - - - querybean generator - Querybean generator - querybean-generator - - - - - io.avaje - junit - 1.0 - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - 1.8 - 1.8 - - -proc:none - - - - io.repaint.maven - tiles-maven-plugin - 2.24 - true - - - io.avaje.tile:moditech-module:1.0 - - - - - - - From 65e924feaa7f1948217face21267d434476e12ad Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 17 Dec 2021 09:15:42 +0100 Subject: [PATCH 24/41] Deleted obsolete LoadErrorHandler --- .../java/io/ebean/plugin/LoadErrorHandler.java | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 ebean-api/src/main/java/io/ebean/plugin/LoadErrorHandler.java diff --git a/ebean-api/src/main/java/io/ebean/plugin/LoadErrorHandler.java b/ebean-api/src/main/java/io/ebean/plugin/LoadErrorHandler.java deleted file mode 100644 index 278a70f96..000000000 --- a/ebean-api/src/main/java/io/ebean/plugin/LoadErrorHandler.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.ebean.plugin; - -import io.ebean.bean.EntityBean; - -/** - * Errorhandler to handle load errors and may be recover correct value. - * - * @author Roland Praml, FOCONIS AG - * - */ -@FunctionalInterface -public interface LoadErrorHandler { - void handleLoadError(EntityBean bean, Property prop, String fullName, Exception e); -} From 68b7deba9d83ae3610bddfde7b2010a325b743f7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Fri, 17 Dec 2021 23:25:49 +1300 Subject: [PATCH 25/41] Put back h2database to 1.4.199 as 2.x breaks way too many things, need to work on that --- ebean-test/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index c91ff68b9..98d355e3d 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -76,7 +76,7 @@ com.h2database h2 - 2.0.202 + 1.4.199 @@ -187,8 +187,8 @@ com.oracle.database.jdbc - ojdbc8 19.12.0.0 From f4d270e8b52d875f19400e9d48ab10f3897a0571 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 17 Dec 2021 09:13:11 +0100 Subject: [PATCH 26/41] FIX: JDBC URL for SqlServer (similar to testconfig-files) --- .../main/java/io/ebean/test/config/platform/SqlServerSetup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-test/src/main/java/io/ebean/test/config/platform/SqlServerSetup.java b/ebean-test/src/main/java/io/ebean/test/config/platform/SqlServerSetup.java index 2dc68b5d7..09b76323e 100644 --- a/ebean-test/src/main/java/io/ebean/test/config/platform/SqlServerSetup.java +++ b/ebean-test/src/main/java/io/ebean/test/config/platform/SqlServerSetup.java @@ -13,7 +13,7 @@ class SqlServerSetup implements PlatformSetup { config.setDefaultPort(1433); config.setUsernameDefault(); config.setPassword("SqlS3rv#r"); - config.setUrl("jdbc:sqlserver://localhost:${port};databaseName=${databaseName}"); + config.setUrl("jdbc:sqlserver://localhost:${port};databaseName=${databaseName};sendTimeAsDateTime=false"); config.setDriver("com.microsoft.sqlserver.jdbc.SQLServerDriver"); config.datasourceDefaults(); From 058021f8d039ac520aae6096786390a271e7ddac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20P=C3=B6hler?= Date: Fri, 12 Nov 2021 15:56:07 +0100 Subject: [PATCH 27/41] ADD: metaHas and metaFindAll as functional sugar --- ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java b/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java index 583c99009..69127a316 100644 --- a/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java +++ b/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java @@ -71,6 +71,14 @@ public class AnnotationUtil { return typeGet(clazz, annotation) != null; } + public static boolean metaHas(AnnotatedElement element, Class annotationType) { + return !metaFindAll(element, annotationType).isEmpty(); + } + + public static Set metaFindAll(AnnotatedElement element, Class annotationType) { + return metaFindAllFor(element, Collections.singleton(annotationType)); + } + /** * Find all the annotations for the filter searching meta-annotations. */ From 91d1fb8cea8a560c21d1fa90474f89a1d8f3932b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20P=C3=B6hler?= Date: Fri, 17 Dec 2021 15:10:30 +0100 Subject: [PATCH 28/41] ADD: javadoc --- ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java b/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java index 69127a316..709019158 100644 --- a/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java +++ b/ebean-api/src/main/java/io/ebean/util/AnnotationUtil.java @@ -71,10 +71,16 @@ public class AnnotationUtil { return typeGet(clazz, annotation) != null; } + /** + * Check if an element is annotated with an annotation of given type searching meta-annotations. + */ public static boolean metaHas(AnnotatedElement element, Class annotationType) { return !metaFindAll(element, annotationType).isEmpty(); } + /** + * Find all the annotations of a given type searching meta-annotations. + */ public static Set metaFindAll(AnnotatedElement element, Class annotationType) { return metaFindAllFor(element, Collections.singleton(annotationType)); } From c0f4451d20146f887ed7aa61210817e244b228d4 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 10:47:26 +1300 Subject: [PATCH 29/41] Fix pom versions in test only modules after release --- ebean-kotlin/pom.xml | 6 +++--- tests/test-java16/pom.xml | 6 +++--- tests/test-kotlin/pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 22fafea6c..7f1b375de 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 12.13.2-SNAPSHOT + 12.13.3-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.3-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 12.13.2-SNAPSHOT + 12.13.3-SNAPSHOT test diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 0f4927da5..c57560c1f 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -20,7 +20,7 @@ io.ebean ebean - 12.13.2-SNAPSHOT + 12.13.3-SNAPSHOT @@ -32,7 +32,7 @@ io.ebean ebean-test - 12.13.2-SNAPSHOT + 12.13.3-SNAPSHOT test @@ -58,7 +58,7 @@ io.ebean querybean-generator - 12.13.2-SNAPSHOT + 12.13.3-SNAPSHOT diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 3ab10cdf5..39edcf47b 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -36,14 +36,14 @@ io.ebean ebean-test - 12.13.2-SNAPSHOT + 12.13.3-SNAPSHOT test io.ebean ebean-core - 12.13.2-SNAPSHOT + 12.13.3-SNAPSHOT test From 254b0df16ba7390c786719d085ac6f5d2e18d714 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 12:40:41 +1300 Subject: [PATCH 30/41] #2470 - Bump jedis to version 3.8.0 (from 3.6.3) --- ebean-redis/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index dca810bd2..1e4aa1189 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -16,7 +16,7 @@ redis.clients jedis - 3.6.3 + 3.8.0 From 8ea2c31076e7be69cbf94cdd75615deff17b4d96 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 12:45:30 +1300 Subject: [PATCH 31/41] #2471 - Bump avaje-config to 1.7 (from 1.5) with removed jndi lookup for DataSource --- ebean-api/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index a27749023..08cbb1e1a 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -27,7 +27,7 @@ io.avaje avaje-config - 1.5 + 1.7 @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index de70b12e4..55df93398 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-api - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-core-type - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-ddl-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-externalmapping-api - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-autotune - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-querybean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean querybean-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided io.ebean ebean-test - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test io.ebean ebean-postgis - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-redis - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 0e4062b6f..969353969 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 08752f040..99591b3bc 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean-core @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-core-type - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-externalmapping-api - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 4a189ed69..ca5834e2c 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 0566534a9..df664cb16 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 5a651b9dc..adc50c0a5 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test io.ebean ebean-ddl-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 7f1b375de..c5c473f23 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 0862a5696..ed40a6aac 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index a6e2507d7..a083f762b 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test io.ebean querybean-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test io.ebean ebean-test - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 1e4aa1189..56bb8bcdb 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided io.ebean ebean-querybean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test io.ebean querybean-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test io.ebean ebean-test - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 98d355e3d..849d741f3 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index 2c3dacdf5..cf41c4d90 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT io.ebean ebean-querybean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1b48a5474..5daf59b3a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT pom ebean parent diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index ef25adaa8..10b8924c4 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT querybean generator diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index c57560c1f..7a63e4a50 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -20,7 +20,7 @@ io.ebean ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT @@ -32,7 +32,7 @@ io.ebean ebean-test - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test @@ -58,7 +58,7 @@ io.ebean querybean-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 39edcf47b..2396a2a3f 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -36,14 +36,14 @@ io.ebean ebean-test - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test From c3320f4a0b45295c1bcaa69f584482a4c83a19ce Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 13:14:34 +1300 Subject: [PATCH 33/41] Bump version to 12.14.0-SNAPSHOT --- kotlin-querybean-generator/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index e897804e2..c4ced8ef9 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.13.3-SNAPSHOT + 12.14.0-SNAPSHOT test @@ -106,7 +106,7 @@ io.ebean kotlin-querybean-generator - 12.8.2 + 12.13.0 From 361df6732a87ebbe4380faf643477d6113fc1721 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 15:49:58 +1300 Subject: [PATCH 34/41] #2472 - BeanPersistController and isCascade() for delete requests (following #2458) --- .../server/persist/DefaultPersister.java | 25 ++++++++++++++----- .../basic/event/TestPreInsertValidation.java | 16 ++++++++++-- .../org/tests/model/basic/TWithPreInsert.java | 4 +-- .../model/basic/TWithPreInsertCommon.java | 2 ++ .../event/TWithPreInsertPersistAdapter.java | 15 +++++++++++ 5 files changed, 52 insertions(+), 10 deletions(-) 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 f2c56db74..701b76402 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 @@ -333,6 +333,13 @@ public final class DefaultPersister implements Persister { * Recursively delete the bean. This calls back to the EbeanServer. */ private int deleteRecurse(EntityBean detailBean, Transaction t, DeleteMode deleteMode) { + return deleteRequest(createDeleteCascade(detailBean, t, deleteMode.persistType())); + } + + /** + * Delete without being a cascade. + */ + private int delete(EntityBean detailBean, Transaction t, DeleteMode deleteMode) { return deleteRequest(createDeleteRequest(detailBean, t, deleteMode.persistType())); } @@ -560,7 +567,7 @@ public final class DefaultPersister implements Persister { } } - private void deleteList(List beanList, SpiTransaction t, DeleteMode deleteMode, boolean children) { + private void deleteCascade(List beanList, SpiTransaction t, DeleteMode deleteMode, boolean children) { if (children) { t.depth(-1); t.checkBatchEscalationOnCollection(); @@ -604,7 +611,7 @@ public final class DefaultPersister implements Persister { for (Object id : ids) { EntityBean bean = descriptor.createEntityBean(); descriptor.convertSetId(id, bean); - int rowCount = deleteRecurse(bean, transaction, deleteMode); + int rowCount = delete(bean, transaction, deleteMode); if (rowCount == -1) { total = -1; } else if (total != -1) { @@ -656,7 +663,7 @@ public final class DefaultPersister implements Persister { t.logSummary("-- DeleteById of " + descriptor.name() + " ids[" + idList + "] requires fetch of foreign key values"); } List beanList = server.findList(q, t); - deleteList(beanList, t, deleteMode, false); + deleteCascade(beanList, t, deleteMode, false); return beanList.size(); } else { @@ -994,6 +1001,8 @@ public final class DefaultPersister implements Persister { executeSqlUpdate(sqlDelete, t); } else { + // TODO: Review first checking if many property is loaded and using the loaded beans + // ... and only using findIdsByParentId() when the many property isn't loaded // Delete recurse using the Id values of the children Object parentId = desc.getId(parentBean); List idsByParentId = many.findIdsByParentId(parentId, null, t, excludeDetailIds, deleteMode.isHard()); @@ -1017,7 +1026,7 @@ public final class DefaultPersister implements Persister { for (Object id : childIds) { refList.add(targetDesc.createReference(id, null)); } - deleteList(refList, t, deleteMode, true); + deleteCascade(refList, t, deleteMode, true); } else { // perform delete by statement if possible delete(targetDesc, null, childIds, t, deleteMode); @@ -1157,6 +1166,10 @@ public final class DefaultPersister implements Persister { return createDeleteRequest(bean, t, type, Flags.ZERO); } + private PersistRequestBean createDeleteCascade(EntityBean bean, Transaction t, Type type) { + return createDeleteRequest(bean, t, type, Flags.RECURSE); + } + @SuppressWarnings({"unchecked"}) private PersistRequestBean createDeleteRequest(Object bean, Transaction t, PersistRequest.Type type, int flags) { BeanManager mgr = beanManager(bean.getClass()); @@ -1167,7 +1180,7 @@ public final class DefaultPersister implements Persister { type = Type.DELETE_SOFT; } - PersistRequestBean request = new PersistRequestBean<>(server, (T)bean, null, mgr, (SpiTransaction) t, persistExecute, type, flags); + PersistRequestBean request = new PersistRequestBean<>(server, (T) bean, null, mgr, (SpiTransaction) t, persistExecute, type, flags); request.initForSoftDelete(); return request; } @@ -1186,7 +1199,7 @@ public final class DefaultPersister implements Persister { */ @SuppressWarnings("unchecked") private BeanManager beanManager(Class cls) { - BeanManager mgr = (BeanManager)beanDescriptorManager.beanManager(cls); + BeanManager mgr = (BeanManager) beanDescriptorManager.beanManager(cls); if (mgr == null) { throw new PersistenceException(errNotRegistered(cls)); } diff --git a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java index c67e63c4a..8b86b1f87 100644 --- a/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java +++ b/ebean-test/src/test/java/org/tests/basic/event/TestPreInsertValidation.java @@ -6,6 +6,7 @@ import io.ebean.DB; import org.junit.jupiter.api.Test; import org.tests.model.basic.TWithPreInsert; import org.tests.model.basic.TWithPreInsertChild; +import org.tests.model.basic.event.TWithPreInsertPersistAdapter; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -27,6 +28,7 @@ class TestPreInsertValidation extends BaseTestCase { assertThat(e.requestCascadeState()).isEqualTo(2); TWithPreInsert e1 = DB.find(TWithPreInsert.class, e.getId()); + assert e1 != null; e1.setTitle("Missus"); DB.save(e1); @@ -54,11 +56,21 @@ class TestPreInsertValidation extends BaseTestCase { assert e1 != null; e1.setTitle("ParentCascading-changed"); - e1.children().get(0).setName("Child0-changed"); + TWithPreInsertChild childBean = e1.children().get(0); + childBean.setName("Child0-changed"); DB.save(e1); assertThat(e1.requestCascadeState()).isEqualTo(12); - assertThat(e1.children().get(0).requestCascadeState()).isEqualTo(11); + assertThat(childBean.requestCascadeState()).isEqualTo(11); + + DB.delete(e1); + + assertThat(e1.requestCascadeState()).isEqualTo(22); + + // assert that isCascade() was true for the child bean + assertThat(TWithPreInsertPersistAdapter.cascadeDelete).hasSize(1); + String deleteCascade = TWithPreInsertPersistAdapter.cascadeDelete.get(0); + assertThat(deleteCascade).isEqualTo("class org.tests.model.basic.TWithPreInsertChild:1"); } @Test 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 21398bc7a..acfffce20 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 @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; -import static javax.persistence.CascadeType.PERSIST; +import static javax.persistence.CascadeType.ALL; @Entity public class TWithPreInsert implements TWithPreInsertCommon { @@ -20,7 +20,7 @@ public class TWithPreInsert implements TWithPreInsertCommon { private String title; - @OneToMany(cascade = PERSIST) + @OneToMany(cascade = ALL) private List children = new ArrayList<>(); /** diff --git a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java index dc61e28ba..632c7ade9 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java +++ b/ebean-test/src/test/java/org/tests/model/basic/TWithPreInsertCommon.java @@ -2,6 +2,8 @@ package org.tests.model.basic; public interface TWithPreInsertCommon { + Integer getId(); + String getName(); void setName(String name); diff --git a/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java b/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java index 03143d385..ffc87e00a 100644 --- a/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java +++ b/ebean-test/src/test/java/org/tests/model/basic/event/TWithPreInsertPersistAdapter.java @@ -4,8 +4,13 @@ import io.ebean.event.BeanPersistAdapter; import io.ebean.event.BeanPersistRequest; import org.tests.model.basic.TWithPreInsertCommon; +import java.util.ArrayList; +import java.util.List; + public class TWithPreInsertPersistAdapter extends BeanPersistAdapter { + public static List cascadeDelete = new ArrayList<>(); + @Override public boolean isRegisterFor(Class cls) { return TWithPreInsertCommon.class.isAssignableFrom(cls); @@ -32,4 +37,14 @@ public class TWithPreInsertPersistAdapter extends BeanPersistAdapter { return super.preUpdate(request); } + @Override + public boolean preDelete(BeanPersistRequest request) { + TWithPreInsertCommon bean = (TWithPreInsertCommon) request.bean(); + if (request.isCascade()) { + cascadeDelete.add(bean.getClass() + ":" + bean.getId()); + } else { + bean.requestCascadeState(22); + } + return true; + } } From 678494f331740f2083a85b6aa4d3e5d073b45e1f Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 16:09:33 +1300 Subject: [PATCH 35/41] Bump version of logback used in tests only --- ebean-test/pom.xml | 2 +- pom.xml | 2 +- tests/test-java16/pom.xml | 2 +- tests/test-kotlin/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 849d741f3..faa5c31e2 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -226,7 +226,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.9 test diff --git a/pom.xml b/pom.xml index 5daf59b3a..0a674062c 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.9 test diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 7a63e4a50..b8408ed0c 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -26,7 +26,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.9 diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 2396a2a3f..32d477dfe 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -50,7 +50,7 @@ ch.qos.logback logback-classic - 1.2.3 + 1.2.9 test From 42594533daad43e83dc64368e4b3f48330a45399 Mon Sep 17 00:00:00 2001 From: tFellner Date: Mon, 20 Dec 2021 04:11:30 +0100 Subject: [PATCH 36/41] Support for Sequences in MariaDB (#2304) * Support for Sequneces in MariaDB * clean up readSequenceValue in test class * remove flakiness * remove change for later discussion * replace deprecated methods * strictly allow sequences --- .../dbplatform/mariadb/MariaDbPlatform.java | 12 ++++ .../dbplatform/mariadb/MariaDbSequence.java | 24 ++++++++ .../org/tests/idkeys/TestGeneratedKeys.java | 61 +++++++++++++++---- 3 files changed, 85 insertions(+), 12 deletions(-) create mode 100644 ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbSequence.java diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java index 082f31c11..0abdef7bd 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbPlatform.java @@ -1,6 +1,10 @@ package io.ebean.config.dbplatform.mariadb; +import javax.sql.DataSource; + +import io.ebean.BackgroundExecutor; import io.ebean.annotation.Platform; +import io.ebean.config.dbplatform.PlatformIdGenerator; import io.ebean.config.dbplatform.mysql.BaseMySqlPlatform; /** @@ -11,6 +15,14 @@ public class MariaDbPlatform extends BaseMySqlPlatform { public MariaDbPlatform() { super(); this.platform = Platform.MARIADB; + this.sequenceBatchMode = false; this.historySupport = new MariaDbHistorySupport(); + this.dbIdentity.setSupportsSequence(true); } + + @Override + public PlatformIdGenerator createSequenceIdGenerator(BackgroundExecutor be, DataSource ds, int stepSize, String seqName) { + return new MariaDbSequence(be, ds, seqName, stepSize); + } + } diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbSequence.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbSequence.java new file mode 100644 index 000000000..c6350213f --- /dev/null +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/mariadb/MariaDbSequence.java @@ -0,0 +1,24 @@ +package io.ebean.config.dbplatform.mariadb; + +import io.ebean.BackgroundExecutor; +import io.ebean.config.dbplatform.SequenceStepIdGenerator; + +import javax.sql.DataSource; + +public class MariaDbSequence extends SequenceStepIdGenerator { + + private final String nextSql; + + /** + * Construct where batchSize is the sequence step size. + */ + public MariaDbSequence(BackgroundExecutor be, DataSource ds, String seqName, int stepSize) { + super(be, ds, seqName, stepSize); + this.nextSql = "select next value for " + seqName; + } + + @Override + public String getSql(int batchSize) { + return nextSql; + } +} diff --git a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java index 56245930c..8f57569a0 100644 --- a/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java +++ b/ebean-test/src/test/java/org/tests/idkeys/TestGeneratedKeys.java @@ -14,6 +14,8 @@ import org.tests.idkeys.db.GenKeySeqB; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assumptions.assumeTrue; @@ -24,6 +26,7 @@ public class TestGeneratedKeys extends BaseTestCase { @ForPlatform(Platform.H2) // readSequenceValue is H2 specific public void testGenKeySeqA() throws SQLException { assumeTrue(idType() == IdType.SEQUENCE); + SpiEbeanServer server = spiEbeanServer(); try (Transaction tx = server.beginTransaction()) { @@ -69,20 +72,34 @@ public class TestGeneratedKeys extends BaseTestCase { } private long readSequenceValue(Transaction tx, String sequence) throws SQLException { - Statement stm = null; - try { - stm = tx.connection().createStatement(); - ResultSet rs = stm.executeQuery("select currval('" + sequence + "')"); - rs.next(); + String sql; + switch (spiEbeanServer().databasePlatform().getPlatform().base()) { + case H2 : + sql = "select currval('" + sequence + "')"; + break; + case DB2 : + sql = "values previous value for " + sequence; + + break; + case SQLSERVER : + sql = "select current_value from sys.sequences where name = '" + sequence + "'"; + break; + + case MARIADB : + throw new UnsupportedOperationException("reading sequence value outside of the current connection is not supported. " + + "See https://mariadb.com/kb/en/previous-value-for-sequence_name/#description"); + + default : + throw new UnsupportedOperationException("reading sequence value from " + + spiEbeanServer().databasePlatform().getPlatform() + + " is not supported."); + + } + try (Statement stm = tx.connection().createStatement()) { + ResultSet rs = stm.executeQuery(sql); + rs.next(); return rs.getLong(1); - } finally { - if (stm != null) { - try { - stm.close(); - } catch (SQLException e) { - } - } } } @@ -109,5 +126,25 @@ public class TestGeneratedKeys extends BaseTestCase { assertNotNull(al.getId()); } } + + @Test + @ForPlatform({Platform.H2, Platform.MARIADB, Platform.SQLSERVER, Platform.DB2}) + public void testGeneratedKeys() throws SQLException { + assumeTrue(idType() == IdType.SEQUENCE); + + SpiEbeanServer server = spiEbeanServer(); + List idList = new ArrayList<>(52); + + try (Transaction tx = server.beginTransaction()) { + // bigger than increment + for (int i = 1; i < 52; i++) { + GenKeySeqA gks = new GenKeySeqA(); + gks.setDescription("my description " + i); + server.save(gks); + assertFalse(idList.contains(gks.getId())); + idList.add(gks.getId()); + } + } + } } From 2ff3b0acb7fbe879b97763bc3768f1594af3f44a Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 16:20:08 +1300 Subject: [PATCH 37/41] Update gitflow cron schedule for mariadb, sqlserver, jdk-18 --- .github/workflows/jdk-18-ea.yml | 4 ++-- .github/workflows/mariadb-10.6.yml | 5 ++++- .github/workflows/sqlserver-2017-latest.yml | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/jdk-18-ea.yml b/.github/workflows/jdk-18-ea.yml index 73121f1d4..b814c77c9 100644 --- a/.github/workflows/jdk-18-ea.yml +++ b/.github/workflows/jdk-18-ea.yml @@ -3,8 +3,8 @@ name: JDK 18-ea on: workflow_dispatch: -# schedule: -# - cron: '30 6 * * *' + schedule: + - cron: '30 6 * * 1,3,5' jobs: build: diff --git a/.github/workflows/mariadb-10.6.yml b/.github/workflows/mariadb-10.6.yml index 797e948ff..cae97ac27 100644 --- a/.github/workflows/mariadb-10.6.yml +++ b/.github/workflows/mariadb-10.6.yml @@ -1,7 +1,10 @@ name: MariaDB 10.6 -on: [workflow_dispatch] +on: + workflow_dispatch: + schedule: + - cron: '10 7 * * 1,4' jobs: build: diff --git a/.github/workflows/sqlserver-2017-latest.yml b/.github/workflows/sqlserver-2017-latest.yml index 83649d080..6c72d8980 100644 --- a/.github/workflows/sqlserver-2017-latest.yml +++ b/.github/workflows/sqlserver-2017-latest.yml @@ -1,7 +1,10 @@ name: SqlServer 2017 latest -on: [workflow_dispatch] +on: + workflow_dispatch: + schedule: + - cron: '10 7 * * 2,5' jobs: build: From 451e2fa93c93c3c9bb41a27c0f09db5ebb7183b7 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 16:34:17 +1300 Subject: [PATCH 38/41] [maven-release-plugin] prepare release ebean-parent-12.14.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 023284e51..b71326907 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index a9ff0d9be..5297bb15c 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.14.0 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 55df93398..699da8c0f 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-api - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-core-type - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-ddl-generator - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-externalmapping-api - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-externalmapping-xml - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-autotune - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-querybean - 12.14.0-SNAPSHOT + 12.14.0 io.ebean querybean-generator - 12.14.0-SNAPSHOT + 12.14.0 provided io.ebean kotlin-querybean-generator - 12.14.0-SNAPSHOT + 12.14.0 provided io.ebean ebean-test - 12.14.0-SNAPSHOT + 12.14.0 test io.ebean ebean-postgis - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-redis - 12.14.0-SNAPSHOT + 12.14.0 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 969353969..1531bb875 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.14.0-SNAPSHOT + 12.14.0 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 99591b3bc..650acc7f0 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.14.0 @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-core-type - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-externalmapping-api - 12.14.0-SNAPSHOT + 12.14.0 diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index ca5834e2c..673bb3efe 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.14.0-SNAPSHOT + 12.14.0 provided io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index df664cb16..c0db68dc1 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index adc50c0a5..0f26c4d89 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.14.0 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.14.0-SNAPSHOT + 12.14.0 @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 test io.ebean ebean-ddl-generator - 12.14.0-SNAPSHOT + 12.14.0 test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index ed40a6aac..c2931772a 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.14.0-SNAPSHOT + 12.14.0 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index a083f762b..9d339ff1a 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.14.0-SNAPSHOT + 12.14.0 test io.ebean querybean-generator - 12.14.0-SNAPSHOT + 12.14.0 test io.ebean ebean-test - 12.14.0-SNAPSHOT + 12.14.0 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 56bb8bcdb..6205759cd 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.14.0-SNAPSHOT + 12.14.0 provided io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 provided io.ebean ebean-querybean - 12.14.0-SNAPSHOT + 12.14.0 test io.ebean querybean-generator - 12.14.0-SNAPSHOT + 12.14.0 test io.ebean ebean-test - 12.14.0-SNAPSHOT + 12.14.0 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index faa5c31e2..da200d0a1 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 provided io.ebean ebean-ddl-generator - 12.14.0-SNAPSHOT + 12.14.0 diff --git a/ebean/pom.xml b/ebean/pom.xml index cf41c4d90..a3ffe3f6c 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 io.ebean ebean-querybean - 12.14.0-SNAPSHOT + 12.14.0 diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index c4ced8ef9..43b4f33fd 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.14.0-SNAPSHOT + 12.14.0 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.0 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.14.0-SNAPSHOT + 12.14.0 test diff --git a/pom.xml b/pom.xml index 0a674062c..33caf79b2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.14.0-SNAPSHOT + 12.14.0 pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.14.0 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 10b8924c4..dbc86adb8 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.0 querybean generator From 3f645211a6fac68d0bffa7650b420e69a9d4bc69 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 16:34:23 +1300 Subject: [PATCH 39/41] [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 b71326907..ca0b583c5 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 5297bb15c..dedf2e053 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.14.0 + HEAD ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 699da8c0f..47f0f4ce4 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-api - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-core-type - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-ddl-generator - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-externalmapping-api - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-autotune - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-querybean - 12.14.0 + 12.14.1-SNAPSHOT io.ebean querybean-generator - 12.14.0 + 12.14.1-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.14.0 + 12.14.1-SNAPSHOT provided io.ebean ebean-test - 12.14.0 + 12.14.1-SNAPSHOT test io.ebean ebean-postgis - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-redis - 12.14.0 + 12.14.1-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 1531bb875..9eb1859c9 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.14.0 + 12.14.1-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 650acc7f0..89aa0e6e5 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.14.0 + HEAD @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-core-type - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-externalmapping-api - 12.14.0 + 12.14.1-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 673bb3efe..6d009ead8 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.14.0 + 12.14.1-SNAPSHOT provided io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index c0db68dc1..1f7620729 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 0f26c4d89..d9727054a 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.14.0 + HEAD ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.14.0 + 12.14.1-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT test io.ebean ebean-ddl-generator - 12.14.0 + 12.14.1-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index c2931772a..3e6e22ede 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.14.0 + 12.14.1-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 9d339ff1a..e04cb19ea 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.14.0 + 12.14.1-SNAPSHOT test io.ebean querybean-generator - 12.14.0 + 12.14.1-SNAPSHOT test io.ebean ebean-test - 12.14.0 + 12.14.1-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 6205759cd..5acd9874b 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.14.0 + 12.14.1-SNAPSHOT provided io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT provided io.ebean ebean-querybean - 12.14.0 + 12.14.1-SNAPSHOT test io.ebean querybean-generator - 12.14.0 + 12.14.1-SNAPSHOT test io.ebean ebean-test - 12.14.0 + 12.14.1-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index da200d0a1..4a2cdf3be 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.14.0 + 12.14.1-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index a3ffe3f6c..751a7d829 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT io.ebean ebean-querybean - 12.14.0 + 12.14.1-SNAPSHOT diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 43b4f33fd..da44acb28 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.14.0 + 12.14.1-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.14.0 + 12.14.1-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.14.0 + 12.14.1-SNAPSHOT test diff --git a/pom.xml b/pom.xml index 33caf79b2..9d8573072 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.14.0 + 12.14.1-SNAPSHOT pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.14.0 + HEAD diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index dbc86adb8..3e50a4758 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.14.0 + 12.14.1-SNAPSHOT querybean generator From 73896d375feee22354c94775c0cd4f216392d11c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 20 Dec 2021 16:49:18 +1300 Subject: [PATCH 40/41] Bump test modules to 12.14.1-SNAPSHOT after release --- ebean-kotlin/pom.xml | 6 +++--- tests/test-java16/pom.xml | 6 +++--- tests/test-kotlin/pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index c5c473f23..b9a3e50c4 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 12.14.0-SNAPSHOT + 12.14.1-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.1-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 12.14.0-SNAPSHOT + 12.14.1-SNAPSHOT test diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index b8408ed0c..302af2a2f 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -20,7 +20,7 @@ io.ebean ebean - 12.14.0-SNAPSHOT + 12.14.1-SNAPSHOT @@ -32,7 +32,7 @@ io.ebean ebean-test - 12.14.0-SNAPSHOT + 12.14.1-SNAPSHOT test @@ -58,7 +58,7 @@ io.ebean querybean-generator - 12.14.0-SNAPSHOT + 12.14.1-SNAPSHOT diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 32d477dfe..5e65046dd 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -36,14 +36,14 @@ io.ebean ebean-test - 12.14.0-SNAPSHOT + 12.14.1-SNAPSHOT test io.ebean ebean-core - 12.14.0-SNAPSHOT + 12.14.1-SNAPSHOT test From 9ddf1333ed01470e204298a5f320434fba9113be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Sougn=C3=A9?= Date: Thu, 23 Dec 2021 17:19:44 +0100 Subject: [PATCH 41/41] Fix locale problem with TestCsvReader and TestCsvReaderWithCallback. --- ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java | 3 ++- .../java/org/tests/text/csv/TestCsvReaderWithCallback.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java index 313f5017c..5658d3263 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReader.java @@ -10,6 +10,7 @@ import org.tests.model.basic.ResetBasicData; import java.io.File; import java.io.FileReader; import java.net.URL; +import java.util.Locale; public class TestCsvReader extends TransactionalTestCase { @@ -32,7 +33,7 @@ public class TestCsvReader extends TransactionalTestCase { // csvReader.addProperty("id"); csvReader.addProperty("status"); csvReader.addProperty("name"); - csvReader.addDateTime("anniversary", "dd-MMM-yyyy"); + csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH); csvReader.addProperty("billingAddress.line1"); csvReader.addProperty("billingAddress.city"); csvReader.addProperty("billingAddress.country.code"); diff --git a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java index ef6bfd8c7..bd620401e 100644 --- a/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java +++ b/ebean-test/src/test/java/org/tests/text/csv/TestCsvReaderWithCallback.java @@ -10,6 +10,7 @@ import org.tests.model.basic.Customer; import java.io.File; import java.io.FileReader; import java.net.URL; +import java.util.Locale; import static org.assertj.core.api.Assertions.assertThat; @@ -32,7 +33,7 @@ public class TestCsvReaderWithCallback extends TransactionalTestCase { // csvReader.addProperty("id"); csvReader.addProperty("status"); csvReader.addProperty("name"); - csvReader.addDateTime("anniversary", "dd-MMM-yyyy"); + csvReader.addDateTime("anniversary", "dd-MMM-yyyy", Locale.ENGLISH); csvReader.addProperty("billingAddress.line1"); csvReader.addProperty("billingAddress.city"); // processor.addReference("billingAddress.country.code");