github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-14 06:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
# 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
This commit is contained in:
Roland Praml committed 2022-02-02 09:43:41 +01:00
2 parents 0d30bc001e 9d506b4397
commit 090f3cddb8
56 files changed
+593 -597
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pom.xml
+9 -3
View File
@@ -43,11 +43,11 @@
<h2database.version>2.1.210</h2database.version>
<ebean-ddl-runner.version>1.2</ebean-ddl-runner.version>
<ebean-migration-auto.version>1.1</ebean-migration-auto.version>
<ebean-migration.version>12.13.1</ebean-migration.version>
<ebean-migration.version>12.15.0</ebean-migration.version>
<ebean-test-docker.version>4.2</ebean-test-docker.version>
<ebean-datasource.version>7.5</ebean-datasource.version>
<ebean-agent.version>12.14.1</ebean-agent.version>
<ebean-maven-plugin.version>12.14.1</ebean-maven-plugin.version>
<ebean-agent.version>12.15.0</ebean-agent.version>
<ebean-maven-plugin.version>12.15.0</ebean-maven-plugin.version>
</properties>
<build>
@@ -118,6 +118,12 @@
<profile>
<id>release</id>
</profile>
<profile>
<id>h2v1</id>
<properties>
<h2database.version>1.4.199</h2database.version>
</properties>
</profile>
<profile>
<id>default</id>
<activation>