Commit Graph
149 Commits
Author SHA1 Message Date
Roland Praml 090f3cddb8 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	ebean-bom/pom.xml
#	ebean-core/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/DB2Ddl.java
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.1.sql
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/1.3.sql
#	ebean-ddl-generator/src/test/resources/dbmigration/migrationtest/db2/idx_db2.migrations
#	ebean-test/src/test/java/org/tests/basic/TestMetaAnnotation.java
#	ebean-test/src/test/java/org/tests/model/basic/cache/TestCacheViaComplexNaturalKey3.java
#	tests/test-java16/pom.xml
#	tests/test-kotlin/pom.xml
2022-02-02 09:43:41 +01:00
Roland Praml 0d30bc001e Bump version to 12.15.0-SNAPSHOT 2022-02-02 09:35:34 +01:00
Rob Bygrave 9d506b4397 Bump test dependencies 2022-02-02 20:48:55 +13:00
Rob Bygrave a1c0e21234 Bump to 12.15.0-SNAPSHOT 2022-02-02 10:59:04 +13:00
Roland Praml 30fb55b401 [maven-release-plugin] prepare for next development iteration 2022-01-28 15:05:23 +01:00
Roland Praml 8923f5a464 [maven-release-plugin] prepare release ebean-parent-12.14.2-FOC2 2022-01-28 15:05:12 +01:00
Roland Praml 87a04f15dc [maven-release-plugin] prepare for next development iteration 2022-01-26 17:08:33 +01:00
Roland Praml e7cb147ef8 [maven-release-plugin] prepare release ebean-parent-12.14.2-FOC1 2022-01-26 17:08:18 +01:00
Roland Praml b8365b277a preparing for release 2022-01-26 17:05:11 +01:00
Roland Praml 5762a5bb9c Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	ebean-bom/pom.xml
#	ebean-core/src/main/java/io/ebeaninternal/server/expression/platform/DbExpressionHandlerFactory.java
#	ebean-core/src/main/java/io/ebeaninternal/server/persist/dml/InsertMeta.java
#	ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNode.java
#	ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeNodeBean.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DdlPlugin.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/DefaultDbMigration.java
#	ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/MysqlGenerateMigrationTest.java
#	ebean-test/pom.xml
#	pom.xml
#	tests/pom.xml
#	tests/test-java16/pom.xml
#	tests/test-kotlin/pom.xml
2022-01-26 13:51:56 +01:00
Roland Praml 46629b79f1 updated version 2022-01-26 12:56:09 +01:00
Rob Bygrave fa561e5197 CI Build with single test and bump enhancement tiles 2022-01-26 14:52:32 +13:00
Noemi Szemenyei 2aeb3dbf98 [maven-release-plugin] prepare for next development iteration 2022-01-25 09:14:13 +01:00
Noemi Szemenyei 8230d58c59 [maven-release-plugin] prepare release ebean-parent-12.14.1-FOC7 2022-01-25 09:14:02 +01:00
Noemi Szemenyei 755385c52f [maven-release-plugin] prepare for next development iteration 2022-01-21 14:50:34 +01:00
Noemi Szemenyei 4e5b8fa5ea [maven-release-plugin] prepare release ebean-parent-12.14.1-FOC6 2022-01-21 14:50:17 +01:00
Roland Praml 44167def1e [maven-release-plugin] prepare for next development iteration 2022-01-20 08:26:57 +01:00
Roland Praml 961f9f6f6c [maven-release-plugin] prepare release ebean-parent-12.14.1-FOC5 2022-01-20 08:26:49 +01:00
Rob Bygrave df8ae18bf6 [maven-release-plugin] prepare for next development iteration 2022-01-17 22:31:00 +13:00
Rob Bygrave 8edaabf755 [maven-release-plugin] prepare release ebean-parent-12.14.1 2022-01-17 22:30:53 +13:00
Roland Praml 9f463437c2 [maven-release-plugin] prepare for next development iteration 2022-01-13 14:01:13 +01:00
Roland Praml eb0445eadd [maven-release-plugin] prepare release ebean-parent-12.14.1-FOC4 2022-01-13 14:01:02 +01:00
Roland Praml 2328456e88 [maven-release-plugin] prepare for next development iteration 2022-01-12 13:47:13 +01:00
Roland Praml 097c121694 [maven-release-plugin] prepare release ebean-parent-12.14.1-FOC3 2022-01-12 13:47:00 +01:00
Roland Praml bcf481aff5 prepare for next development iteration 2022-01-11 09:09:15 +01:00
Roland Praml 704e7ccece [maven-release-plugin] prepare release ebean-parent-12.14.1-FOC2 2022-01-11 09:06:16 +01:00
Roland Praml c3dbb47667 [maven-release-plugin] prepare for next development iteration 2022-01-10 14:29:21 +01:00
Roland Praml 79c876807b [maven-release-plugin] prepare release ebean-parent-12.14.1-FOC1 2022-01-10 14:29:06 +01:00
Roland Praml 803325cb4b version bump 2022-01-04 07:58:35 +01:00
Roland Praml 3407d5a5e7 bump version 2022-01-03 15:51:54 +01:00
Rob Bygrave 3f645211a6 [maven-release-plugin] prepare for next development iteration 2021-12-20 16:34:23 +13:00
Rob Bygrave 451e2fa93c [maven-release-plugin] prepare release ebean-parent-12.14.0 2021-12-20 16:34:17 +13:00
Rob Bygrave c411d9a665 Bump version to 12.14.0-SNAPSHOT 2021-12-20 12:47:36 +13:00
Roland Praml c8469e7364 remove backup files 2021-12-17 10:17:49 +01:00
Rob Bygrave 752d5d4782 Remove pom.xml.releaseBackup from barfed release 2021-12-17 21:47:07 +13:00
Roland Praml 7c6fc68c63 Moved to FOC1 2021-12-17 09:25:11 +01:00
Rob Bygrave 5fddc37037 [maven-release-plugin] prepare for next development iteration 2021-12-17 17:26:43 +13:00
Rob Bygrave ca6e3963db [maven-release-plugin] prepare release ebean-parent-12.13.2 2021-12-17 17:26:36 +13:00
Rob Bygrave 0a71ad624e [maven-release-plugin] prepare for next development iteration 2021-11-26 21:57:10 +13:00
Rob Bygrave 09115a824d [maven-release-plugin] prepare release ebean-parent-12.13.1 2021-11-26 21:57:04 +13:00
Rob Bygrave 5807874c9e [maven-release-plugin] prepare for next development iteration 2021-11-04 11:19:32 +13:00
Rob Bygrave ea7b4e8162 [maven-release-plugin] prepare release ebean-parent-12.13.0 2021-11-04 11:19:25 +13:00
Rob Bygrave 0f60e2240c Bump version to 12.13.0-SNAPSHOT 2021-11-04 10:57:48 +13:00
Rob Bygrave fa4e013692 [maven-release-plugin] prepare for next development iteration 2021-10-21 21:36:29 +13:00
Rob Bygrave 08502d7315 [maven-release-plugin] prepare release ebean-parent-12.12.3 2021-10-21 21:36:21 +13:00
Rob Bygrave 92a13ad265 Remove pom releaseBackup files that should not be there 2021-10-20 09:52:06 +13:00
Rob Bygrave caf18565a0 [maven-release-plugin] prepare for next development iteration 2021-10-12 12:46:15 +13:00
Rob Bygrave c89d39ec2d [maven-release-plugin] prepare release ebean-parent-12.12.2 2021-10-12 12:46:08 +13:00
Rob Bygrave 0a0d67585c [maven-release-plugin] prepare for next development iteration 2021-10-05 10:50:00 +13:00
Rob Bygrave db2f8cd811 [maven-release-plugin] prepare release ebean-parent-12.12.1 2021-10-05 10:49:53 +13:00