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

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

Author: koentsje

maven-plugin/src/main/java/org/hibernate/mvn/AbstractHbm2xMojo.java

@@ -78,11 +78,7 @@ public void execute() throws MojoFailureException {
     		Thread.currentThread().setContextClassLoader(createExporterClassLoader(original));
 	        getLog().info("Starting " + this.getClass().getSimpleName() + "...");
 	        ReverseEngineeringStrategy strategy = setupReverseEngineeringStrategy();
-	        if (propertyFile.exists()) {
-	        	executeExporter(createJdbcDescriptor(strategy, loadPropertiesFile()));
-	        } else {
-	        	getLog().info("Property file '" + propertyFile + "' cannot be found, aborting...");
-	        }
+            executeExporter(createJdbcDescriptor(strategy, loadPropertiesFile()));
 	        getLog().info("Finished " + this.getClass().getSimpleName() + "!");
     	} finally {
     		Thread.currentThread().setContextClassLoader(original);
@@ -122,8 +118,10 @@ private Properties loadPropertiesFile() throws MojoFailureException {
             result.load(is);
             return result;
         } catch (FileNotFoundException e) {
+            getLog().error("Property file '" + propertyFile + "' cannot be found, aborting...");
             throw new MojoFailureException(propertyFile + " not found.", e);
         } catch (IOException e) {
+            getLog().error("Property file '" + propertyFile + "' cannot be loaded, aborting...");
             throw new MojoFailureException("Problem while loading " + propertyFile, e);
         }
     }

test/maven-plugin/pom.xml

@@ -29,8 +29,9 @@
                     <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                     <settingsFile>src/it/settings.xml</settingsFile>
                     <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+                    <preBuildHookScript>before</preBuildHookScript>
                     <postBuildHookScript>verify</postBuildHookScript>
-                    <goal>install</goal>
+                    <goal>generate-sources</goal>
                 </configuration>
                 <executions>
                     <execution>
@@ -40,6 +41,13 @@
                         </goals>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.h2database</groupId>
+                        <artifactId>h2</artifactId>
+                        <version>${h2.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>

test/maven-plugin/src/it/generateHbm/before.bsh

@@ -0,0 +1,9 @@
+import java.sql.DriverManager;
+import java.sql.Connection;
+
+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-plugin/src/it/generateHbm/invoker.properties

@@ -1,2 +1 @@
-invoker.java.version = 1.8+
-invoker.goals = generate-resources
+invoker.goals = generate-sources

test/maven-plugin/src/it/generateHbm/pom.xml

@@ -8,13 +8,13 @@
     <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>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>@h2.version@</version>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>
@@ -25,7 +25,7 @@
                 <executions>
                     <execution>
                         <id>HBM generation</id>
-                        <phase>generate-resources</phase>
+                        <phase>generate-sources</phase>
                         <goals>
                             <goal>generateHbm</goal>
                         </goals>
@@ -35,17 +35,6 @@
                         </configuration>
                      </execution>
                 </executions>
-                <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-plugin/src/it/generateHbm/src/main/resources/hibernate.properties

@@ -1,7 +1,4 @@
-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

test/maven-plugin/src/it/generateHbm/src/main/resources/hibernate.reveng.xml

@@ -1,5 +1,3 @@
-import java.io.*;
-
 File file = new File(basedir, "target/generated-sources/Person.hbm.xml");
 if (!file.isFile()) {
     throw new FileNotFoundException("Could not find generated HBM file: " + file);

test/maven-plugin/src/it/generateHbm/test.mv.db

@@ -0,0 +1,9 @@
+import java.sql.DriverManager;
+import java.sql.Connection;
+
+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();