From 2a96a59deb7d16f9a9a04f0d28af746c999c6fbd Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 1 Mar 2022 22:46:55 +1300 Subject: [PATCH 1/6] [maven-release-plugin] prepare release ebean-parent-12.15.1 --- 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 fc69196ed..fa4c6b5ed 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 295f98f77..a7803ee86 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.15.1 ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index 7eaf79de1..fa4a2f8d8 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-api - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-core-type - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-ddl-generator - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-externalmapping-api - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-externalmapping-xml - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-autotune - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-querybean - 12.15.1-SNAPSHOT + 12.15.1 io.ebean querybean-generator - 12.15.1-SNAPSHOT + 12.15.1 provided io.ebean kotlin-querybean-generator - 12.15.1-SNAPSHOT + 12.15.1 provided io.ebean ebean-test - 12.15.1-SNAPSHOT + 12.15.1 test io.ebean ebean-postgis - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-redis - 12.15.1-SNAPSHOT + 12.15.1 diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 48cc579d4..cbf1ba7d4 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.15.1-SNAPSHOT + 12.15.1 diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 3ec7ee806..925571cc6 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.15.1 @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-core-type - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-externalmapping-api - 12.15.1-SNAPSHOT + 12.15.1 diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 2ea053c80..92b6915af 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.15.1-SNAPSHOT + 12.15.1 provided io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 6fb013796..fffeb99fb 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index b85927b29..999bd7184 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.15.1 ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.15.1-SNAPSHOT + 12.15.1 @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 test io.ebean ebean-ddl-generator - 12.15.1-SNAPSHOT + 12.15.1 test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 91ba661f9..4c6766f91 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.15.1-SNAPSHOT + 12.15.1 test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 4245c8d52..f08739ff7 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.15.1-SNAPSHOT + 12.15.1 test io.ebean querybean-generator - 12.15.1-SNAPSHOT + 12.15.1 test io.ebean ebean-test - 12.15.1-SNAPSHOT + 12.15.1 test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 60a67271e..6115b97c2 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.15.1-SNAPSHOT + 12.15.1 provided io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 provided io.ebean ebean-querybean - 12.15.1-SNAPSHOT + 12.15.1 test io.ebean querybean-generator - 12.15.1-SNAPSHOT + 12.15.1 test io.ebean ebean-test - 12.15.1-SNAPSHOT + 12.15.1 test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index fb06dbc40..98d1bff20 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 provided io.ebean ebean-ddl-generator - 12.15.1-SNAPSHOT + 12.15.1 diff --git a/ebean/pom.xml b/ebean/pom.xml index c5512e0cb..bd8ba39f2 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 io.ebean ebean-querybean - 12.15.1-SNAPSHOT + 12.15.1 diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 7272996d8..fc6a007c2 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.15.1-SNAPSHOT + 12.15.1 test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.1 test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.15.1-SNAPSHOT + 12.15.1 test diff --git a/pom.xml b/pom.xml index 7035df30e..8419d22c0 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.15.1-SNAPSHOT + 12.15.1 pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - HEAD + ebean-parent-12.15.1 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 47d9c0c56..2a7ae20e0 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.1 querybean generator From eb4d906814e9d75e7cb35cb4dd9e78afbace34b0 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 1 Mar 2022 22:47:01 +1300 Subject: [PATCH 2/6] [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 fa4c6b5ed..de3d527ac 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index a7803ee86..000e8b6f4 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.15.1 + HEAD ebean autotune @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index fa4a2f8d8..f2ed2c52d 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-api - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-core-type - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-ddl-generator - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-externalmapping-api - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-autotune - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-querybean - 12.15.1 + 12.15.2-SNAPSHOT io.ebean querybean-generator - 12.15.1 + 12.15.2-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.15.1 + 12.15.2-SNAPSHOT provided io.ebean ebean-test - 12.15.1 + 12.15.2-SNAPSHOT test io.ebean ebean-postgis - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-redis - 12.15.1 + 12.15.2-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index cbf1ba7d4..9ced7795f 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.15.1 + 12.15.2-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 925571cc6..6acce5f26 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean-core @@ -15,7 +15,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.15.1 + HEAD @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-core-type - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-externalmapping-api - 12.15.1 + 12.15.2-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 92b6915af..9ecc33488 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.15.1 + 12.15.2-SNAPSHOT provided io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index fffeb99fb..e026e8e6c 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 999bd7184..f9a11188b 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT @@ -14,7 +14,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.15.1 + HEAD ebean external mapping xml @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.15.1 + 12.15.2-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT test io.ebean ebean-ddl-generator - 12.15.1 + 12.15.2-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 4c6766f91..f9e3d0fee 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.15.1 + 12.15.2-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index f08739ff7..62ce22809 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.15.1 + 12.15.2-SNAPSHOT test io.ebean querybean-generator - 12.15.1 + 12.15.2-SNAPSHOT test io.ebean ebean-test - 12.15.1 + 12.15.2-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 6115b97c2..74ede17e8 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.15.1 + 12.15.2-SNAPSHOT provided io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT provided io.ebean ebean-querybean - 12.15.1 + 12.15.2-SNAPSHOT test io.ebean querybean-generator - 12.15.1 + 12.15.2-SNAPSHOT test io.ebean ebean-test - 12.15.1 + 12.15.2-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 98d1bff20..e3451ca75 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.15.1 + 12.15.2-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index bd8ba39f2..1fc8da96c 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT io.ebean ebean-querybean - 12.15.1 + 12.15.2-SNAPSHOT diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index fc6a007c2..b39d00ab3 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.15.1 + 12.15.2-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.15.1 + 12.15.2-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.15.1 + 12.15.2-SNAPSHOT test diff --git a/pom.xml b/pom.xml index 8419d22c0..155841d6d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.15.1 + 12.15.2-SNAPSHOT pom ebean parent @@ -18,7 +18,7 @@ scm:git:git@github.com:ebean-orm/ebean.git - ebean-parent-12.15.1 + HEAD diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 2a7ae20e0..c5872847c 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.1 + 12.15.2-SNAPSHOT querybean generator From 05338531edf9c821cb8ff35c8fe9527299b94978 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Tue, 1 Mar 2022 23:01:09 +1300 Subject: [PATCH 3/6] Bump versions 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 6eadb686c..5d0f6d5d1 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 12.15.1-SNAPSHOT + 12.15.2-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.2-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 12.15.1-SNAPSHOT + 12.15.2-SNAPSHOT test diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 370b558cc..656efd200 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -20,7 +20,7 @@ io.ebean ebean - 12.15.1-SNAPSHOT + 12.15.2-SNAPSHOT @@ -32,7 +32,7 @@ io.ebean ebean-test - 12.15.1-SNAPSHOT + 12.15.2-SNAPSHOT test @@ -58,7 +58,7 @@ io.ebean querybean-generator - 12.15.1-SNAPSHOT + 12.15.2-SNAPSHOT diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index f9507fef1..e22b98e28 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -36,14 +36,14 @@ io.ebean ebean-test - 12.15.1-SNAPSHOT + 12.15.2-SNAPSHOT test io.ebean ebean-core - 12.15.1-SNAPSHOT + 12.15.2-SNAPSHOT test From 49fde7654ed07921ce065816fd62d2961941f623 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 2 Mar 2022 12:17:38 +1300 Subject: [PATCH 4/6] Bump to 12.16.0-SNAPSHOT --- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 4 ++-- ebean-bom/pom.xml | 30 +++++++++++++++--------------- ebean-core-type/pom.xml | 4 ++-- ebean-core/pom.xml | 8 ++++---- ebean-ddl-generator/pom.xml | 6 +++--- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 8 ++++---- ebean-kotlin/pom.xml | 6 +++--- 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 | 2 +- querybean-generator/pom.xml | 2 +- tests/test-java16/pom.xml | 6 +++--- tests/test-kotlin/pom.xml | 4 ++-- 19 files changed, 67 insertions(+), 67 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index de3d527ac..b3f58a524 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 000e8b6f4..dcffd03f0 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT @@ -26,7 +26,7 @@ io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index f2ed2c52d..b414303e1 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean bom @@ -71,88 +71,88 @@ io.ebean ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-api - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-core-type - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-ddl-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-externalmapping-api - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-externalmapping-xml - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-autotune - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-querybean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean querybean-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided io.ebean kotlin-querybean-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided io.ebean ebean-test - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test io.ebean ebean-postgis - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-redis - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 9ced7795f..df0f219d8 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean-core-type @@ -16,7 +16,7 @@ io.ebean ebean-api - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 6acce5f26..05490669f 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean-core @@ -41,19 +41,19 @@ io.ebean ebean-api - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-core-type - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-externalmapping-api - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 9ecc33488..ca8918d6a 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean ddl generation @@ -28,14 +28,14 @@ io.ebean ebean-core-type - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index e026e8e6c..f49bf1753 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index f9a11188b..ad14307c0 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT @@ -33,7 +33,7 @@ io.ebean ebean-externalmapping-api - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT @@ -59,14 +59,14 @@ io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test io.ebean ebean-ddl-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index 5d0f6d5d1..58870dfdd 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -5,7 +5,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT 4.0.0 @@ -29,7 +29,7 @@ io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided @@ -51,7 +51,7 @@ io.ebean ebean-test - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index f9e3d0fee..26ac20f9d 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean postgis @@ -23,7 +23,7 @@ io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided @@ -74,7 +74,7 @@ io.ebean ebean-test - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 62ce22809..ae9595f1e 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean querybean @@ -17,7 +17,7 @@ io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided @@ -56,21 +56,21 @@ io.ebean ebean-ddl-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test io.ebean querybean-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test io.ebean ebean-test - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index 74ede17e8..02f84bc88 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean-redis @@ -22,35 +22,35 @@ io.ebean ebean-api - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided io.ebean ebean-querybean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test io.ebean querybean-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test io.ebean ebean-test - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index e3451ca75..a88660e0a 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean test @@ -29,14 +29,14 @@ io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT provided io.ebean ebean-ddl-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT diff --git a/ebean/pom.xml b/ebean/pom.xml index 1fc8da96c..a62ad8df4 100644 --- a/ebean/pom.xml +++ b/ebean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT ebean composite @@ -22,20 +22,20 @@ io.ebean ebean-api - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT io.ebean ebean-querybean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index b39d00ab3..a7c7e29a8 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT kotlin querybean generator @@ -29,7 +29,7 @@ io.ebean ebean-querybean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test @@ -43,7 +43,7 @@ io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test @@ -64,7 +64,7 @@ io.ebean ebean-ddl-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test diff --git a/pom.xml b/pom.xml index 155841d6d..5fcf54843 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT pom ebean parent diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index c5872847c..5a129080c 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT querybean generator diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 656efd200..d71865bc3 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -20,7 +20,7 @@ io.ebean ebean - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT @@ -32,7 +32,7 @@ io.ebean ebean-test - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test @@ -58,7 +58,7 @@ io.ebean querybean-generator - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index e22b98e28..9b0caa10d 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -36,14 +36,14 @@ io.ebean ebean-test - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test io.ebean ebean-core - 12.15.2-SNAPSHOT + 12.16.0-SNAPSHOT test From c5acd31da48140c6811e3430720bd6b7ef1e83b6 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 2 Mar 2022 12:25:57 +1300 Subject: [PATCH 5/6] #2579 - Bump to ebean-migration 12.16.0, support both basePlatform and platform for finding/running migrations --- ebean-core/pom.xml | 2 +- .../java/io/ebeaninternal/server/core/DefaultServer.java | 4 +++- ebean-ddl-generator/pom.xml | 2 +- pom.xml | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 05490669f..09e51a6ce 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -23,7 +23,7 @@ io.ebean ebean-ddl-runner - 1.2 + ${ebean-ddl-runner.version} diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 552816408..2f51eeffd 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -373,7 +373,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { migrationRunner.setDefaultDbSchema(dbSchema); } migrationRunner.setName(config.getName()); - migrationRunner.setPlatform(config.getDatabasePlatform().getPlatform().base().name().toLowerCase()); + Platform platform = config.getDatabasePlatform().getPlatform(); + migrationRunner.setBasePlatform(platform.base().name().toLowerCase()); + migrationRunner.setPlatform(platform.name().toLowerCase()); migrationRunner.loadProperties(config.getProperties()); migrationRunner.run(config.getDataSource()); } diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index ca8918d6a..d05318f87 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -16,7 +16,7 @@ io.ebean ebean-ddl-runner - 1.2 + ${ebean-ddl-runner.version} diff --git a/pom.xml b/pom.xml index 5fcf54843..fc4c0db53 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,10 @@ false 2.12.1 2.1.210 - 1.2 + 1.3 1.1 - 12.15.0 - 4.2 + 12.16.0 + 4.5 7.5 12.15.0 12.15.0 From 61f5442e3bc99da7ae070de2a6d0d839e1691013 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 2 Mar 2022 12:30:32 +1300 Subject: [PATCH 6/6] #2579 - Bump to ebean-migration 12.16.0, support both basePlatform and platform for finding/running migrations Fix ebean-migration-auto.version to 1.2 --- ebean-core/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index 09e51a6ce..164763862 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -35,7 +35,7 @@ io.ebean ebean-migration-auto - 1.1 + ${ebean-migration-auto.version} diff --git a/pom.xml b/pom.xml index fc4c0db53..4ecd1aac1 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 2.12.1 2.1.210 1.3 - 1.1 + 1.2 12.16.0 4.5 7.5