From 4830df01c422a530a80880896b3cb160e819b77c Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Wed, 3 May 2023 21:35:23 +0200
Subject: [PATCH] Sync enforcer configuration setup with ASF

---
 pom.xml | 53 +++++++++++------------------------------------------
 1 file changed, 11 insertions(+), 42 deletions(-)

diff --git a/pom.xml b/pom.xml
index e49d8fdad..d1e40e67e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -546,9 +546,16 @@ limitations under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>extra-enforcer-rules</artifactId>
+            <version>1.6.2</version>
+          </dependency>
+        </dependencies>
         <executions>
           <execution>
-            <id>enforce-maven</id>
+            <id>enforce-maven-and-java-bytecode</id>
             <goals>
               <goal>enforce</goal>
             </goals>
@@ -558,6 +565,9 @@ limitations under the License.
                   <version>3.2.5</version>
                   <message>This project requires at least Maven 3.2.5</message>
                 </requireMavenVersion>
+                <enforceBytecodeVersion>
+                  <maxJdkVersion>${maven.compiler.target}</maxJdkVersion>
+                </enforceBytecodeVersion>
             </rules>
             </configuration>
           </execution>
@@ -744,46 +754,5 @@ limitations under the License.
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>pre-JEP_247</id>
-      <activation>
-        <jdk>[7,8]</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <dependencies>
-              <dependency>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-enforcer-rule</artifactId>
-                <version>1.23</version>
-              </dependency>
-            </dependencies>
-            <executions>
-              <execution>
-                <id>check-signatures</id>
-                <phase>test</phase>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <checkSignatureRule implementation="org.codehaus.mojo.animal_sniffer.enforcer.CheckSignatureRule">
-                      <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>java1${javaVersion}</artifactId>
-                        <version>1.0</version>
-                      </signature>
-                    </checkSignatureRule>
-                  </rules>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
 </project>