[BAEL-3936] Merged with upstream and fixed conflicts

This commit is contained in:
Kostas Karavitis
2020-04-28 20:35:04 +03:00
155 changed files with 2738 additions and 609 deletions

View File

@@ -139,7 +139,7 @@
<properties>
<hibernate.version>5.4.14.Final</hibernate.version>
<eclipselink.version>2.7.4-RC1</eclipselink.version>
<eclipselink.version>2.7.4</eclipselink.version>
<postgres.version>42.2.5</postgres.version>
<javax.persistence-api.version>2.2</javax.persistence-api.version>
<assertj.version>3.11.1</assertj.version>