From 848fa01e4723f7777914a4bdb07a00610f6286f4 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Fri, 19 Nov 2021 23:17:22 +0530
Subject: [PATCH 1/5] JAVA-3592: Upgrade h2 dependency in the main pom.xml

---
 libraries-data-db/pom.xml                                       | 1 -
 pom.xml                                                         | 2 +-
 spring-boot-modules/spring-boot-angular/pom.xml                 | 1 -
 spring-boot-modules/spring-boot-data/pom.xml                    | 1 -
 .../spring-session/spring-session-jdbc/pom.xml                  | 1 -
 testing-modules/spring-testing-2/pom.xml                        | 1 -
 6 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/libraries-data-db/pom.xml b/libraries-data-db/pom.xml
index 20119da8a2..c0f2848705 100644
--- a/libraries-data-db/pom.xml
+++ b/libraries-data-db/pom.xml
@@ -63,7 +63,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
         </dependency>
         <!-- Hikari CP -->
         <dependency>
diff --git a/pom.xml b/pom.xml
index 372bc5a9f3..6b1b29fb8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1428,7 +1428,7 @@
         <!-- <maven-pmd-plugin.version>3.9.0</maven-pmd-plugin.version> -->
         <maven-pmd-plugin.version>3.13.0</maven-pmd-plugin.version>
         <lombok.version>1.18.20</lombok.version>
-        <h2.version>1.4.197</h2.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/spring-boot-modules/spring-boot-angular/pom.xml b/spring-boot-modules/spring-boot-angular/pom.xml
index 89a8814d2f..443e7b2f88 100644
--- a/spring-boot-modules/spring-boot-angular/pom.xml
+++ b/spring-boot-modules/spring-boot-angular/pom.xml
@@ -32,7 +32,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/spring-boot-modules/spring-boot-data/pom.xml b/spring-boot-modules/spring-boot-data/pom.xml
index 447b730c02..46ca8639ed 100644
--- a/spring-boot-modules/spring-boot-data/pom.xml
+++ b/spring-boot-modules/spring-boot-data/pom.xml
@@ -36,7 +36,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/spring-security-modules/spring-session/spring-session-jdbc/pom.xml b/spring-security-modules/spring-session/spring-session-jdbc/pom.xml
index 64bbce44f2..3cc2b8d18e 100644
--- a/spring-security-modules/spring-session/spring-session-jdbc/pom.xml
+++ b/spring-security-modules/spring-session/spring-session-jdbc/pom.xml
@@ -28,7 +28,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
diff --git a/testing-modules/spring-testing-2/pom.xml b/testing-modules/spring-testing-2/pom.xml
index f3e4f098b4..82a9ed9599 100644
--- a/testing-modules/spring-testing-2/pom.xml
+++ b/testing-modules/spring-testing-2/pom.xml
@@ -26,7 +26,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>

From ef2f20f277982a146d38c354ada8c31ecb4f736e Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Sat, 20 Nov 2021 13:17:25 +0530
Subject: [PATCH 2/5] explicit h2 version for hibernate-mapping

---
 persistence-modules/hibernate-mapping/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/persistence-modules/hibernate-mapping/pom.xml b/persistence-modules/hibernate-mapping/pom.xml
index 805402951e..e837f57d8f 100644
--- a/persistence-modules/hibernate-mapping/pom.xml
+++ b/persistence-modules/hibernate-mapping/pom.xml
@@ -75,6 +75,7 @@
     </dependencies>
 
     <properties>
+        <h2.version>1.4.197</h2.version> <!-- needs to be specified as it fails with parent's 1.4.200 -->
         <hibernate.version>5.4.12.Final</hibernate.version>
         <hibernate-types.version>2.10.4</hibernate-types.version>
         <assertj-core.version>3.8.0</assertj-core.version>

From e502fdcbf1854001b111f9a501c45c3684ba2a30 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Sun, 21 Nov 2021 13:32:09 +0530
Subject: [PATCH 3/5] explicit h2 version for spring-data-eclipselink and
 core-java-lang-oop-modifiers

---
 core-java-modules/core-java-lang-oop-modifiers/pom.xml | 1 +
 persistence-modules/spring-data-eclipselink/pom.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core-java-modules/core-java-lang-oop-modifiers/pom.xml b/core-java-modules/core-java-lang-oop-modifiers/pom.xml
index 70c70608eb..3cdcc3a481 100644
--- a/core-java-modules/core-java-lang-oop-modifiers/pom.xml
+++ b/core-java-modules/core-java-lang-oop-modifiers/pom.xml
@@ -30,6 +30,7 @@
 
     <properties>
         <assertj-core.version>3.10.0</assertj-core.version>
+        <h2.version>1.4.197</h2.version> <!-- needs to be specified as it fails with parent's 1.4.200 -->
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-eclipselink/pom.xml b/persistence-modules/spring-data-eclipselink/pom.xml
index a344d64864..561d144fe3 100644
--- a/persistence-modules/spring-data-eclipselink/pom.xml
+++ b/persistence-modules/spring-data-eclipselink/pom.xml
@@ -66,6 +66,7 @@
     <properties>
         <spring.version>1.5.9.RELEASE</spring.version>
         <eclipselink.version>2.7.0</eclipselink.version>
+        <h2.version>1.4.197</h2.version> <!-- needs to be specified as it fails with parent's 1.4.200 -->
     </properties>
 
 </project>
\ No newline at end of file

From d9b23200d1f073a2c67e68abd26e6a044e272297 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Sun, 21 Nov 2021 17:58:26 +0530
Subject: [PATCH 4/5] removed explicit h2.version as parent now is at the
 required 1.4.200

---
 libraries-testing/pom.xml                                | 1 -
 persistence-modules/core-java-persistence-2/pom.xml      | 1 -
 persistence-modules/core-java-persistence/pom.xml        | 1 -
 persistence-modules/hibernate-annotations/pom.xml        | 1 -
 persistence-modules/jooq/pom.xml                         | 1 -
 persistence-modules/r2dbc/pom.xml                        | 1 -
 persistence-modules/spring-data-mongodb-reactive/pom.xml | 2 --
 persistence-modules/spring-persistence-simple/pom.xml    | 1 -
 spring-5-data-reactive/pom.xml                           | 2 --
 spring-boot-modules/spring-boot-libraries/pom.xml        | 2 --
 spring-boot-modules/spring-boot-react/pom.xml            | 2 --
 11 files changed, 15 deletions(-)

diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml
index d7b4a88369..7df5750134 100644
--- a/libraries-testing/pom.xml
+++ b/libraries-testing/pom.xml
@@ -208,7 +208,6 @@
         <spring-mock-mvc.version>4.1.1</spring-mock-mvc.version>
         <assertj.version>3.14.0</assertj.version>
         <java-hamcrest.version>2.0.0.0</java-hamcrest.version>
-        <h2.version>1.4.200</h2.version>
         <dbunit.version>2.7.0</dbunit.version>
         <assertj-core.version>3.14.0</assertj-core.version>
         <maven-compiler-plugin.target>1.8</maven-compiler-plugin.target>
diff --git a/persistence-modules/core-java-persistence-2/pom.xml b/persistence-modules/core-java-persistence-2/pom.xml
index 15676bf03e..780c1fcfca 100644
--- a/persistence-modules/core-java-persistence-2/pom.xml
+++ b/persistence-modules/core-java-persistence-2/pom.xml
@@ -44,7 +44,6 @@
     </dependencies>
 
     <properties>
-        <h2.version>1.4.200</h2.version>
         <mssql.driver.version>8.4.1.jre11</mssql.driver.version>
         <oracle.driver.version>10.2.0.4.0</oracle.driver.version>
         <mysql.driver.version>8.0.22</mysql.driver.version>
diff --git a/persistence-modules/core-java-persistence/pom.xml b/persistence-modules/core-java-persistence/pom.xml
index 96f8cef310..17d7db28d9 100644
--- a/persistence-modules/core-java-persistence/pom.xml
+++ b/persistence-modules/core-java-persistence/pom.xml
@@ -61,7 +61,6 @@
     </dependencies>
 
     <properties>
-        <h2.version>1.4.200</h2.version>
         <assertj-core.version>3.10.0</assertj-core.version>
         <commons-dbcp2.version>2.4.0</commons-dbcp2.version>
         <HikariCP.version>3.2.0</HikariCP.version>
diff --git a/persistence-modules/hibernate-annotations/pom.xml b/persistence-modules/hibernate-annotations/pom.xml
index e5c19915a4..634cd64cca 100644
--- a/persistence-modules/hibernate-annotations/pom.xml
+++ b/persistence-modules/hibernate-annotations/pom.xml
@@ -45,7 +45,6 @@
 
     <properties>
         <hibernate-core.version>5.4.7.Final</hibernate-core.version>
-        <h2.version>1.4.200</h2.version>
         <maven.deploy.skip>true</maven.deploy.skip>
         <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
         <hibernate.core.version>5.4.7.Final</hibernate.core.version>
diff --git a/persistence-modules/jooq/pom.xml b/persistence-modules/jooq/pom.xml
index c66be9db77..b9229377ab 100644
--- a/persistence-modules/jooq/pom.xml
+++ b/persistence-modules/jooq/pom.xml
@@ -45,7 +45,6 @@
 
     <properties>
         <jooq.version>3.13.4</jooq.version>
-        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/r2dbc/pom.xml b/persistence-modules/r2dbc/pom.xml
index ae4ca4d91d..1ce5eb3e96 100644
--- a/persistence-modules/r2dbc/pom.xml
+++ b/persistence-modules/r2dbc/pom.xml
@@ -63,7 +63,6 @@
 
     <properties>
         <r2dbc-h2.version>0.8.1.RELEASE</r2dbc-h2.version>
-        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-mongodb-reactive/pom.xml b/persistence-modules/spring-data-mongodb-reactive/pom.xml
index c1398ca80d..2220418ac3 100644
--- a/persistence-modules/spring-data-mongodb-reactive/pom.xml
+++ b/persistence-modules/spring-data-mongodb-reactive/pom.xml
@@ -71,7 +71,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -126,7 +125,6 @@
     <properties>
         <spring-tx.version>5.2.2.RELEASE</spring-tx.version>
         <httpclient.version>4.5.2</httpclient.version>
-        <h2.version>1.4.200</h2.version>
         <reactor-core.version>3.3.1.RELEASE</reactor-core.version>
     </properties>
 
diff --git a/persistence-modules/spring-persistence-simple/pom.xml b/persistence-modules/spring-persistence-simple/pom.xml
index 437a439b99..ec7c8bd3a0 100644
--- a/persistence-modules/spring-persistence-simple/pom.xml
+++ b/persistence-modules/spring-persistence-simple/pom.xml
@@ -92,7 +92,6 @@
         <persistence-api.version>2.2</persistence-api.version>
         <transaction-api.version>1.3</transaction-api.version>
         <spring-data-jpa.version>2.2.7.RELEASE</spring-data-jpa.version>
-        <h2.version>1.4.200</h2.version>
         <!-- simple-jndi -->
         <simple-jndi.version>0.23.0</simple-jndi.version>
         <!-- test scoped -->
diff --git a/spring-5-data-reactive/pom.xml b/spring-5-data-reactive/pom.xml
index 3a9651de39..c145992737 100644
--- a/spring-5-data-reactive/pom.xml
+++ b/spring-5-data-reactive/pom.xml
@@ -72,7 +72,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -135,7 +134,6 @@
         <spring-data-r2dbc.version>1.0.0.RELEASE</spring-data-r2dbc.version>
         <r2dbc-h2.version>0.8.1.RELEASE</r2dbc-h2.version>
         <httpclient.version>4.5.2</httpclient.version>
-        <h2.version>1.4.200</h2.version>
         <couchbaseMock.version>1.5.23</couchbaseMock.version>
         <reactor-core.version>3.3.1.RELEASE</reactor-core.version>
         <!-- This spring-boot.version is set manually, For upgrading this please refer http://team.baeldung.com/browse/JAVA-2802 -->
diff --git a/spring-boot-modules/spring-boot-libraries/pom.xml b/spring-boot-modules/spring-boot-libraries/pom.xml
index ad00629e14..8d1fb57997 100644
--- a/spring-boot-modules/spring-boot-libraries/pom.xml
+++ b/spring-boot-modules/spring-boot-libraries/pom.xml
@@ -83,7 +83,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
         </dependency>
         <!-- Barcodes -->
         <dependency>
@@ -240,7 +239,6 @@
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
         <modelmapper.version>2.3.2</modelmapper.version>
         <problem-spring-web.version>0.23.0</problem-spring-web.version>
-        <h2.version>1.4.200</h2.version>
         <shedlock.version>2.1.0</shedlock.version>
         <barbecue.version>1.5-beta1</barbecue.version>
         <barcode4j.version>2.1</barcode4j.version>
diff --git a/spring-boot-modules/spring-boot-react/pom.xml b/spring-boot-modules/spring-boot-react/pom.xml
index 3e8a9a7bd1..d515aed6ce 100644
--- a/spring-boot-modules/spring-boot-react/pom.xml
+++ b/spring-boot-modules/spring-boot-react/pom.xml
@@ -25,7 +25,6 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -128,7 +127,6 @@
         <node.version>v14.18.0</node.version>
         <yarn.version>v1.12.1</yarn.version>
         <spring-boot.version>2.4.4</spring-boot.version>
-        <h2.version>1.4.200</h2.version>
         <javafaker.version>1.0.2</javafaker.version>
     </properties>
 

From 2d142da80949c03fe63975d15023118218da02cd Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Wed, 24 Nov 2021 09:06:52 +0530
Subject: [PATCH 5/5] Fix integration build

---
 .../src/test/resources/hibernate-pessimistic-locking.properties | 2 +-
 testing-modules/junit-5-basics/pom.xml                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/persistence-modules/hibernate-jpa/src/test/resources/hibernate-pessimistic-locking.properties b/persistence-modules/hibernate-jpa/src/test/resources/hibernate-pessimistic-locking.properties
index 4f1ff5e93a..342f7b0bf5 100644
--- 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
diff --git a/testing-modules/junit-5-basics/pom.xml b/testing-modules/junit-5-basics/pom.xml
index 62dc4321a8..4dcba2db96 100644
--- 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>
\ No newline at end of file