mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
Merge remote-tracking branch 'upstream/master'
# Conflicts: # ebean-ddl-generator/pom.xml # ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesTest.java # ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesWithJsonMillisTest.java # ebean-test/src/test/java/io/ebean/xtest/core/DatesAndTimesWithJsonNanosTest.java
This commit is contained in:
commit
0c9ec4ebfc
191 files changed
+2380
-1165
No files matched your search
@@ -43,7 +43,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>
|
||||
|
||||
|
||||
Reference in new issue
Block a user