Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Roland Praml committed 2022-02-03 14:56:55 +01:00
commit 1b10b4e742
67 files changed
+356 -390

No files matched your search

+3 -3
View File
@@ -4,7 +4,7 @@
<parent>
<artifactId>ebean-parent</artifactId>
<groupId>io.ebean</groupId>
<version>12.15.0-SNAPSHOT</version>
<version>12.15.1-SNAPSHOT</version>
</parent>
<!-- <parent>-->
<!-- <groupId>org.avaje</groupId>-->
@@ -26,7 +26,7 @@
<dependency>
<groupId>io.ebean</groupId>
<artifactId>ebean-core</artifactId>
<version>12.15.0-SNAPSHOT</version>
<version>12.15.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>2.3.2</version>
<version>2.3.6</version>
<scope>provided</scope>
</dependency>