[JAVA-13966] Upgraded h2 database to 2.1.214 + clean up (#12711)

panos-kakos · panagiotiskakos · web-flow · commit eb17d0e2edec · 2022-10-20T00:17:05.000+05:30
* [JAVA-13966] Upgraded h2 database to 2.1.214

* [JAVA-13966] fixed tests for libraries-apache-commons

* [JAVA-13966] fixed tests

* [JAVA-13966] fixed tests

* [JAVA-13966] fixed tests JAVA-JPA MODULE

* [JAVA-13966] Made ninja submodule part of web-modules(parent)

* [JAVA-13966] Fixed naming convention for pmd

* [JAVA-13966] Moved tests of ninja-module to ManualTest category

* [JAVA-13966] Fix tests

Co-authored-by: panagiotiskakos &lt;panagiotis.kakos@libra-is.com&gt;
diff --git a/core-java-modules/core-java-exceptions-4/pom.xml b/core-java-modules/core-java-exceptions-4/pom.xml
@@ -46,8 +46,4 @@
         </plugins>
     </build>
 
-    <properties>
-        <h2.version>1.4.191</h2.version>
-    </properties>
-
 </project>
diff --git a/core-java-modules/core-java-jndi/pom.xml b/core-java-modules/core-java-jndi/pom.xml
@@ -64,7 +64,6 @@
 
     <properties>
         <spring.version>5.0.9.RELEASE</spring.version>
-        <h2.version>1.4.199</h2.version>
         <apacheds.version>2.0.0.AM26</apacheds.version>
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>
diff --git a/libraries-apache-commons/src/test/resources/employees.sql b/libraries-apache-commons/src/test/resources/employees.sql
@@ -21,17 +21,17 @@ CREATE TABLE employee_legacy(
 );
 
 
-INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('John', 'Doe', 10000.10, to_date('01-01-2001','dd-mm-yyyy'));
-INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Kevin', 'Smith', 20000.20, to_date('02-02-2002','dd-mm-yyyy'));
-INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Kim', 'Smith', 30000.30, to_date('03-03-2003','dd-mm-yyyy'));
-INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Stephen', 'Torvalds', 40000.40, to_date('04-04-2004','dd-mm-yyyy'));
-INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Christian', 'Reynolds', 50000.50, to_date('05-05-2005','dd-mm-yyyy'));
+INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('John', 'Doe', 10000.10, PARSEDATETIME('20010101','yyyyMMdd'));
+INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Kevin', 'Smith', 20000.20, PARSEDATETIME('20020202','yyyyMMdd'));
+INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Kim', 'Smith', 30000.30, PARSEDATETIME('20030303','yyyyMMdd'));
+INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Stephen', 'Torvalds', 40000.40, PARSEDATETIME('20040404','yyyyMMdd'));
+INSERT INTO employee (firstname,lastname,salary,hireddate) VALUES ('Christian', 'Reynolds', 50000.50, PARSEDATETIME('20050505','yyyyMMdd'));
 
-INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('John', 'Doe', 10000.10, to_date('01-01-2001','dd-mm-yyyy'));
-INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Kevin', 'Smith', 20000.20, to_date('02-02-2002','dd-mm-yyyy'));
-INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Kim', 'Smith', 30000.30, to_date('03-03-2003','dd-mm-yyyy'));
-INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Stephen', 'Torvalds', 40000.40, to_date('04-04-2004','dd-mm-yyyy'));
-INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Christian', 'Reynolds', 50000.50, to_date('05-05-2005','dd-mm-yyyy'));
+INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('John', 'Doe', 10000.10, PARSEDATETIME('20010101','yyyyMMdd'));
+INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Kevin', 'Smith', 20000.20, PARSEDATETIME('20020202','yyyyMMdd'));
+INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Kim', 'Smith', 30000.30, PARSEDATETIME('20030303','yyyyMMdd'));
+INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Stephen', 'Torvalds', 40000.40, PARSEDATETIME('20040404','yyyyMMdd'));
+INSERT INTO employee_legacy (first_name,last_name,salary,hired_date) VALUES ('Christian', 'Reynolds', 50000.50, PARSEDATETIME('20050505','yyyyMMdd'));
 
 INSERT INTO email (employeeid,address) VALUES (1, 'john@baeldung.com');
 INSERT INTO email (employeeid,address) VALUES (1, 'john@gmail.com');
diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml
@@ -189,6 +189,7 @@
         <dbunit.version>2.7.0</dbunit.version>
         <archunit.version>0.14.1</archunit.version>
         <modelassert.version>1.0.0</modelassert.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/libraries-testing/src/test/resources/dbunit/schema.sql b/libraries-testing/src/test/resources/dbunit/schema.sql
@@ -1,28 +1,25 @@
 CREATE TABLE IF NOT EXISTS CLIENTS
 (
-    `id`         int AUTO_INCREMENT NOT NULL,
+    `id`         int PRIMARY KEY AUTO_INCREMENT NOT NULL,
     `first_name` varchar(100)       NOT NULL,
-    `last_name`  varchar(100)       NOT NULL,
-    PRIMARY KEY (`id`)
+    `last_name`  varchar(100)       NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS ITEMS
 (
-    `id`       int AUTO_INCREMENT NOT NULL,
+    `id`       int PRIMARY KEY AUTO_INCREMENT NOT NULL,
     `title`    varchar(100)       NOT NULL,
     `produced` date,
-    `price`    float,
-    PRIMARY KEY (`id`)
+    `price`    float
 );
 
 CREATE TABLE IF NOT EXISTS PURCHASES
 (
-    `id`          int     NOT NULL AUTO_INCREMENT,
+    `id`          int   PRIMARY KEY AUTO_INCREMENT  NOT NULL,
     `id_user`     int     NOT NULL,
     `id_item`     int     NOT NULL,
     `total_price` float   NOT NULL,
-    `quantity`    int(11) NOT NULL,
-    PRIMARY KEY (`id`),
+    `quantity`    int NOT NULL,
     FOREIGN KEY (`id_user`) REFERENCES CLIENTS (`id`) ON DELETE CASCADE,
     FOREIGN KEY (`id_item`) REFERENCES ITEMS (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 );
diff --git a/persistence-modules/core-java-persistence-2/pom.xml b/persistence-modules/core-java-persistence-2/pom.xml
@@ -76,6 +76,7 @@
         <jooq.version>3.11.11</jooq.version>
         <json.version>20220320</json.version>
         <microstream.storage.version>07.00.00-MS-GA</microstream.storage.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/deltaspike/pom.xml b/persistence-modules/deltaspike/pom.xml
@@ -290,6 +290,7 @@
         <war.plugin.version>2.6</war.plugin.version>
         <apt-maven-plugin.version>1.1.3</apt-maven-plugin.version>
         <jandex.version>1.2.4.Final</jandex.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/flyway/pom.xml b/persistence-modules/flyway/pom.xml
@@ -64,7 +64,6 @@
 
     <properties>
         <flyway-maven-plugin.version>8.5.13</flyway-maven-plugin.version>
-        <h2.version>2.1.214</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/hibernate-annotations/pom.xml b/persistence-modules/hibernate-annotations/pom.xml
@@ -84,7 +84,6 @@
         <org.springframework.data.version>1.10.6.RELEASE</org.springframework.data.version>
         <hibernate-core.version>5.6.7.Final</hibernate-core.version>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <h2.version>2.1.212</h2.version>
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
     </properties>
 
diff --git a/persistence-modules/hibernate-queries/pom.xml b/persistence-modules/hibernate-queries/pom.xml
@@ -87,6 +87,7 @@
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
         <mysql.version>6.0.6</mysql.version>
         <mariaDB4j.version>2.2.3</mariaDB4j.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/hibernate5/pom.xml b/persistence-modules/hibernate5/pom.xml
@@ -60,6 +60,7 @@
         <hibernate.version>5.4.12.Final</hibernate.version>
         <mysql.version>6.0.6</mysql.version>
         <mariaDB4j.version>2.2.3</mariaDB4j.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/java-jpa-2/pom.xml b/persistence-modules/java-jpa-2/pom.xml
@@ -137,6 +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>
     </properties>
 
 </project>
diff --git a/persistence-modules/java-jpa-3/pom.xml b/persistence-modules/java-jpa-3/pom.xml
@@ -91,6 +91,7 @@
         <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         <maven-processor-plugin.version>3.3.3</maven-processor-plugin.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml b/persistence-modules/java-jpa/src/main/resources/META-INF/persistence.xml
@@ -37,7 +37,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="hibernate.dialect"
diff --git a/persistence-modules/read-only-transactions/pom.xml b/persistence-modules/read-only-transactions/pom.xml
@@ -73,7 +73,6 @@
         <spring-boot.version>2.6.1</spring-boot.version>
         <spring-test.version>5.3.13</spring-test.version>
         <junit-jupiter.version>5.8.2</junit-jupiter.version>
-        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/spring-jooq/pom.xml b/persistence-modules/spring-jooq/pom.xml
@@ -199,7 +199,7 @@
         <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.198</h2.version>
+        <h2.version>1.4.200</h2.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/spring-mybatis/pom.xml b/persistence-modules/spring-mybatis/pom.xml
@@ -83,7 +83,6 @@
         <spring-mybatis.version>2.0.6</spring-mybatis.version>
         <mybatis.version>3.5.2</mybatis.version>
         <mybatis-spring-boot-starter.version>2.2.0</mybatis-spring-boot-starter.version>
-        <h2.version>1.4.197</h2.version>
     </properties>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -1348,7 +1348,7 @@
         <maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
         <maven-pmd-plugin.version>3.19.0</maven-pmd-plugin.version>
         <lombok.version>1.18.24</lombok.version>
-        <h2.version>1.4.200</h2.version>
+        <h2.version>2.1.214</h2.version>
         <guava.version>31.1-jre</guava.version>
         <maven-jar-plugin.version>3.2.2</maven-jar-plugin.version>
     </properties>
diff --git a/security-modules/oauth2-framework-impl/oauth2-authorization-server/pom.xml b/security-modules/oauth2-framework-impl/oauth2-authorization-server/pom.xml
@@ -66,7 +66,6 @@
     </build>
 
     <properties>
-        <h2.version>1.4.199</h2.version>
         <httpPort>9080</httpPort>
         <httpsPort>9443</httpsPort>
         <nimbus-jose-jwt.version>7.3</nimbus-jose-jwt.version>
diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml
@@ -119,7 +119,6 @@
         <javax-mail.version>1.4.7</javax-mail.version>
         <javax-activation.version>1.1.1</javax-activation.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-        <h2.version>1.4.197</h2.version>
     </properties>
 
 </project>
diff --git a/web-modules/ninja/pom.xml b/web-modules/ninja/pom.xml
@@ -3,12 +3,17 @@
     xmlns="http://maven.apache.org/POM/4.0.0"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
     <artifactId>ninja</artifactId>
     <version>1.0.0</version>
     <packaging>jar</packaging>
     <url>http://www.ninjaframework.org</url>
 
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>web-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.webjars</groupId>
@@ -200,7 +205,6 @@
         <jetty.version>9.4.18.v20190429</jetty.version>
         <bootstrap.version>3.3.4</bootstrap.version>
         <jquery.version>2.1.3</jquery.version>
-        <h2.version>1.4.186</h2.version>
         <compiler.plugin.version>3.2</compiler.plugin.version>
         <source.version>1.8</source.version>
         <target.version>1.8</target.version>
diff --git a/web-modules/ninja/src/test/java/controllers/ApiControllerDocTesterManualTest.java b/web-modules/ninja/src/test/java/controllers/ApiControllerDocTesterManualTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import ninja.NinjaDocTester;
 
-public class ApiControllerDocTesterTest extends NinjaDocTester {
+public class ApiControllerDocTesterManualTest extends NinjaDocTester {
     
     String URL_INDEX = "/";
     String URL_HELLO = "/hello";
diff --git a/web-modules/ninja/src/test/java/controllers/ApiControllerMockManualTest.java b/web-modules/ninja/src/test/java/controllers/ApiControllerMockManualTest.java
@@ -10,7 +10,7 @@
 import services.UserService;
 
 @RunWith(NinjaRunner.class)
-public class ApiControllerMockUnitTest {
+public class ApiControllerMockManualTest {
 
     @Inject private UserService userService;
 
