From 1db51b428608e76696c315410d9053631a06fca1 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Tue, 19 Apr 2022 18:24:06 +0200
Subject: [PATCH] HV-1863 Test with Faisafe to test the MR jar

Also adjust the test infrastructure to not rely on profile activation as
it is not working very well.
---
 annotation-processor/pom.xml                  | 83 +++++++++++--------
 .../ap/internal/AbstractElementVisitor.java   |  0
 .../validator/ap/internal/ClassVisitor.java   |  0
 .../internal/ConstraintAnnotationVisitor.java |  0
 engine/pom.xml                                | 49 ++++-------
 pom.xml                                       | 18 ++++
 6 files changed, 83 insertions(+), 67 deletions(-)
 rename annotation-processor/src/main/{java14 => java17}/org/hibernate/validator/ap/internal/AbstractElementVisitor.java (100%)
 rename annotation-processor/src/main/{java14 => java17}/org/hibernate/validator/ap/internal/ClassVisitor.java (100%)
 rename annotation-processor/src/main/{java14 => java17}/org/hibernate/validator/ap/internal/ConstraintAnnotationVisitor.java (100%)

diff --git a/annotation-processor/pom.xml b/annotation-processor/pom.xml
index 7a6db7c910..e88f35143f 100644
--- a/annotation-processor/pom.xml
+++ b/annotation-processor/pom.xml
@@ -121,14 +121,56 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <configuration>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source-java17</id>
+                        <phase>${java-version.test.java17.add-test-source-phase}</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java17</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
     <profiles>
         <profile>
-            <id>java14-mr-build</id>
+            <id>java17-mr-build</id>
             <activation>
-                <jdk>[14,)</jdk>
+                <jdk>[17,)</jdk>
             </activation>
             <build>
                 <plugins>
@@ -137,15 +179,15 @@
                         <artifactId>maven-compiler-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>compile-java14</id>
+                                <id>compile-java17</id>
                                 <phase>compile</phase>
                                 <goals>
                                     <goal>compile</goal>
                                 </goals>
                                 <configuration>
-                                    <release>14</release>
+                                    <release>17</release>
                                     <compileSourceRoots>
-                                        <compileSourceRoot>${project.basedir}/src/main/java14</compileSourceRoot>
+                                        <compileSourceRoot>${project.basedir}/src/main/java17</compileSourceRoot>
                                     </compileSourceRoots>
                                     <multiReleaseOutput>true</multiReleaseOutput>
                                 </configuration>
@@ -155,36 +197,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>testWithJdk17</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>17</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/java17</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/annotation-processor/src/main/java14/org/hibernate/validator/ap/internal/AbstractElementVisitor.java b/annotation-processor/src/main/java17/org/hibernate/validator/ap/internal/AbstractElementVisitor.java
similarity index 100%
rename from annotation-processor/src/main/java14/org/hibernate/validator/ap/internal/AbstractElementVisitor.java
rename to annotation-processor/src/main/java17/org/hibernate/validator/ap/internal/AbstractElementVisitor.java
diff --git a/annotation-processor/src/main/java14/org/hibernate/validator/ap/internal/ClassVisitor.java b/annotation-processor/src/main/java17/org/hibernate/validator/ap/internal/ClassVisitor.java
similarity index 100%
rename from annotation-processor/src/main/java14/org/hibernate/validator/ap/internal/ClassVisitor.java
rename to annotation-processor/src/main/java17/org/hibernate/validator/ap/internal/ClassVisitor.java
diff --git a/annotation-processor/src/main/java14/org/hibernate/validator/ap/internal/ConstraintAnnotationVisitor.java b/annotation-processor/src/main/java17/org/hibernate/validator/ap/internal/ConstraintAnnotationVisitor.java
similarity index 100%
rename from annotation-processor/src/main/java14/org/hibernate/validator/ap/internal/ConstraintAnnotationVisitor.java
rename to annotation-processor/src/main/java17/org/hibernate/validator/ap/internal/ConstraintAnnotationVisitor.java
diff --git a/engine/pom.xml b/engine/pom.xml
index 89199a7549..8daeb8f03e 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -311,6 +311,24 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>add-test-source-java17</id>
+                        <phase>${java-version.test.java17.add-test-source-phase}</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/test/java17</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -326,36 +344,5 @@
                 <surefire.jvm.args.illegal-access>--illegal-access=deny</surefire.jvm.args.illegal-access>
             </properties>
         </profile>
-        <profile>
-            <id>testWithJdk17</id>
-            <activation>
-                <property>
-                    <name>java-version.test.release</name>
-                    <value>17</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>add-test-source</id>
-                                <phase>generate-test-sources</phase>
-                                <goals>
-                                    <goal>add-test-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>src/test/java17</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/pom.xml b/pom.xml
index 5dd219f40b..771a8f0cc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,6 +277,7 @@
         <!-- IMPORTANT: For Java 8, this must be the path to the JDK, not to the JRE -->
         <java-version.test.launcher.java_home>${java-version.test.compiler.java_home}</java-version.test.launcher.java_home>
         <java-version.test.launcher>${java-version.test.launcher.java_home}/bin/java</java-version.test.launcher>
+        <java-version.test.java17.add-test-source-phase>generate-test-sources</java-version.test.java17.add-test-source-phase>
 
         <!-- No need to build the javadocs per module. Aggregated javadocs are build in the distribution module. See also HV-894 -->
         <maven.javadoc.skip>true</maven.javadoc.skip>
@@ -1368,6 +1369,10 @@
                     <value>8</value>
                 </property>
             </activation>
+            <properties>
+                <!-- Tests specific to Java 17+ won't work with JDK 8, so we disable them. -->
+                <java-version.test.java17.add-test-source-phase>none</java-version.test.java17.add-test-source-phase>
+            </properties>
             <modules>
                 <!-- Only run the OSGi tests for JDK 8 -->
                 <module>osgi</module>
@@ -1399,6 +1404,19 @@
                 </pluginManagement>
             </build>
         </profile>
+        <profile>
+            <id>testWithJdk11</id>
+            <activation>
+                <property>
+                    <name>java-version.test.release</name>
+                    <value>11</value>
+                </property>
+            </activation>
+            <properties>
+                <!-- Tests specific to Java 17+ won't work with JDK 11, so we disable them. -->
+                <java-version.test.java17.add-test-source-phase>none</java-version.test.java17.add-test-source-phase>
+            </properties>
+        </profile>
         <profile>
             <id>testWithJdk11+</id>
             <activation>