HBX-3169: Update the use of H2 in the Maven integration tests to 2.4.240

  - Handle the 'hbm2ddl' integration test

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

test/maven/src/it/hbm2ddl/pom.xml

@@ -23,13 +23,14 @@
     <artifactId>hbm2ddl</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-        <java.version>1.8</java.version>
-        <h2.version>1.4.195</h2.version>
-     </properties>
+    <dependencies>
+        <dependency>
+            <!-- DB Driver of your choice -->
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>@h2.version@</version>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -52,14 +53,6 @@
                 <configuration>
                     <revengFile>${project.basedir}/src/main/resources/hibernate.reveng.xml</revengFile>
                 </configuration>
-                <dependencies>
-                    <dependency>
-                        <!-- DB Driver of your choice -->
-                        <groupId>com.h2database</groupId>
-                        <artifactId>h2</artifactId>
-                        <version>${h2.version}</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

test/maven/src/it/hbm2ddl/verify.groovy renamed to test/maven/src/it/hbm2ddl/postbuild.bsh

@@ -15,8 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import java.io.*;
-
 File schema = new File(basedir, "target/generated-resources/schema.ddl");
 if (!schema.isFile()) {
     throw new FileNotFoundException("Could not find generated schema file: " + schema);

test/maven/src/it/hbm2dao/verify.groovy renamed to test/maven/src/it/hbm2ddl/prebuild.bsh

@@ -15,9 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import java.io.*;
+import java.sql.DriverManager;
+import java.sql.Connection;
 
-File dao = new File(basedir, "target/generated-sources/PersonHome.java");
-if (!dao.isFile()) {
-    throw new FileNotFoundException("Could not find generated JPA DAO: " + dao);
-}
+String JDBC_CONNECTION = "jdbc:h2:" + basedir + "/test";
+String CREATE_PERSON_TABLE = "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))";
+
+Connection connection = DriverManager.getConnection(JDBC_CONNECTION);
+connection.createStatement().execute(CREATE_PERSON_TABLE);
+connection.close();

test/maven/src/it/hbm2ddl/src/main/resources/hibernate.properties

@@ -15,10 +15,7 @@
 # See the License for the specific language governing permissions and      #
 # limitations under the License.                                           #
 ############################################################################
-hibernate.dialect=org.hibernate.dialect.H2Dialect
 hibernate.connection.driver_class=org.h2.Driver
-hibernate.connection.url=jdbc:h2:./test;DB_CLOSE_ON_EXIT=FALSE
-hibernate.connection.username=sa
-hibernate.connection.password=
-hibernate.connection.pool_size=1
-hibernate.show_sql=true
+hibernate.connection.url=jdbc:h2:./test
+hibernate.default_catalog=TEST
+hibernate.default_schema=PUBLIC