Merge pull request #11497 from freelansam/JAVA-3592

Fix integration build
2021-11-24 19:27:30 +01:00 · 2021-11-24 19:27:30 +01:00 · cd51ebdcc7
parent 592376bf09 2d142da809
commit cd51ebdcc7
2 changed files with 2 additions and 1 deletions
--- a/persistence-modules/hibernate-jpa/src/test/resources/hibernate-pessimistic-locking.properties
+++ b/persistence-modules/hibernate-jpa/src/test/resources/hibernate-pessimistic-locking.properties
@ -1,5 +1,5 @@
 hibernate.connection.driver_class=org.h2.Driver
-hibernate.connection.url=jdbc:h2:mem:mydb3;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=100;MVCC=FALSE
+hibernate.connection.url=jdbc:h2:mem:mydb3;DB_CLOSE_DELAY=-1;LOCK_TIMEOUT=100
 hibernate.connection.username=sa
 hibernate.connection.autocommit=true
 hibernate.dialect=org.hibernate.dialect.H2Dialect
--- a/testing-modules/junit-5-basics/pom.xml
+++ b/testing-modules/junit-5-basics/pom.xml
@ -124,6 +124,7 @@

    <properties>
        <spring.version>5.0.6.RELEASE</spring.version>
+        <h2.version>1.4.197</h2.version> <!-- needs to be specified to be compatible with spring.version 5.0.6.RELEASE -->
    </properties>

 </project>