From ce32e949eee80fa5d6c570c21c101249bbcf08c0 Mon Sep 17 00:00:00 2001
From: Hans Aikema <aikebah-github@aikebah.net>
Date: Sun, 8 Sep 2024 13:26:40 +0200
Subject: [PATCH] build: Remove the animal-sniffer, propagate java version to
 plugin-archetype (#6950)

---
 archetype/pom.xml                             |  7 ------
 .../resources/archetype-resources/pom.xml     |  5 +++-
 pom.xml                                       | 25 -------------------
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/archetype/pom.xml b/archetype/pom.xml
index 3ebbce25082..da2f3021f6e 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -37,13 +37,6 @@ Copyright (c) 2017 Jeremy Long. All Rights Reserved.
   </scm>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml b/archetype/src/main/resources/archetype-resources/pom.xml
index 712babfeabf..805d8f39ae0 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -14,7 +14,10 @@
             <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
         </license>
     </licenses>
-    
+
+    <properties>
+        <maven.compiler.release>${maven.compiler.release}</maven.compiler.release>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>org.owasp</groupId>
diff --git a/pom.xml b/pom.xml
index bfcbe2a5686..bd2b6c7e6f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,11 +242,6 @@ Copyright (c) 2012 - Jeremy Long
                     <artifactId>maven-enforcer-plugin</artifactId>
                     <version>3.5.0</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>animal-sniffer-maven-plugin</artifactId>
-                    <version>1.23</version>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
@@ -576,26 +571,6 @@ Copyright (c) 2012 - Jeremy Long
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>signature-check</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <signature>
-                                <groupId>org.codehaus.mojo.signature</groupId>
-                                <artifactId>java18</artifactId>
-                                <version>1.0</version>
-                            </signature>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>