From 0e596fd87f6afbff410dc8df2559b2741c364fd0 Mon Sep 17 00:00:00 2001 From: rob Date: Mon, 20 Feb 2023 10:09:41 +1300 Subject: [PATCH] Modify poms to use ${revision} for parent pom version --- composites/ebean-clickhouse/pom.xml | 2 +- composites/ebean-cockroach/pom.xml | 2 +- composites/ebean-db2/pom.xml | 2 +- composites/ebean-h2/pom.xml | 2 +- composites/ebean-hana/pom.xml | 2 +- composites/ebean-mariadb/pom.xml | 2 +- composites/ebean-mysql/pom.xml | 2 +- composites/ebean-nuodb/pom.xml | 2 +- composites/ebean-oracle/pom.xml | 2 +- composites/ebean-postgres/pom.xml | 2 +- composites/ebean-sqlite/pom.xml | 2 +- composites/ebean-sqlserver/pom.xml | 2 +- composites/ebean-yugabyte/pom.xml | 2 +- composites/ebean/pom.xml | 2 +- composites/pom.xml | 2 +- ebean-api/pom.xml | 2 +- ebean-autotune/pom.xml | 2 +- ebean-bom/pom.xml | 2 +- ebean-core-type/pom.xml | 2 +- ebean-core/pom.xml | 2 +- ebean-csv-reader/pom.xml | 2 +- ebean-ddl-generator/pom.xml | 2 +- ebean-externalmapping-api/pom.xml | 2 +- ebean-externalmapping-xml/pom.xml | 2 +- ebean-jackson-jsonnode/pom.xml | 2 +- ebean-jackson-mapper/pom.xml | 2 +- ebean-joda-time/pom.xml | 2 +- ebean-kotlin/pom.xml | 2 +- ebean-postgis/pom.xml | 2 +- ebean-querybean/pom.xml | 2 +- ebean-redis/pom.xml | 2 +- ebean-test/pom.xml | 2 +- kotlin-querybean-generator/pom.xml | 2 +- platforms/all/pom.xml | 2 +- platforms/clickhouse/pom.xml | 2 +- platforms/db2/pom.xml | 2 +- platforms/h2/pom.xml | 2 +- platforms/hana/pom.xml | 2 +- platforms/hsqldb/pom.xml | 2 +- platforms/mariadb/pom.xml | 2 +- platforms/mysql/pom.xml | 2 +- platforms/nuodb/pom.xml | 2 +- platforms/oracle/pom.xml | 2 +- platforms/pom.xml | 2 +- platforms/postgres/pom.xml | 2 +- platforms/sqlanywhere/pom.xml | 2 +- platforms/sqlite/pom.xml | 2 +- platforms/sqlserver/pom.xml | 2 +- pom.xml | 3 ++- querybean-generator/pom.xml | 2 +- tests/pom.xml | 9 +++------ tests/test-java16/pom.xml | 7 +++++-- tests/test-kotlin/pom.xml | 10 +++------- 53 files changed, 62 insertions(+), 65 deletions(-) diff --git a/composites/ebean-clickhouse/pom.xml b/composites/ebean-clickhouse/pom.xml index c6956c341..52cbffd37 100644 --- a/composites/ebean-clickhouse/pom.xml +++ b/composites/ebean-clickhouse/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-clickhouse diff --git a/composites/ebean-cockroach/pom.xml b/composites/ebean-cockroach/pom.xml index b2fe1f4c7..52f519a4b 100644 --- a/composites/ebean-cockroach/pom.xml +++ b/composites/ebean-cockroach/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-cockroach diff --git a/composites/ebean-db2/pom.xml b/composites/ebean-db2/pom.xml index 791dc8ce8..df22399dd 100644 --- a/composites/ebean-db2/pom.xml +++ b/composites/ebean-db2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-db2 diff --git a/composites/ebean-h2/pom.xml b/composites/ebean-h2/pom.xml index 51d2fa142..6c4419ad0 100644 --- a/composites/ebean-h2/pom.xml +++ b/composites/ebean-h2/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-h2 diff --git a/composites/ebean-hana/pom.xml b/composites/ebean-hana/pom.xml index af57b3c3a..ce395d525 100644 --- a/composites/ebean-hana/pom.xml +++ b/composites/ebean-hana/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-hana diff --git a/composites/ebean-mariadb/pom.xml b/composites/ebean-mariadb/pom.xml index 16bc22e31..2dbc92405 100644 --- a/composites/ebean-mariadb/pom.xml +++ b/composites/ebean-mariadb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-mariadb diff --git a/composites/ebean-mysql/pom.xml b/composites/ebean-mysql/pom.xml index 7aa8cd4db..8ff1e5fc4 100644 --- a/composites/ebean-mysql/pom.xml +++ b/composites/ebean-mysql/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-mysql diff --git a/composites/ebean-nuodb/pom.xml b/composites/ebean-nuodb/pom.xml index fc7d3ee45..81f0ccb58 100644 --- a/composites/ebean-nuodb/pom.xml +++ b/composites/ebean-nuodb/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-nuodb diff --git a/composites/ebean-oracle/pom.xml b/composites/ebean-oracle/pom.xml index 4789950dd..d5c6810e2 100644 --- a/composites/ebean-oracle/pom.xml +++ b/composites/ebean-oracle/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-oracle diff --git a/composites/ebean-postgres/pom.xml b/composites/ebean-postgres/pom.xml index d2deeda02..ed850f5b1 100644 --- a/composites/ebean-postgres/pom.xml +++ b/composites/ebean-postgres/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-postgres diff --git a/composites/ebean-sqlite/pom.xml b/composites/ebean-sqlite/pom.xml index 65c49159a..9af0611f4 100644 --- a/composites/ebean-sqlite/pom.xml +++ b/composites/ebean-sqlite/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-sqlite diff --git a/composites/ebean-sqlserver/pom.xml b/composites/ebean-sqlserver/pom.xml index 92e3ee5d6..221911c2b 100644 --- a/composites/ebean-sqlserver/pom.xml +++ b/composites/ebean-sqlserver/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-sqlserver diff --git a/composites/ebean-yugabyte/pom.xml b/composites/ebean-yugabyte/pom.xml index d7510ac48..450640f69 100644 --- a/composites/ebean-yugabyte/pom.xml +++ b/composites/ebean-yugabyte/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-yugabyte diff --git a/composites/ebean/pom.xml b/composites/ebean/pom.xml index 76007d421..9eda6f406 100644 --- a/composites/ebean/pom.xml +++ b/composites/ebean/pom.xml @@ -4,7 +4,7 @@ composites io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean (all platforms) diff --git a/composites/pom.xml b/composites/pom.xml index 8eb5330a0..54005e4be 100644 --- a/composites/pom.xml +++ b/composites/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} composites diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index dec80b7ba..ce9eab757 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean api diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml index 02a5f8054..80fa1dd9f 100644 --- a/ebean-autotune/pom.xml +++ b/ebean-autotune/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} diff --git a/ebean-bom/pom.xml b/ebean-bom/pom.xml index b04f0450d..3febbb3d7 100644 --- a/ebean-bom/pom.xml +++ b/ebean-bom/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean bom diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 10dc6aec1..e97d20395 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-core-type diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index d4c60b55f..80a2d5b27 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-core diff --git a/ebean-csv-reader/pom.xml b/ebean-csv-reader/pom.xml index 304451a4e..9cf4a81cf 100644 --- a/ebean-csv-reader/pom.xml +++ b/ebean-csv-reader/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-csv-reader diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index 4aa5c9797..1c9d846c7 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean ddl generation diff --git a/ebean-externalmapping-api/pom.xml b/ebean-externalmapping-api/pom.xml index 3cb9e756f..9975772ea 100644 --- a/ebean-externalmapping-api/pom.xml +++ b/ebean-externalmapping-api/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean external mapping api diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml index 74423bcfd..0d06d693f 100644 --- a/ebean-externalmapping-xml/pom.xml +++ b/ebean-externalmapping-xml/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} diff --git a/ebean-jackson-jsonnode/pom.xml b/ebean-jackson-jsonnode/pom.xml index 53c766ec9..431a33d9a 100644 --- a/ebean-jackson-jsonnode/pom.xml +++ b/ebean-jackson-jsonnode/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-jackson-jsonnode diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 8f265e04a..902607c7b 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/ebean-joda-time/pom.xml b/ebean-joda-time/pom.xml index 76a01303c..386187137 100644 --- a/ebean-joda-time/pom.xml +++ b/ebean-joda-time/pom.xml @@ -3,7 +3,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/ebean-kotlin/pom.xml b/ebean-kotlin/pom.xml index da0323c6c..58c5493ac 100644 --- a/ebean-kotlin/pom.xml +++ b/ebean-kotlin/pom.xml @@ -6,7 +6,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-kotlin diff --git a/ebean-postgis/pom.xml b/ebean-postgis/pom.xml index 5b5eeb470..d9652f4fc 100644 --- a/ebean-postgis/pom.xml +++ b/ebean-postgis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean postgis diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 9dbe92a31..3db74f935 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean querybean diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index bee5345b1..3a07ee1f8 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-redis diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 5dd143960..729d576dc 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean test diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 57cdad464..c8526a4c8 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} kotlin querybean generator diff --git a/platforms/all/pom.xml b/platforms/all/pom.xml index 1cf5b1595..8a3e8de01 100644 --- a/platforms/all/pom.xml +++ b/platforms/all/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-all diff --git a/platforms/clickhouse/pom.xml b/platforms/clickhouse/pom.xml index 08a882ffe..c1bb67b11 100644 --- a/platforms/clickhouse/pom.xml +++ b/platforms/clickhouse/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-clickhouse diff --git a/platforms/db2/pom.xml b/platforms/db2/pom.xml index 19396555d..9fa945b6e 100644 --- a/platforms/db2/pom.xml +++ b/platforms/db2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-db2 diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 8ea46da38..5833de736 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-h2 diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml index 777c206e9..568e43aa8 100644 --- a/platforms/hana/pom.xml +++ b/platforms/hana/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-hana diff --git a/platforms/hsqldb/pom.xml b/platforms/hsqldb/pom.xml index 8c2d30922..863c2252a 100644 --- a/platforms/hsqldb/pom.xml +++ b/platforms/hsqldb/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-hsqldb diff --git a/platforms/mariadb/pom.xml b/platforms/mariadb/pom.xml index 506edba7c..94579e939 100644 --- a/platforms/mariadb/pom.xml +++ b/platforms/mariadb/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-mariadb diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml index ba7bfc76f..f4533a42a 100644 --- a/platforms/mysql/pom.xml +++ b/platforms/mysql/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-mysql diff --git a/platforms/nuodb/pom.xml b/platforms/nuodb/pom.xml index b84cb26cc..4c39d1c50 100644 --- a/platforms/nuodb/pom.xml +++ b/platforms/nuodb/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-nuodb diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml index 28e1af331..1dadcbb09 100644 --- a/platforms/oracle/pom.xml +++ b/platforms/oracle/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-oracle diff --git a/platforms/pom.xml b/platforms/pom.xml index 40f008599..2923264d2 100644 --- a/platforms/pom.xml +++ b/platforms/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} platforms diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml index d8e158dc8..9ce1c6e8d 100644 --- a/platforms/postgres/pom.xml +++ b/platforms/postgres/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-postgres diff --git a/platforms/sqlanywhere/pom.xml b/platforms/sqlanywhere/pom.xml index 6be4f3220..ca2f626ca 100644 --- a/platforms/sqlanywhere/pom.xml +++ b/platforms/sqlanywhere/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-sqlanywhere diff --git a/platforms/sqlite/pom.xml b/platforms/sqlite/pom.xml index bc5f1a7c5..924e5f8f0 100644 --- a/platforms/sqlite/pom.xml +++ b/platforms/sqlite/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-sqlite diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml index 1f78448c8..aa0707266 100644 --- a/platforms/sqlserver/pom.xml +++ b/platforms/sqlserver/pom.xml @@ -4,7 +4,7 @@ platforms io.ebean - 13.13.1-SNAPSHOT + ${revision} ebean-platform-sqlserver diff --git a/pom.xml b/pom.xml index d47764a46..4aa62b5c8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ io.ebean ebean-parent - 13.13.1-SNAPSHOT + ${revision} pom ebean parent @@ -38,6 +38,7 @@ + 13.13.1-SNAPSHOT false 2.14.0 2.1.214 diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index 0c0807b51..738e329c4 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -4,7 +4,7 @@ ebean-parent io.ebean - 13.13.1-SNAPSHOT + ${revision} querybean generator diff --git a/tests/pom.xml b/tests/pom.xml index ac7678298..c57db4568 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -2,15 +2,12 @@ 4.0.0 - org.avaje - java8-oss - 3.3 - + ebean-parent + io.ebean + ${revision} - io.ebean tests - 1.0 pom tests diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 5ff9b930f..658487d31 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -2,10 +2,13 @@ 4.0.0 + + tests + io.ebean + ${revision} + - io.ebean test-java16 - 1.0 3.10.1 diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 7c5dec305..e4d79b7d7 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -4,16 +4,12 @@ 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 - 3.7 - + tests + io.ebean + ${revision} - test-kotlin - Kotlin specific tests test-kotlin - 1.0 11