From 1b9abe6f9cd18e6e09120def300409968921d411 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 16 Oct 2025 17:19:06 +0200 Subject: [PATCH 1/9] HBX-3169: Update the use of H2 in the Maven integration tests to 2.4.240 - Handle the 'generateHbm' integration test Signed-off-by: Koen Aers --- test/maven/pom.xml | 10 +++++-- test/maven/src/it/generateHbm/pom.xml | 23 ++++++---------- .../{verify.groovy => postbuild.bsh} | 2 -- test/maven/src/it/generateHbm/prebuild.bsh | 26 ++++++++++++++++++ .../src/main/resources/hibernate.properties | 9 ++---- test/maven/src/it/generateHbm/test.mv.db | Bin 28672 -> 0 bytes 6 files changed, 45 insertions(+), 25 deletions(-) rename test/maven/src/it/generateHbm/{verify.groovy => postbuild.bsh} (97%) create mode 100644 test/maven/src/it/generateHbm/prebuild.bsh delete mode 100644 test/maven/src/it/generateHbm/test.mv.db diff --git a/test/maven/pom.xml b/test/maven/pom.xml index 001f1b6ecc..ea8f1236ab 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -45,7 +45,6 @@ ${project.build.directory}/it src/it/settings.xml ${project.build.directory}/local-repo - verify install @@ -56,7 +55,14 @@ - + + + com.h2database + h2 + ${h2.version} + + + diff --git a/test/maven/src/it/generateHbm/pom.xml b/test/maven/src/it/generateHbm/pom.xml index 69629b14a5..8ff72f2b93 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@ + + @@ -53,14 +54,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/test.mv.db b/test/maven/src/it/generateHbm/test.mv.db deleted file mode 100644 index 72d79270f88b69518fe17598ef53debfe7371c91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 zcmeI4TWcFf6vuZJtBI93AWCQ-S{NtPPC+O$yV{#*OJr$-L?zisa!8)c>@6{IBxB1V z^r3{d^r_Hq(9hAAmVAOd=B*IOW4}Y`XlG}4t&1bas&UB?W-qg=oio4H#sB}Aqk35> zIC}&4iCA}czw^rkV_a|_AN8M<00AHX1b_e#00KY&2mk>f00e*l5V!yY>O%L6HR%5f za91D%AOHk_01yBIKmZ5;0U!VbfB+Bx0*fUOC;7!BfIYv@vieWyewni6^D=R8q3=H* zmes;OedHf9pWt9HV3~izWRnCiRt&5bhPzMMq=A4C*KwWHlmK*=$7uGzs`OTpWl8$v zg(Tf+v-Mp`dj0D1^(+gps7sPOkbjXbOIN~S6g5|Dc;N{oTq@yG4VR^GsXdE^?M8DS zv;rUY-tIHM#RjdYxG>t@ibkB^(EJF89^udgj*td+a2kiEQY*pXif+BATYaosVy3%I z--VL63r5tfD!MIAxeJ=+7)iI@jXq_!XRz=0dk3_CNZlcuuyJ@TY(46GgXZ87-x*S8 z&oAPu;gP+8)1v$FcE=AE`^tl>0RbQY1b_e#00KY&2mk>f00cfP0u%as+I;#zQ3F@? zoU^Fu>CeqY{RfdERU<_@Mevr!1+N<_&trmDF;pw1|AXnB&e_WJzx}sP`Y39DnFWo|`D_=!?wmPh}^ALS&Ka7LoO*^b< z$3&a$xSa>vsIg0|qc2t-F^CNAlmW5v*HCq{-R*TMqcKIJOQyt%Cmt2- z(Lo*p`y5!yyuF;2@|jhV&)ihM6SXP*8)p8r=2%`L^5XC0p+lF3tf{{OE~+kMJz*PV_e zjn=PUEyvm}^IN7WEuWuHm?|29U2mk>f z00e*l5C8&c0$g>b^taIetSSCIJy*x38Bl9dBcHWJ9U z`G0M!N=O%p=~P(^wo2GdI&~JR|9|{24HsU06y^W<4(R{%7cFc90U!VbfB+Bx0zlw` z5SYk13;nOTiT)3;>bt~q&m^a(K3VAh@qBZl|7Yg^jX5gMr}jB-BhUZ8;o9yl&;RrK z|6}?8?^F5zDcVkmJojXg7iYZBLFFYGZ*sg+--`49=OX)N#zA8m=b!^;M&SqzJZ?@2 zG5R0f@D2iz{!jFG VtpB}~{wErC70;hnInRGy?qAGfE9C$H From 494f16e7d57d958c0d66542ca5307a6e9be2ed40 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 17 Oct 2025 11:08:45 +0200 Subject: [PATCH 2/9] HBX-3169: Update the use of H2 in the Maven integration tests to 2.4.240 - Handle the 'generateDao' integration test Signed-off-by: Koen Aers --- test/maven/src/it/hbm2dao/pom.xml | 23 ++++++---------- test/maven/src/it/hbm2dao/postbuild.bsh | 21 ++++++++++++++ test/maven/src/it/hbm2dao/prebuild.bsh | 26 ++++++++++++++++++ .../src/main/resources/hibernate.properties | 9 ++---- test/maven/src/it/hbm2dao/test.mv.db | Bin 24576 -> 0 bytes 5 files changed, 58 insertions(+), 21 deletions(-) create mode 100644 test/maven/src/it/hbm2dao/postbuild.bsh create mode 100644 test/maven/src/it/hbm2dao/prebuild.bsh delete mode 100644 test/maven/src/it/hbm2dao/test.mv.db diff --git a/test/maven/src/it/hbm2dao/pom.xml b/test/maven/src/it/hbm2dao/pom.xml index 34eff6a401..57c800f516 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@ + + @@ -52,14 +53,6 @@ ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - com.h2database - h2 - ${h2.version} - - diff --git a/test/maven/src/it/hbm2dao/postbuild.bsh b/test/maven/src/it/hbm2dao/postbuild.bsh new file mode 100644 index 0000000000..875a745b95 --- /dev/null +++ b/test/maven/src/it/hbm2dao/postbuild.bsh @@ -0,0 +1,21 @@ +/* + * 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. + */ +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/test.mv.db b/test/maven/src/it/hbm2dao/test.mv.db deleted file mode 100644 index aba76d3403bc1e1b54e2526be9b9bc7c2f09288c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 zcmeI4TW=dh6vua+m^5xvWK{?rK$^57DUxMocD)x{MZ&SSvW4wLwo|oF(d?~_n%Gg| zL=jIFLOjAZ;7jnr3y4pEc;c<%fk(twK+Mk0thc_Dw2n%o9xK|}oxPkhKkwN2pL5oY zidJwBhTc=z_V&LFDgoj!@QwpI3j7K&F%HURnP^5K93CIiQH2!Fg5#6@ z;UGFLJP1bKli;{QZI6f00e*l5C8%|00>+zfh5Tu=N`84AZ9MEbeN^i@)xNX0wcBjf5h)w_<=g1?+E;4ak9K=b7d7vr&UPO;51YMy z5A~|-uhmDJB-BhD2W}7q)U`soi5k^j18v$iF?@_|;=5tlBiQh0Kv-AFEg7uj!K9%^ ztxzL`65H0Xsk?TmY`L}@>b`H;?k1|%+s#gXc>|%f@1!TSYOUeaQNOy?a?sB1R;yVn z?l|4vcIR#`qSLISW~a{`?d-N%1>V`IwjK1K+O0LJ-MD9~+3h##Y{)2D#C@%5ufJE@ zzJK3wP`}xBdi`p9C*D!bjFPuk-Q*qZG z>)Nx?b|>kNoo&|HB{tE=YmXU326x7Q*!b(Hw%zIVyVYn+VzlEPcHNZWyX=x|>~-g% zJW}k8U10b5M&|iSR>^19Nj`I1%V+LnbNS3hb~T^bWH*C+t!JJos;Vd-e6A=zc6h7a z`gY}JmfgfflifszOMfdX$~Atg7mZM?n3x|x_)_Cboi9s#X|Ph3sQ$$WMSYB3h^NNE z{#npw69X5bwH-buaC*W7V#1UrCXD4xOc)Xp&C<(mGGUDHOw30tjFu*h5<6`+Jx@!n zFl!03x}2xnD%LDHPq|scDlRgMBM|Pr0dZgeG5Fd`bEF#r=UFoELGt!OpMK5#<*srY;t( zvx{-3iZh)m3P0lO#2aS3A>4f@`j9GWaihnL#gC{6vmf#?2!}+C(*se=L_Xp>#f2w! zYQAczrdm=Bm8iN(RZYb=#&;kJ<00e*l5C8%|00;m9Mqo;R&#I^Q zENql9wHHy-v(L@V5jiRSzlfZfZS;b@vHt%I^nb+bE!F>jUP%A{%=Q2KzcBs3qbRIZ z^_$nm`v0$`UFBM$|2-K9@a0Ot73zNm0z9F~jR{SjR^&4S0p?^NAXen#$Qe`Q#L#Iu zQRIdv0s)3EjG7ZhUn3A;#R0n)0s+J@Tx)FBmqCv}nAIlC&KoO{(Fa|ORTI$%%jSc9 z(WvKosh~%2snLgLZ)NmB#FpadgV=!R1N?^p1b_e#00KY&2mpaANMK5TOa0ICj>+@% zp>7bbFjpDE*tx!y4W<(u+4D`{w%LCp6xG z4xH;nAT{v347{eN<*0U9Irz(zqnW!PM^kc?6&Xaa4$%MflB*9u|6jrHc5n#@00AHX z1b_e#00OfJi2VOpe@p$(BzdC$Jrmn@NXye2dC?xJ|K*PW%G~A*{V%haNnP<|W{=nZ z+pd|U6HRR)_hSA3N38#!3H{I7A5yv9%)6Q2Qn}r6ZMQ7)j Date: Fri, 17 Oct 2025 11:37:56 +0200 Subject: [PATCH 3/9] 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 --- test/maven/src/it/hbm2ddl/pom.xml | 23 ++++++------------ .../hbm2ddl/{verify.groovy => postbuild.bsh} | 2 -- .../verify.groovy => hbm2ddl/prebuild.bsh} | 13 ++++++---- .../src/main/resources/hibernate.properties | 9 +++---- test/maven/src/it/hbm2ddl/test.mv.db | Bin 28672 -> 0 bytes 5 files changed, 19 insertions(+), 28 deletions(-) rename test/maven/src/it/hbm2ddl/{verify.groovy => postbuild.bsh} (97%) rename test/maven/src/it/{hbm2dao/verify.groovy => hbm2ddl/prebuild.bsh} (64%) delete mode 100644 test/maven/src/it/hbm2ddl/test.mv.db diff --git a/test/maven/src/it/hbm2ddl/pom.xml b/test/maven/src/it/hbm2ddl/pom.xml index 9956497b6c..49f3c993f5 100644 --- a/test/maven/src/it/hbm2ddl/pom.xml +++ b/test/maven/src/it/hbm2ddl/pom.xml @@ -23,13 +23,14 @@ hbm2ddl 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + + com.h2database + h2 + @h2.version@ + + @@ -52,14 +53,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/hbm2dao/verify.groovy b/test/maven/src/it/hbm2ddl/prebuild.bsh similarity index 64% rename from test/maven/src/it/hbm2dao/verify.groovy rename to test/maven/src/it/hbm2ddl/prebuild.bsh index 49a7a8b4a7..70f35cb226 100644 --- a/test/maven/src/it/hbm2dao/verify.groovy +++ b/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(); 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/test.mv.db b/test/maven/src/it/hbm2ddl/test.mv.db deleted file mode 100644 index 72d79270f88b69518fe17598ef53debfe7371c91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 28672 zcmeI4TWcFf6vuZJtBI93AWCQ-S{NtPPC+O$yV{#*OJr$-L?zisa!8)c>@6{IBxB1V z^r3{d^r_Hq(9hAAmVAOd=B*IOW4}Y`XlG}4t&1bas&UB?W-qg=oio4H#sB}Aqk35> zIC}&4iCA}czw^rkV_a|_AN8M<00AHX1b_e#00KY&2mk>f00e*l5V!yY>O%L6HR%5f za91D%AOHk_01yBIKmZ5;0U!VbfB+Bx0*fUOC;7!BfIYv@vieWyewni6^D=R8q3=H* zmes;OedHf9pWt9HV3~izWRnCiRt&5bhPzMMq=A4C*KwWHlmK*=$7uGzs`OTpWl8$v zg(Tf+v-Mp`dj0D1^(+gps7sPOkbjXbOIN~S6g5|Dc;N{oTq@yG4VR^GsXdE^?M8DS zv;rUY-tIHM#RjdYxG>t@ibkB^(EJF89^udgj*td+a2kiEQY*pXif+BATYaosVy3%I z--VL63r5tfD!MIAxeJ=+7)iI@jXq_!XRz=0dk3_CNZlcuuyJ@TY(46GgXZ87-x*S8 z&oAPu;gP+8)1v$FcE=AE`^tl>0RbQY1b_e#00KY&2mk>f00cfP0u%as+I;#zQ3F@? zoU^Fu>CeqY{RfdERU<_@Mevr!1+N<_&trmDF;pw1|AXnB&e_WJzx}sP`Y39DnFWo|`D_=!?wmPh}^ALS&Ka7LoO*^b< z$3&a$xSa>vsIg0|qc2t-F^CNAlmW5v*HCq{-R*TMqcKIJOQyt%Cmt2- z(Lo*p`y5!yyuF;2@|jhV&)ihM6SXP*8)p8r=2%`L^5XC0p+lF3tf{{OE~+kMJz*PV_e zjn=PUEyvm}^IN7WEuWuHm?|29U2mk>f z00e*l5C8&c0$g>b^taIetSSCIJy*x38Bl9dBcHWJ9U z`G0M!N=O%p=~P(^wo2GdI&~JR|9|{24HsU06y^W<4(R{%7cFc90U!VbfB+Bx0zlw` z5SYk13;nOTiT)3;>bt~q&m^a(K3VAh@qBZl|7Yg^jX5gMr}jB-BhUZ8;o9yl&;RrK z|6}?8?^F5zDcVkmJojXg7iYZBLFFYGZ*sg+--`49=OX)N#zA8m=b!^;M&SqzJZ?@2 zG5R0f@D2iz{!jFG VtpB}~{wErC70;hnInRGy?qAGfE9C$H From a6df9d553ed1f06aad294c597500ba3947788615 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 17 Oct 2025 11:50:00 +0200 Subject: [PATCH 4/9] HBX-3169: Update the use of H2 in the Maven integration tests to 2.4.240 - Handle the 'hbm2java' integration test Signed-off-by: Koen Aers --- test/maven/src/it/hbm2ddl/pom.xml | 1 - test/maven/src/it/hbm2java/pom.xml | 22 +++++---------- .../hbm2java/{verify.groovy => postbuild.bsh} | 2 -- test/maven/src/it/hbm2java/prebuild.bsh | 26 ++++++++++++++++++ .../src/main/resources/hibernate.properties | 9 ++---- test/maven/src/it/hbm2java/test.mv.db | Bin 24576 -> 0 bytes 6 files changed, 36 insertions(+), 24 deletions(-) rename test/maven/src/it/hbm2java/{verify.groovy => postbuild.bsh} (97%) create mode 100644 test/maven/src/it/hbm2java/prebuild.bsh delete mode 100644 test/maven/src/it/hbm2java/test.mv.db diff --git a/test/maven/src/it/hbm2ddl/pom.xml b/test/maven/src/it/hbm2ddl/pom.xml index 49f3c993f5..2c97d7d686 100644 --- a/test/maven/src/it/hbm2ddl/pom.xml +++ b/test/maven/src/it/hbm2ddl/pom.xml @@ -25,7 +25,6 @@ - com.h2database h2 @h2.version@ diff --git a/test/maven/src/it/hbm2java/pom.xml b/test/maven/src/it/hbm2java/pom.xml index ab7fc4ee18..8bebd4213d 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@ + + @@ -52,14 +52,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/test.mv.db b/test/maven/src/it/hbm2java/test.mv.db deleted file mode 100644 index aba76d3403bc1e1b54e2526be9b9bc7c2f09288c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24576 zcmeI4TW=dh6vua+m^5xvWK{?rK$^57DUxMocD)x{MZ&SSvW4wLwo|oF(d?~_n%Gg| zL=jIFLOjAZ;7jnr3y4pEc;c<%fk(twK+Mk0thc_Dw2n%o9xK|}oxPkhKkwN2pL5oY zidJwBhTc=z_V&LFDgoj!@QwpI3j7K&F%HURnP^5K93CIiQH2!Fg5#6@ z;UGFLJP1bKli;{QZI6f00e*l5C8%|00>+zfh5Tu=N`84AZ9MEbeN^i@)xNX0wcBjf5h)w_<=g1?+E;4ak9K=b7d7vr&UPO;51YMy z5A~|-uhmDJB-BhD2W}7q)U`soi5k^j18v$iF?@_|;=5tlBiQh0Kv-AFEg7uj!K9%^ ztxzL`65H0Xsk?TmY`L}@>b`H;?k1|%+s#gXc>|%f@1!TSYOUeaQNOy?a?sB1R;yVn z?l|4vcIR#`qSLISW~a{`?d-N%1>V`IwjK1K+O0LJ-MD9~+3h##Y{)2D#C@%5ufJE@ zzJK3wP`}xBdi`p9C*D!bjFPuk-Q*qZG z>)Nx?b|>kNoo&|HB{tE=YmXU326x7Q*!b(Hw%zIVyVYn+VzlEPcHNZWyX=x|>~-g% zJW}k8U10b5M&|iSR>^19Nj`I1%V+LnbNS3hb~T^bWH*C+t!JJos;Vd-e6A=zc6h7a z`gY}JmfgfflifszOMfdX$~Atg7mZM?n3x|x_)_Cboi9s#X|Ph3sQ$$WMSYB3h^NNE z{#npw69X5bwH-buaC*W7V#1UrCXD4xOc)Xp&C<(mGGUDHOw30tjFu*h5<6`+Jx@!n zFl!03x}2xnD%LDHPq|scDlRgMBM|Pr0dZgeG5Fd`bEF#r=UFoELGt!OpMK5#<*srY;t( zvx{-3iZh)m3P0lO#2aS3A>4f@`j9GWaihnL#gC{6vmf#?2!}+C(*se=L_Xp>#f2w! zYQAczrdm=Bm8iN(RZYb=#&;kJ<00e*l5C8%|00;m9Mqo;R&#I^Q zENql9wHHy-v(L@V5jiRSzlfZfZS;b@vHt%I^nb+bE!F>jUP%A{%=Q2KzcBs3qbRIZ z^_$nm`v0$`UFBM$|2-K9@a0Ot73zNm0z9F~jR{SjR^&4S0p?^NAXen#$Qe`Q#L#Iu zQRIdv0s)3EjG7ZhUn3A;#R0n)0s+J@Tx)FBmqCv}nAIlC&KoO{(Fa|ORTI$%%jSc9 z(WvKosh~%2snLgLZ)NmB#FpadgV=!R1N?^p1b_e#00KY&2mpaANMK5TOa0ICj>+@% zp>7bbFjpDE*tx!y4W<(u+4D`{w%LCp6xG z4xH;nAT{v347{eN<*0U9Irz(zqnW!PM^kc?6&Xaa4$%MflB*9u|6jrHc5n#@00AHX z1b_e#00OfJi2VOpe@p$(BzdC$Jrmn@NXye2dC?xJ|K*PW%G~A*{V%haNnP<|W{=nZ z+pd|U6HRR)_hSA3N38#!3H{I7A5yv9%)6Q2Qn}r6ZMQ7)j Date: Fri, 17 Oct 2025 14:11:37 +0200 Subject: [PATCH 5/9] 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 --- .../tool/maven/AbstractGenerationMojo.java | 8 ++-- .../it/noPropertiesFile/invoker.properties | 3 +- test/maven/src/it/noPropertiesFile/pom.xml | 8 ---- .../{verify.groovy => postbuild.bsh} | 41 ++++++++++--------- 4 files changed, 26 insertions(+), 34 deletions(-) rename test/maven/src/it/noPropertiesFile/{verify.groovy => postbuild.bsh} (59%) 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/src/it/noPropertiesFile/invoker.properties b/test/maven/src/it/noPropertiesFile/invoker.properties index f26202029c..255a1baca8 100644 --- a/test/maven/src/it/noPropertiesFile/invoker.properties +++ b/test/maven/src/it/noPropertiesFile/invoker.properties @@ -16,4 +16,5 @@ # limitations under the License. # ############################################################################ invoker.java.version = 1.8+ -invoker.goals = generate-sources \ No newline at end of file +invoker.goals = generate-sources +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 From a04280a90ac7a938a5fc8d033012d9dad1ed4402 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 17 Oct 2025 14:21:19 +0200 Subject: [PATCH 6/9] HBX-3169: Update the use of H2 in the Maven integration tests to 2.4.240 - Handle the 'transformHbm' case Signed-off-by: Koen Aers --- test/maven/src/it/transformHbm/{verify.groovy => postbuild.bsh} | 1 - 1 file changed, 1 deletion(-) rename test/maven/src/it/transformHbm/{verify.groovy => postbuild.bsh} (97%) 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()) { From 85ef29c332f62a10e48e401f5f81d559437e5201 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 17 Oct 2025 14:41:18 +0200 Subject: [PATCH 7/9] HBX-3169: Update the use of H2 in the Maven integration tests to 2.4.240 - Simplify the pom.xml file of the 'transformHbm' integration test Signed-off-by: Koen Aers --- test/maven/src/it/transformHbm/pom.xml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) 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 - From 662fc815eee5199ab6916b7fe96e352c553babdb Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 17 Oct 2025 14:59:32 +0200 Subject: [PATCH 8/9] HBX-3169: Update the use of H2 in the Maven integration tests to 2.4.240 - Some additional cleanup of the integration tests Signed-off-by: Koen Aers --- test/maven/pom.xml | 2 +- .../src/it/generateHbm/invoker.properties | 19 ------------------- test/maven/src/it/hbm2dao/invoker.properties | 19 ------------------- test/maven/src/it/hbm2ddl/invoker.properties | 19 ------------------- test/maven/src/it/hbm2java/invoker.properties | 19 ------------------- .../it/noPropertiesFile/invoker.properties | 2 -- .../src/it/transformHbm/invoker.properties | 19 ------------------- 7 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 test/maven/src/it/generateHbm/invoker.properties delete mode 100644 test/maven/src/it/hbm2dao/invoker.properties delete mode 100644 test/maven/src/it/hbm2ddl/invoker.properties delete mode 100644 test/maven/src/it/hbm2java/invoker.properties delete mode 100644 test/maven/src/it/transformHbm/invoker.properties diff --git a/test/maven/pom.xml b/test/maven/pom.xml index ea8f1236ab..c02486e2b3 100644 --- a/test/maven/pom.xml +++ b/test/maven/pom.xml @@ -45,7 +45,7 @@ ${project.build.directory}/it src/it/settings.xml ${project.build.directory}/local-repo - install + generate-sources 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/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/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/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/noPropertiesFile/invoker.properties b/test/maven/src/it/noPropertiesFile/invoker.properties index 255a1baca8..d9dafdae19 100644 --- a/test/maven/src/it/noPropertiesFile/invoker.properties +++ b/test/maven/src/it/noPropertiesFile/invoker.properties @@ -15,6 +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 invoker.buildResult = failure \ 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 From 124587a0ff73f3ba380f272548a87789b170d190 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Fri, 17 Oct 2025 15:32:04 +0200 Subject: [PATCH 9/9] HBX-3169: Update the use of H2 in the Maven integration tests to 2.4.240 - Remove the unneeded reveng.xml files from the integration tests Signed-off-by: Koen Aers --- test/maven/src/it/generateHbm/pom.xml | 3 --- .../src/main/resources/hibernate.reveng.xml | 26 ------------------- test/maven/src/it/hbm2dao/pom.xml | 3 --- .../src/main/resources/hibernate.reveng.xml | 26 ------------------- test/maven/src/it/hbm2ddl/pom.xml | 3 --- .../src/main/resources/hibernate.reveng.xml | 26 ------------------- test/maven/src/it/hbm2java/pom.xml | 3 --- .../src/main/resources/hibernate.reveng.xml | 26 ------------------- 8 files changed, 116 deletions(-) delete mode 100644 test/maven/src/it/generateHbm/src/main/resources/hibernate.reveng.xml delete mode 100644 test/maven/src/it/hbm2dao/src/main/resources/hibernate.reveng.xml delete mode 100644 test/maven/src/it/hbm2ddl/src/main/resources/hibernate.reveng.xml delete mode 100644 test/maven/src/it/hbm2java/src/main/resources/hibernate.reveng.xml diff --git a/test/maven/src/it/generateHbm/pom.xml b/test/maven/src/it/generateHbm/pom.xml index 8ff72f2b93..119041fe7c 100644 --- a/test/maven/src/it/generateHbm/pom.xml +++ b/test/maven/src/it/generateHbm/pom.xml @@ -51,9 +51,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - 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/hbm2dao/pom.xml b/test/maven/src/it/hbm2dao/pom.xml index 57c800f516..d33930c734 100644 --- a/test/maven/src/it/hbm2dao/pom.xml +++ b/test/maven/src/it/hbm2dao/pom.xml @@ -50,9 +50,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - 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/hbm2ddl/pom.xml b/test/maven/src/it/hbm2ddl/pom.xml index 2c97d7d686..7e3056aeba 100644 --- a/test/maven/src/it/hbm2ddl/pom.xml +++ b/test/maven/src/it/hbm2ddl/pom.xml @@ -49,9 +49,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - 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/hbm2java/pom.xml b/test/maven/src/it/hbm2java/pom.xml index 8bebd4213d..a691825436 100644 --- a/test/maven/src/it/hbm2java/pom.xml +++ b/test/maven/src/it/hbm2java/pom.xml @@ -49,9 +49,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - 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