From 7acc55d3d49addc676948fb046c2633230f956e4 Mon Sep 17 00:00:00 2001
From: Koen Aers <koen.aers@gmail.com>
Date: Tue, 22 Jul 2025 17:16:48 +0300
Subject: [PATCH] HBX-3055: Reorganize the Maven Plugin integration tests to be
 able to group them by testes Mojo

Signed-off-by: Koen Aers <koen.aers@gmail.com>
---
 maven/pom.xml                                                    | 1 +
 .../jpa-default}/invoker.properties                              | 0
 .../it/{hbm2java-jpa-default => hbm2java/jpa-default}/pom.xml    | 0
 .../it/{hbm2java-jpa-default => hbm2java/jpa-default}/setup.bsh  | 0
 .../jpa-default}/src/main/resources/hibernate.properties         | 0
 .../it/{hbm2java-jpa-default => hbm2java/jpa-default}/verify.bsh | 0
 .../no-annotations}/invoker.properties                           | 0
 .../{hbm2java-no-annotations => hbm2java/no-annotations}/pom.xml | 0
 .../no-annotations}/setup.bsh                                    | 0
 .../no-annotations}/src/main/resources/hibernate.properties      | 0
 .../no-annotations}/verify.bsh                                   | 0
 .../no-generics}/invoker.properties                              | 0
 .../it/{hbm2java-no-generics => hbm2java/no-generics}/pom.xml    | 0
 .../it/{hbm2java-no-generics => hbm2java/no-generics}/setup.bsh  | 0
 .../no-generics}/src/main/resources/hibernate.properties         | 0
 .../it/{hbm2java-no-generics => hbm2java/no-generics}/verify.bsh | 0
 .../output-directory}/invoker.properties                         | 0
 .../output-directory}/pom.xml                                    | 0
 .../output-directory}/setup.bsh                                  | 0
 .../output-directory}/src/main/resources/hibernate.properties    | 0
 .../output-directory}/verify.bsh                                 | 0
 .../template-path}/invoker.properties                            | 0
 .../{hbm2java-template-path => hbm2java/template-path}/pom.xml   | 0
 .../{hbm2java-template-path => hbm2java/template-path}/setup.bsh | 0
 .../template-path}/src/main/resources/hibernate.properties       | 0
 .../template-path}/templates/pojo/Pojo.ftl                       | 0
 .../template-path}/verify.bsh                                    | 0
 .../use-generics}/invoker.properties                             | 0
 .../it/{hbm2java-use-generics => hbm2java/use-generics}/pom.xml  | 0
 .../{hbm2java-use-generics => hbm2java/use-generics}/setup.bsh   | 0
 .../use-generics}/src/main/resources/hibernate.properties        | 0
 .../{hbm2java-use-generics => hbm2java/use-generics}/verify.bsh  | 0
 32 files changed, 1 insertion(+)
 rename maven/src/it/{hbm2java-jpa-default => hbm2java/jpa-default}/invoker.properties (100%)
 rename maven/src/it/{hbm2java-jpa-default => hbm2java/jpa-default}/pom.xml (100%)
 rename maven/src/it/{hbm2java-jpa-default => hbm2java/jpa-default}/setup.bsh (100%)
 rename maven/src/it/{hbm2java-jpa-default => hbm2java/jpa-default}/src/main/resources/hibernate.properties (100%)
 rename maven/src/it/{hbm2java-jpa-default => hbm2java/jpa-default}/verify.bsh (100%)
 rename maven/src/it/{hbm2java-no-annotations => hbm2java/no-annotations}/invoker.properties (100%)
 rename maven/src/it/{hbm2java-no-annotations => hbm2java/no-annotations}/pom.xml (100%)
 rename maven/src/it/{hbm2java-no-annotations => hbm2java/no-annotations}/setup.bsh (100%)
 rename maven/src/it/{hbm2java-no-annotations => hbm2java/no-annotations}/src/main/resources/hibernate.properties (100%)
 rename maven/src/it/{hbm2java-no-annotations => hbm2java/no-annotations}/verify.bsh (100%)
 rename maven/src/it/{hbm2java-no-generics => hbm2java/no-generics}/invoker.properties (100%)
 rename maven/src/it/{hbm2java-no-generics => hbm2java/no-generics}/pom.xml (100%)
 rename maven/src/it/{hbm2java-no-generics => hbm2java/no-generics}/setup.bsh (100%)
 rename maven/src/it/{hbm2java-no-generics => hbm2java/no-generics}/src/main/resources/hibernate.properties (100%)
 rename maven/src/it/{hbm2java-no-generics => hbm2java/no-generics}/verify.bsh (100%)
 rename maven/src/it/{hbm2java-output-directory => hbm2java/output-directory}/invoker.properties (100%)
 rename maven/src/it/{hbm2java-output-directory => hbm2java/output-directory}/pom.xml (100%)
 rename maven/src/it/{hbm2java-output-directory => hbm2java/output-directory}/setup.bsh (100%)
 rename maven/src/it/{hbm2java-output-directory => hbm2java/output-directory}/src/main/resources/hibernate.properties (100%)
 rename maven/src/it/{hbm2java-output-directory => hbm2java/output-directory}/verify.bsh (100%)
 rename maven/src/it/{hbm2java-template-path => hbm2java/template-path}/invoker.properties (100%)
 rename maven/src/it/{hbm2java-template-path => hbm2java/template-path}/pom.xml (100%)
 rename maven/src/it/{hbm2java-template-path => hbm2java/template-path}/setup.bsh (100%)
 rename maven/src/it/{hbm2java-template-path => hbm2java/template-path}/src/main/resources/hibernate.properties (100%)
 rename maven/src/it/{hbm2java-template-path => hbm2java/template-path}/templates/pojo/Pojo.ftl (100%)
 rename maven/src/it/{hbm2java-template-path => hbm2java/template-path}/verify.bsh (100%)
 rename maven/src/it/{hbm2java-use-generics => hbm2java/use-generics}/invoker.properties (100%)
 rename maven/src/it/{hbm2java-use-generics => hbm2java/use-generics}/pom.xml (100%)
 rename maven/src/it/{hbm2java-use-generics => hbm2java/use-generics}/setup.bsh (100%)
 rename maven/src/it/{hbm2java-use-generics => hbm2java/use-generics}/src/main/resources/hibernate.properties (100%)
 rename maven/src/it/{hbm2java-use-generics => hbm2java/use-generics}/verify.bsh (100%)

diff --git a/maven/pom.xml b/maven/pom.xml
index 772ec41770..384645ef9f 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -189,6 +189,7 @@
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
           <preBuildHookScript>setup</preBuildHookScript>
           <postBuildHookScript>verify</postBuildHookScript>
+          <pomIncludes>**/pom.xml</pomIncludes>
         </configuration>
         <executions>
           <execution>
diff --git a/maven/src/it/hbm2java-jpa-default/invoker.properties b/maven/src/it/hbm2java/jpa-default/invoker.properties
similarity index 100%
rename from maven/src/it/hbm2java-jpa-default/invoker.properties
rename to maven/src/it/hbm2java/jpa-default/invoker.properties
diff --git a/maven/src/it/hbm2java-jpa-default/pom.xml b/maven/src/it/hbm2java/jpa-default/pom.xml
similarity index 100%
rename from maven/src/it/hbm2java-jpa-default/pom.xml
rename to maven/src/it/hbm2java/jpa-default/pom.xml
diff --git a/maven/src/it/hbm2java-jpa-default/setup.bsh b/maven/src/it/hbm2java/jpa-default/setup.bsh
similarity index 100%
rename from maven/src/it/hbm2java-jpa-default/setup.bsh
rename to maven/src/it/hbm2java/jpa-default/setup.bsh
diff --git a/maven/src/it/hbm2java-jpa-default/src/main/resources/hibernate.properties b/maven/src/it/hbm2java/jpa-default/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/hbm2java-jpa-default/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java/jpa-default/src/main/resources/hibernate.properties
diff --git a/maven/src/it/hbm2java-jpa-default/verify.bsh b/maven/src/it/hbm2java/jpa-default/verify.bsh
similarity index 100%
rename from maven/src/it/hbm2java-jpa-default/verify.bsh
rename to maven/src/it/hbm2java/jpa-default/verify.bsh
diff --git a/maven/src/it/hbm2java-no-annotations/invoker.properties b/maven/src/it/hbm2java/no-annotations/invoker.properties
similarity index 100%
rename from maven/src/it/hbm2java-no-annotations/invoker.properties
rename to maven/src/it/hbm2java/no-annotations/invoker.properties
diff --git a/maven/src/it/hbm2java-no-annotations/pom.xml b/maven/src/it/hbm2java/no-annotations/pom.xml
similarity index 100%
rename from maven/src/it/hbm2java-no-annotations/pom.xml
rename to maven/src/it/hbm2java/no-annotations/pom.xml
diff --git a/maven/src/it/hbm2java-no-annotations/setup.bsh b/maven/src/it/hbm2java/no-annotations/setup.bsh
similarity index 100%
rename from maven/src/it/hbm2java-no-annotations/setup.bsh
rename to maven/src/it/hbm2java/no-annotations/setup.bsh
diff --git a/maven/src/it/hbm2java-no-annotations/src/main/resources/hibernate.properties b/maven/src/it/hbm2java/no-annotations/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/hbm2java-no-annotations/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java/no-annotations/src/main/resources/hibernate.properties
diff --git a/maven/src/it/hbm2java-no-annotations/verify.bsh b/maven/src/it/hbm2java/no-annotations/verify.bsh
similarity index 100%
rename from maven/src/it/hbm2java-no-annotations/verify.bsh
rename to maven/src/it/hbm2java/no-annotations/verify.bsh
diff --git a/maven/src/it/hbm2java-no-generics/invoker.properties b/maven/src/it/hbm2java/no-generics/invoker.properties
similarity index 100%
rename from maven/src/it/hbm2java-no-generics/invoker.properties
rename to maven/src/it/hbm2java/no-generics/invoker.properties
diff --git a/maven/src/it/hbm2java-no-generics/pom.xml b/maven/src/it/hbm2java/no-generics/pom.xml
similarity index 100%
rename from maven/src/it/hbm2java-no-generics/pom.xml
rename to maven/src/it/hbm2java/no-generics/pom.xml
diff --git a/maven/src/it/hbm2java-no-generics/setup.bsh b/maven/src/it/hbm2java/no-generics/setup.bsh
similarity index 100%
rename from maven/src/it/hbm2java-no-generics/setup.bsh
rename to maven/src/it/hbm2java/no-generics/setup.bsh
diff --git a/maven/src/it/hbm2java-no-generics/src/main/resources/hibernate.properties b/maven/src/it/hbm2java/no-generics/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/hbm2java-no-generics/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java/no-generics/src/main/resources/hibernate.properties
diff --git a/maven/src/it/hbm2java-no-generics/verify.bsh b/maven/src/it/hbm2java/no-generics/verify.bsh
similarity index 100%
rename from maven/src/it/hbm2java-no-generics/verify.bsh
rename to maven/src/it/hbm2java/no-generics/verify.bsh
diff --git a/maven/src/it/hbm2java-output-directory/invoker.properties b/maven/src/it/hbm2java/output-directory/invoker.properties
similarity index 100%
rename from maven/src/it/hbm2java-output-directory/invoker.properties
rename to maven/src/it/hbm2java/output-directory/invoker.properties
diff --git a/maven/src/it/hbm2java-output-directory/pom.xml b/maven/src/it/hbm2java/output-directory/pom.xml
similarity index 100%
rename from maven/src/it/hbm2java-output-directory/pom.xml
rename to maven/src/it/hbm2java/output-directory/pom.xml
diff --git a/maven/src/it/hbm2java-output-directory/setup.bsh b/maven/src/it/hbm2java/output-directory/setup.bsh
similarity index 100%
rename from maven/src/it/hbm2java-output-directory/setup.bsh
rename to maven/src/it/hbm2java/output-directory/setup.bsh
diff --git a/maven/src/it/hbm2java-output-directory/src/main/resources/hibernate.properties b/maven/src/it/hbm2java/output-directory/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/hbm2java-output-directory/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java/output-directory/src/main/resources/hibernate.properties
diff --git a/maven/src/it/hbm2java-output-directory/verify.bsh b/maven/src/it/hbm2java/output-directory/verify.bsh
similarity index 100%
rename from maven/src/it/hbm2java-output-directory/verify.bsh
rename to maven/src/it/hbm2java/output-directory/verify.bsh
diff --git a/maven/src/it/hbm2java-template-path/invoker.properties b/maven/src/it/hbm2java/template-path/invoker.properties
similarity index 100%
rename from maven/src/it/hbm2java-template-path/invoker.properties
rename to maven/src/it/hbm2java/template-path/invoker.properties
diff --git a/maven/src/it/hbm2java-template-path/pom.xml b/maven/src/it/hbm2java/template-path/pom.xml
similarity index 100%
rename from maven/src/it/hbm2java-template-path/pom.xml
rename to maven/src/it/hbm2java/template-path/pom.xml
diff --git a/maven/src/it/hbm2java-template-path/setup.bsh b/maven/src/it/hbm2java/template-path/setup.bsh
similarity index 100%
rename from maven/src/it/hbm2java-template-path/setup.bsh
rename to maven/src/it/hbm2java/template-path/setup.bsh
diff --git a/maven/src/it/hbm2java-template-path/src/main/resources/hibernate.properties b/maven/src/it/hbm2java/template-path/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/hbm2java-template-path/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java/template-path/src/main/resources/hibernate.properties
diff --git a/maven/src/it/hbm2java-template-path/templates/pojo/Pojo.ftl b/maven/src/it/hbm2java/template-path/templates/pojo/Pojo.ftl
similarity index 100%
rename from maven/src/it/hbm2java-template-path/templates/pojo/Pojo.ftl
rename to maven/src/it/hbm2java/template-path/templates/pojo/Pojo.ftl
diff --git a/maven/src/it/hbm2java-template-path/verify.bsh b/maven/src/it/hbm2java/template-path/verify.bsh
similarity index 100%
rename from maven/src/it/hbm2java-template-path/verify.bsh
rename to maven/src/it/hbm2java/template-path/verify.bsh
diff --git a/maven/src/it/hbm2java-use-generics/invoker.properties b/maven/src/it/hbm2java/use-generics/invoker.properties
similarity index 100%
rename from maven/src/it/hbm2java-use-generics/invoker.properties
rename to maven/src/it/hbm2java/use-generics/invoker.properties
diff --git a/maven/src/it/hbm2java-use-generics/pom.xml b/maven/src/it/hbm2java/use-generics/pom.xml
similarity index 100%
rename from maven/src/it/hbm2java-use-generics/pom.xml
rename to maven/src/it/hbm2java/use-generics/pom.xml
diff --git a/maven/src/it/hbm2java-use-generics/setup.bsh b/maven/src/it/hbm2java/use-generics/setup.bsh
similarity index 100%
rename from maven/src/it/hbm2java-use-generics/setup.bsh
rename to maven/src/it/hbm2java/use-generics/setup.bsh
diff --git a/maven/src/it/hbm2java-use-generics/src/main/resources/hibernate.properties b/maven/src/it/hbm2java/use-generics/src/main/resources/hibernate.properties
similarity index 100%
rename from maven/src/it/hbm2java-use-generics/src/main/resources/hibernate.properties
rename to maven/src/it/hbm2java/use-generics/src/main/resources/hibernate.properties
diff --git a/maven/src/it/hbm2java-use-generics/verify.bsh b/maven/src/it/hbm2java/use-generics/verify.bsh
similarity index 100%
rename from maven/src/it/hbm2java-use-generics/verify.bsh
rename to maven/src/it/hbm2java/use-generics/verify.bsh