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 c193073a0e..459aa21721 100644
--- a/core-java-modules/core-java-lang-oop-modifiers/pom.xml
+++ b/core-java-modules/core-java-lang-oop-modifiers/pom.xml
@@ -23,7 +23,7 @@
     </dependencies>
 
     <properties>
-        <h2.version>1.4.197</h2.version> <!-- needs to be specified as it fails with parent's 1.4.200 -->
+        <h2.version>2.1.214</h2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index 66456d2045..91f0dbfc28 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -97,7 +97,7 @@
         <module>core-java-lang-oop-constructors</module>
         <module>core-java-lang-oop-patterns</module>
         <module>core-java-lang-oop-generics</module>
-<!--        <module>core-java-lang-oop-modifiers</module>-->
+        <module>core-java-lang-oop-modifiers</module>
         <module>core-java-lang-oop-types</module>
         <module>core-java-lang-oop-types-2</module>
         <module>core-java-lang-oop-inheritance</module>
diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml
index b736b50dd1..38dd64d7b2 100644
--- a/persistence-modules/java-jpa-2/pom.xml
+++ b/persistence-modules/java-jpa-2/pom.xml
@@ -137,7 +137,7 @@
         <maven-processor-plugin.version>3.3.3</maven-processor-plugin.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
         <querydsl.version>4.3.1</querydsl.version>
-        <h2.version>1.4.200</h2.version>
+        <h2.version>2.1.214</h2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/User.java b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/User.java
index 436c708d40..83b05fbc59 100644
--- a/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/User.java
+++ b/persistence-modules/java-jpa-2/src/main/java/com/baeldung/jpa/defaultvalues/User.java
@@ -5,7 +5,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
-@Entity
+@Entity(name = "users")
 public class User {
 
     @Id
diff --git a/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml
index 3bc81910d9..1e3d3470ed 100644
--- a/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa-2/src/main/resources/META-INF/persistence.xml
@@ -197,7 +197,7 @@
             <property name="javax.persistence.jdbc.driver"
                       value="org.h2.Driver" />
             <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:test" />
+                      value="jdbc:h2:mem:test;MODE=LEGACY" />
             <property name="javax.persistence.jdbc.user" value="sa" />
             <property name="javax.persistence.jdbc.password" value="" />
             <property name="javax.persistence.sql-load-script-source"
diff --git a/persistence-modules/java-jpa-2/src/test/resources/META-INF/persistence.xml b/persistence-modules/java-jpa-2/src/test/resources/META-INF/persistence.xml
index 00c7274dd4..18f3f4f99a 100644
--- a/persistence-modules/java-jpa-2/src/test/resources/META-INF/persistence.xml
+++ b/persistence-modules/java-jpa-2/src/test/resources/META-INF/persistence.xml
@@ -197,7 +197,7 @@
             <property name="javax.persistence.jdbc.driver"
                       value="org.h2.Driver" />
             <property name="javax.persistence.jdbc.url"
-                      value="jdbc:h2:mem:test" />
+                      value="jdbc:h2:mem:test;MODE=LEGACY" />
             <property name="javax.persistence.jdbc.user" value="sa" />
             <property name="javax.persistence.jdbc.password" value="" />
             <property name="javax.persistence.sql-load-script-source"
diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index b92fb45e6f..ce6f4d3424 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -106,7 +106,7 @@
         <!-- <module>spring-jpa</module>
         <module>spring-jpa-2</module> FAILED -->
         <module>spring-jdbc</module>
-<!--        <module>spring-jooq</module>--> <!-- parent-boot-2 is its parent. -->
+        <module>spring-jooq</module>
         <module>spring-mybatis</module>
         <module>spring-persistence-simple</module>
     </modules>
diff --git a/persistence-modules/spring-jooq/pom.xml b/persistence-modules/spring-jooq/pom.xml
index 9848c726c5..d12a921212 100644
--- a/persistence-modules/spring-jooq/pom.xml
+++ b/persistence-modules/spring-jooq/pom.xml
@@ -195,11 +195,11 @@
     </build>
 
     <properties>
-        <org.jooq.version>3.14.15</org.jooq.version>
+        <org.jooq.version>3.16.18</org.jooq.version>
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <sql-maven-plugin.version>1.5</sql-maven-plugin.version>
         <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
-        <h2.version>1.4.200</h2.version>
+        <h2.version>2.1.214</h2.version>
     </properties>
 
 </project>
\ No newline at end of file