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

  - Properly fail with a MojoFailureException when the properties file is not found
  - Handle the noProperties case

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

Author: koentsje

maven/src/main/java/org/hibernate/tool/maven/AbstractGenerationMojo.java

@@ -96,11 +96,7 @@ public void execute() throws MojoFailureException {
     		Thread.currentThread().setContextClassLoader(createExporterClassLoader(original));
 	        getLog().info("Starting " + this.getClass().getSimpleName() + "...");
 	        RevengStrategy 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);
@@ -134,8 +130,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/src/it/noPropertiesFile/invoker.properties

@@ -16,4 +16,5 @@
 # limitations under the License.                                           #
 ############################################################################
 invoker.java.version = 1.8+
-invoker.goals = generate-sources
+invoker.goals = generate-sources
+invoker.buildResult = failure

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

@@ -23,14 +23,6 @@
     <artifactId>no-properties-file</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>
-
     <build>
         <plugins>
             <plugin>

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

@@ -15,31 +15,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import java.io.*;
+import java.util.Scanner;
 
-println "start verify.groovy"
+File buildLog = new File(basedir, "build.log");
 
-File buildLog = new File(basedir, "build.log")
+if (!buildLog.exists()) {
+
+	System.out.println( "'" + buildLog.absolutePath + "' is not found.");
+
+    throw new FileNotFoundException("Could not find build log file: '" + buildLog + "'");
 
-if (!buildLog.isFile()) {
-	
-	println "'" + buildLog.absolutePath + "' is not a file."
-	
-    throw new FileNotFoundException("Could not find build log file: '" + buildLog + "'")
-	
 } else {
 
-    println "inspecting build log lines"
-	
-	boolean found = false
-	String startString = "[INFO] Property file '"
-	String endString = "src/main/resources/hibernate.properties' cannot be found, aborting..." 
-	buildLog.eachLine { 
-		line ->  if (line.startsWith(startString) && line.endsWith(endString)) found = true
+    System.out.println( "Inspecting build log lines");
+
+	String startString = "[ERROR] Property file '";
+	String endString = "src/main/resources/hibernate.properties' cannot be found, aborting...";
+
+	Scanner s = new Scanner(buildLog);
+	while (s.hasNextLine()) {
+	    String line = s.nextLine();
+	    if (line.startsWith(startString) && line.endsWith(endString)) {
+	        return true;
+	    }
 	}
-	return found
-	
-}
 
+	return false;
+
+}
 
-println "end verify.groovy"