Commit Graph
94 Commits
Author SHA1 Message Date
Roland Praml 0c6c1abb55 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	ebean-core/src/main/java/io/ebeaninternal/server/deploy/TablespaceMeta.java
#	ebean-core/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/BaseTableDdl.java
#	ebean-ddl-generator/src/main/java/io/ebeaninternal/dbmigration/ddlgeneration/platform/PlatformDdl.java
#	ebean-ddl-generator/src/test/java/io/ebeaninternal/dbmigration/model/ModelContainerApplyTest.java
#	ebean-test/src/test/java/misc/migration/v1_0/EBasic.java
#	ebean-test/src/test/java/misc/migration/v1_1/MtmChild.java
#	ebean-test/src/test/java/misc/migration/v1_1/MtmMaster.java
#	ebean-test/src/test/java/org/tests/json/TestDbJson_List.java
#	ebean-test/src/test/resources/extra-ddl.xml
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2fori/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2legacy/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/I__create_tablespaces.sql
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2luw/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/db2zos/idx_db2.migrations
#	ebean-test/src/test/resources/migrationtest/dbmigration/model/1.0__initial.model.xml
#	ebean-test/src/test/resources/migrationtest/dbmigration/model/1.1.model.xml
2022-03-24 09:20:28 +01:00
Rob Bygrave f270c52c00 Bump maven-compiler-plugin 2022-03-24 16:58:41 +13:00
Roland Praml a86212a55c FIX: Poms 2022-03-17 12:06:14 +01:00
Rob Bygrave 923f83cafb Bump after release to 12.16.1-SNAPSHOT 2022-03-17 21:37:56 +13:00
Roland Praml e252ff4932 Merge remote-tracking branch 'upstream/master' 2022-03-16 14:04:20 +01:00
Roland Praml febd24c6dc Bump version for merge 2022-03-16 11:41:42 +01:00
Rob Bygrave 3bc7f061eb Bump test dependencies for junit, assertj, mockito 2022-03-16 17:55:37 +13:00
Noemi Szemenyei 4399c61a62 fix poms 2022-03-15 15:49:12 +01:00
Noemi Szemenyei 88c343c1e1 [maven-release-plugin] prepare for next development iteration 2022-03-15 15:42:35 +01:00
Noemi Szemenyei 096e5ea2c5 [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC12 2022-03-15 15:42:27 +01:00
Noemi Szemenyei 256f000dec Fix poms 2022-03-15 11:16:52 +01:00
Noemi Szemenyei 7d7c2d21a9 [maven-release-plugin] prepare for next development iteration 2022-03-15 11:13:04 +01:00
Noemi Szemenyei b5ad904de4 [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC11 2022-03-15 11:12:57 +01:00
Noemi Szemenyei 3c6827f27d fix pom.xml 2022-03-14 08:56:47 +01:00
Noemi Szemenyei 6c431f0a7d [maven-release-plugin] prepare for next development iteration 2022-03-14 08:52:23 +01:00
Noemi Szemenyei bf1e9e9db9 [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC10 2022-03-14 08:52:16 +01:00
Noemi Szemenyei 914de92152 fix poms 2022-03-10 10:10:03 +01:00
Noemi Szemenyei be7b4c8f96 [maven-release-plugin] prepare for next development iteration 2022-03-10 10:03:55 +01:00
Noemi Szemenyei dc2e6be1be [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC9 2022-03-10 10:03:44 +01:00
Roland Praml 0876a61972 FIX: Poms 2022-03-07 09:13:54 +01:00
Roland Praml 8747388da6 [maven-release-plugin] prepare for next development iteration 2022-03-07 09:02:01 +01:00
Roland Praml 5d55a38d67 [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC8 2022-03-07 09:01:49 +01:00
Rob Bygrave 49fde7654e Bump to 12.16.0-SNAPSHOT 2022-03-02 12:17:38 +13:00
Rob Bygrave 05338531ed Bump versions after release 2022-03-01 23:01:09 +13:00
Noemi Szemenyei a02f7e6f09 fix poms 2022-02-18 10:52:19 +01:00
Noemi Szemenyei 4849fa650d [maven-release-plugin] prepare for next development iteration 2022-02-18 10:47:36 +01:00
Noemi Szemenyei 526a7241a0 [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC7 2022-02-18 10:47:23 +01:00
Noemi Szemenyei 0648545854 fix poms 2022-02-17 08:10:55 +01:00
Noemi Szemenyei 05c6679bcf [maven-release-plugin] prepare for next development iteration 2022-02-17 08:07:28 +01:00
Noemi Szemenyei 9568f239b1 [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC6 2022-02-17 08:07:18 +01:00
Noemi Szemenyei 6e59ca40d7 fix poms
(cherry picked from commit 8949ede4d2be0eaf46b10b4877879e8977680ea1)
2022-02-16 08:49:17 +01:00
Alexander Wagner c064172108 [maven-release-plugin] prepare for next development iteration 2022-02-11 10:59:53 +01:00
Alexander Wagner 3e1f842533 [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC5 2022-02-11 10:59:42 +01:00
Alexander Wagner 3612dd353d [maven-release-plugin] prepare for next development iteration 2022-02-11 10:49:09 +01:00
Alexander Wagner 899c23ffce [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC4 2022-02-11 10:48:57 +01:00
Noemi Szemenyei bd6bac89fc FIX: version number in POM 2022-02-04 13:23:13 +01:00
Noemi Szemenyei 0c8e790bc6 [maven-release-plugin] prepare for next development iteration 2022-02-04 13:09:22 +01:00
Noemi Szemenyei fd98880453 [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC3 2022-02-04 13:09:10 +01:00
Roland Praml 09230924f7 FIX: version number in POM 2022-02-04 09:13:27 +01:00
Roland Praml 560146eb21 Bump version after release 2022-02-03 16:09:38 +01:00
Roland Praml ebf2b78bbc [maven-release-plugin] prepare for next development iteration 2022-02-03 15:17:42 +01:00
Roland Praml 7346dde26c [maven-release-plugin] prepare release ebean-parent-12.15.1-FOC1 2022-02-03 15:17:25 +01:00
Roland Praml 77d5ce8d94 Bump version to 12.15.1-FOC1-SNAPSHOT 2022-02-03 15:03:28 +01:00
Roland Praml 1b10b4e742 Merge remote-tracking branch 'upstream/master' 2022-02-03 14:56:55 +01:00
Rob Bygrave f4d92eed18 Bump test modules to 12.15.1-SNAPSHOT after release 2022-02-03 09:19:10 +13:00
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
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