diff --git a/maven/src/main/java/org/hibernate/tool/maven/AbstractGenerationMojo.java b/maven/src/main/java/org/hibernate/tool/maven/AbstractGenerationMojo.java index 5f2f701051..afb591424a 100644 --- a/maven/src/main/java/org/hibernate/tool/maven/AbstractGenerationMojo.java +++ b/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); } } diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 001f1b6ecc..c02486e2b3 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -45,8 +45,7 @@ ${project.build.directory}/it src/it/settings.xml ${project.build.directory}/local-repo - verify - install + generate-sources @@ -56,7 +55,14 @@ - + + + com.h2database + h2 + ${h2.version} + + + diff --git a/test/maven/src/it/generateHbm/invoker.properties b/test/maven/src/it/generateHbm/invoker.properties deleted file mode 100644 index 7bfd9fb4ed..0000000000 --- a/test/maven/src/it/generateHbm/invoker.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################ -# Hibernate Tools, Tooling for your Hibernate Projects # -# # -# Copyright 2018-2025 Red Hat, Inc. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" basis, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -############################################################################ -invoker.java.version = 1.8+ -invoker.goals = generate-resources \ No newline at end of file diff --git a/test/maven/src/it/generateHbm/pom.xml b/test/maven/src/it/generateHbm/pom.xml index 69629b14a5..119041fe7c 100644 --- a/test/maven/src/it/generateHbm/pom.xml +++ b/test/maven/src/it/generateHbm/pom.xml @@ -23,13 +23,14 @@ generateHbm 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + + com.h2database + h2 + @h2.version@ + + @@ -50,17 +51,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - - com.h2database - h2 - ${h2.version} - - diff --git a/test/maven/src/it/generateHbm/verify.groovy b/test/maven/src/it/generateHbm/postbuild.bsh similarity index 97% rename from test/maven/src/it/generateHbm/verify.groovy rename to test/maven/src/it/generateHbm/postbuild.bsh index 2812248e59..92d4fd657b 100644 --- a/test/maven/src/it/generateHbm/verify.groovy +++ b/test/maven/src/it/generateHbm/postbuild.bsh @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -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); diff --git a/test/maven/src/it/generateHbm/prebuild.bsh b/test/maven/src/it/generateHbm/prebuild.bsh new file mode 100644 index 0000000000..70f35cb226 --- /dev/null +++ b/test/maven/src/it/generateHbm/prebuild.bsh @@ -0,0 +1,26 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2018-2025 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +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(); diff --git a/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties b/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties index 11ceb22106..32da3e5d10 100644 --- a/test/maven/src/it/generateHbm/src/main/resources/hibernate.properties +++ b/test/maven/src/it/generateHbm/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 \ No newline at end of file +hibernate.connection.url=jdbc:h2:./test +hibernate.default_catalog=TEST +hibernate.default_schema=PUBLIC \ No newline at end of file diff --git a/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml b/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml deleted file mode 100644 index 6b01f11911..0000000000 --- a/test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/test/maven/src/it/generateHbm/test.mv.db b/test/maven/src/it/generateHbm/test.mv.db deleted file mode 100644 index 72d79270f8..0000000000 Binary files a/test/maven/src/it/generateHbm/test.mv.db and /dev/null differ diff --git a/test/maven/src/it/hbm2dao/invoker.properties b/test/maven/src/it/hbm2dao/invoker.properties deleted file mode 100644 index f26202029c..0000000000 --- a/test/maven/src/it/hbm2dao/invoker.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################ -# Hibernate Tools, Tooling for your Hibernate Projects # -# # -# Copyright 2018-2025 Red Hat, Inc. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" basis, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -############################################################################ -invoker.java.version = 1.8+ -invoker.goals = generate-sources \ No newline at end of file diff --git a/test/maven/src/it/hbm2dao/pom.xml b/test/maven/src/it/hbm2dao/pom.xml index 34eff6a401..d33930c734 100644 --- a/test/maven/src/it/hbm2dao/pom.xml +++ b/test/maven/src/it/hbm2dao/pom.xml @@ -23,13 +23,14 @@ hbm2dao 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + + com.h2database + h2 + @h2.version@ + + @@ -49,17 +50,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - - com.h2database - h2 - ${h2.version} - - diff --git a/test/maven/src/it/hbm2dao/verify.groovy b/test/maven/src/it/hbm2dao/postbuild.bsh similarity index 97% rename from test/maven/src/it/hbm2dao/verify.groovy rename to test/maven/src/it/hbm2dao/postbuild.bsh index 49a7a8b4a7..875a745b95 100644 --- a/test/maven/src/it/hbm2dao/verify.groovy +++ b/test/maven/src/it/hbm2dao/postbuild.bsh @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import java.io.*; - File dao = new File(basedir, "target/generated-sources/PersonHome.java"); if (!dao.isFile()) { throw new FileNotFoundException("Could not find generated JPA DAO: " + dao); diff --git a/test/maven/src/it/hbm2dao/prebuild.bsh b/test/maven/src/it/hbm2dao/prebuild.bsh new file mode 100644 index 0000000000..70f35cb226 --- /dev/null +++ b/test/maven/src/it/hbm2dao/prebuild.bsh @@ -0,0 +1,26 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2018-2025 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +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(); diff --git a/test/maven/src/it/hbm2dao/src/main/resources/hibernate.properties b/test/maven/src/it/hbm2dao/src/main/resources/hibernate.properties index 11ceb22106..32da3e5d10 100644 --- a/test/maven/src/it/hbm2dao/src/main/resources/hibernate.properties +++ b/test/maven/src/it/hbm2dao/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 \ No newline at end of file +hibernate.connection.url=jdbc:h2:./test +hibernate.default_catalog=TEST +hibernate.default_schema=PUBLIC \ No newline at end of file diff --git a/test/maven/src/it/hbm2dao/src/main/resources/hibernate.reveng.xml b/test/maven/src/it/hbm2dao/src/main/resources/hibernate.reveng.xml deleted file mode 100644 index 6b01f11911..0000000000 --- a/test/maven/src/it/hbm2dao/src/main/resources/hibernate.reveng.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/test/maven/src/it/hbm2dao/test.mv.db b/test/maven/src/it/hbm2dao/test.mv.db deleted file mode 100644 index aba76d3403..0000000000 Binary files a/test/maven/src/it/hbm2dao/test.mv.db and /dev/null differ diff --git a/test/maven/src/it/hbm2ddl/invoker.properties b/test/maven/src/it/hbm2ddl/invoker.properties deleted file mode 100644 index 7bfd9fb4ed..0000000000 --- a/test/maven/src/it/hbm2ddl/invoker.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################ -# Hibernate Tools, Tooling for your Hibernate Projects # -# # -# Copyright 2018-2025 Red Hat, Inc. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" basis, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -############################################################################ -invoker.java.version = 1.8+ -invoker.goals = generate-resources \ No newline at end of file diff --git a/test/maven/src/it/hbm2ddl/pom.xml b/test/maven/src/it/hbm2ddl/pom.xml index 9956497b6c..7e3056aeba 100644 --- a/test/maven/src/it/hbm2ddl/pom.xml +++ b/test/maven/src/it/hbm2ddl/pom.xml @@ -23,13 +23,13 @@ hbm2ddl 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + com.h2database + h2 + @h2.version@ + + @@ -49,17 +49,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - - com.h2database - h2 - ${h2.version} - - diff --git a/test/maven/src/it/hbm2ddl/verify.groovy b/test/maven/src/it/hbm2ddl/postbuild.bsh similarity index 97% rename from test/maven/src/it/hbm2ddl/verify.groovy rename to test/maven/src/it/hbm2ddl/postbuild.bsh index 51fe9ac8c7..981337a383 100644 --- a/test/maven/src/it/hbm2ddl/verify.groovy +++ b/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); diff --git a/test/maven/src/it/hbm2ddl/prebuild.bsh b/test/maven/src/it/hbm2ddl/prebuild.bsh new file mode 100644 index 0000000000..70f35cb226 --- /dev/null +++ b/test/maven/src/it/hbm2ddl/prebuild.bsh @@ -0,0 +1,26 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2018-2025 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +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(); diff --git a/test/maven/src/it/hbm2ddl/src/main/resources/hibernate.properties b/test/maven/src/it/hbm2ddl/src/main/resources/hibernate.properties index 11ceb22106..32da3e5d10 100644 --- a/test/maven/src/it/hbm2ddl/src/main/resources/hibernate.properties +++ b/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 \ No newline at end of file +hibernate.connection.url=jdbc:h2:./test +hibernate.default_catalog=TEST +hibernate.default_schema=PUBLIC \ No newline at end of file diff --git a/test/maven/src/it/hbm2ddl/src/main/resources/hibernate.reveng.xml b/test/maven/src/it/hbm2ddl/src/main/resources/hibernate.reveng.xml deleted file mode 100644 index 6b01f11911..0000000000 --- a/test/maven/src/it/hbm2ddl/src/main/resources/hibernate.reveng.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/test/maven/src/it/hbm2ddl/test.mv.db b/test/maven/src/it/hbm2ddl/test.mv.db deleted file mode 100644 index 72d79270f8..0000000000 Binary files a/test/maven/src/it/hbm2ddl/test.mv.db and /dev/null differ diff --git a/test/maven/src/it/hbm2java/invoker.properties b/test/maven/src/it/hbm2java/invoker.properties deleted file mode 100644 index f26202029c..0000000000 --- a/test/maven/src/it/hbm2java/invoker.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################ -# Hibernate Tools, Tooling for your Hibernate Projects # -# # -# Copyright 2018-2025 Red Hat, Inc. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" basis, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -############################################################################ -invoker.java.version = 1.8+ -invoker.goals = generate-sources \ No newline at end of file diff --git a/test/maven/src/it/hbm2java/pom.xml b/test/maven/src/it/hbm2java/pom.xml index ab7fc4ee18..a691825436 100644 --- a/test/maven/src/it/hbm2java/pom.xml +++ b/test/maven/src/it/hbm2java/pom.xml @@ -23,13 +23,13 @@ hbm2java 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + com.h2database + h2 + @h2.version@ + + @@ -49,17 +49,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - - com.h2database - h2 - ${h2.version} - - diff --git a/test/maven/src/it/hbm2java/verify.groovy b/test/maven/src/it/hbm2java/postbuild.bsh similarity index 97% rename from test/maven/src/it/hbm2java/verify.groovy rename to test/maven/src/it/hbm2java/postbuild.bsh index 3f763eac65..326e8a131b 100644 --- a/test/maven/src/it/hbm2java/verify.groovy +++ b/test/maven/src/it/hbm2java/postbuild.bsh @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import java.io.*; - File entity = new File(basedir, "target/generated-sources/Person.java"); if (!entity.isFile()) { throw new FileNotFoundException("Could not find generated JPA Entity: " + entity); diff --git a/test/maven/src/it/hbm2java/prebuild.bsh b/test/maven/src/it/hbm2java/prebuild.bsh new file mode 100644 index 0000000000..70f35cb226 --- /dev/null +++ b/test/maven/src/it/hbm2java/prebuild.bsh @@ -0,0 +1,26 @@ +/* + * Hibernate Tools, Tooling for your Hibernate Projects + * + * Copyright 2018-2025 Red Hat, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +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(); diff --git a/test/maven/src/it/hbm2java/src/main/resources/hibernate.properties b/test/maven/src/it/hbm2java/src/main/resources/hibernate.properties index 11ceb22106..32da3e5d10 100644 --- a/test/maven/src/it/hbm2java/src/main/resources/hibernate.properties +++ b/test/maven/src/it/hbm2java/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 \ No newline at end of file +hibernate.connection.url=jdbc:h2:./test +hibernate.default_catalog=TEST +hibernate.default_schema=PUBLIC \ No newline at end of file diff --git a/test/maven/src/it/hbm2java/src/main/resources/hibernate.reveng.xml b/test/maven/src/it/hbm2java/src/main/resources/hibernate.reveng.xml deleted file mode 100644 index 6b01f11911..0000000000 --- a/test/maven/src/it/hbm2java/src/main/resources/hibernate.reveng.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/test/maven/src/it/hbm2java/test.mv.db b/test/maven/src/it/hbm2java/test.mv.db deleted file mode 100644 index aba76d3403..0000000000 Binary files a/test/maven/src/it/hbm2java/test.mv.db and /dev/null differ diff --git a/test/maven/src/it/noPropertiesFile/invoker.properties b/test/maven/src/it/noPropertiesFile/invoker.properties index f26202029c..d9dafdae19 100644 --- a/test/maven/src/it/noPropertiesFile/invoker.properties +++ b/test/maven/src/it/noPropertiesFile/invoker.properties @@ -15,5 +15,4 @@ # See the License for the specific language governing permissions and # # limitations under the License. # ############################################################################ -invoker.java.version = 1.8+ -invoker.goals = generate-sources \ No newline at end of file +invoker.buildResult = failure \ No newline at end of file diff --git a/test/maven/src/it/noPropertiesFile/pom.xml b/test/maven/src/it/noPropertiesFile/pom.xml index 2fd82aa06d..08eedf2cf5 100644 --- a/test/maven/src/it/noPropertiesFile/pom.xml +++ b/test/maven/src/it/noPropertiesFile/pom.xml @@ -23,14 +23,6 @@ no-properties-file 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - - diff --git a/test/maven/src/it/noPropertiesFile/verify.groovy b/test/maven/src/it/noPropertiesFile/postbuild.bsh similarity index 59% rename from test/maven/src/it/noPropertiesFile/verify.groovy rename to test/maven/src/it/noPropertiesFile/postbuild.bsh index 74dc298fb5..0afde94cdf 100644 --- a/test/maven/src/it/noPropertiesFile/verify.groovy +++ b/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" \ No newline at end of file diff --git a/test/maven/src/it/transformHbm/invoker.properties b/test/maven/src/it/transformHbm/invoker.properties deleted file mode 100644 index 7bfd9fb4ed..0000000000 --- a/test/maven/src/it/transformHbm/invoker.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################ -# Hibernate Tools, Tooling for your Hibernate Projects # -# # -# Copyright 2018-2025 Red Hat, Inc. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" basis, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -############################################################################ -invoker.java.version = 1.8+ -invoker.goals = generate-resources \ No newline at end of file diff --git a/test/maven/src/it/transformHbm/pom.xml b/test/maven/src/it/transformHbm/pom.xml index 9bfc028794..cba01aea37 100644 --- a/test/maven/src/it/transformHbm/pom.xml +++ b/test/maven/src/it/transformHbm/pom.xml @@ -22,25 +22,12 @@ 0.0.1-SNAPSHOT - - 1.4.200 - 1.5 - @project.version@ - - org.hibernate.tool hibernate-tools-maven - ${hibernate.version} - - - org.hibernate.tool - hibernate-tools-orm - ${hibernate.version} - - + @project.version@ transformHbm @@ -48,9 +35,6 @@ hbm2orm - - true - diff --git a/test/maven/src/it/transformHbm/verify.groovy b/test/maven/src/it/transformHbm/postbuild.bsh similarity index 97% rename from test/maven/src/it/transformHbm/verify.groovy rename to test/maven/src/it/transformHbm/postbuild.bsh index 3a1bd88267..b315da1cc6 100644 --- a/test/maven/src/it/transformHbm/verify.groovy +++ b/test/maven/src/it/transformHbm/postbuild.bsh @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import java.io.*; File file = new File(basedir, "src/main/resources/Foo.mapping.xml"); if (!file.isFile()) {