[pinpoint-apm#8899] Remove animal-sniffer plugin

emeroad · May 31, 2022 · 58e79a8 · 58e79a8
1 parent cf030c0
commit 58e79a8
Show file tree

Hide file tree

Showing 48 changed files with 3 additions and 102 deletions.
diff --git a/agent-testweb/pom.xml b/agent-testweb/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
 
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>

diff --git a/agent/pom.xml b/agent/pom.xml
@@ -35,7 +35,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
 
         <!-- for development option -->
         <skip.agent.distribution>false</skip.agent.distribution>

diff --git a/batch/pom.xml b/batch/pom.xml
@@ -14,7 +14,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <thrift.version>${thrift-jdk8.version}</thrift.version>

diff --git a/bootstraps/bootstrap-java8/pom.xml b/bootstraps/bootstrap-java8/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/bootstraps/bootstrap-java9-internal/pom.xml b/bootstraps/bootstrap-java9-internal/pom.xml
@@ -30,7 +30,6 @@
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
         <javadoc.source>8</javadoc.source>
 
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
     </properties>
 
     <artifactId>pinpoint-bootstrap-java9-internal</artifactId>

diff --git a/bootstraps/bootstrap-java9/pom.xml b/bootstraps/bootstrap-java9/pom.xml
@@ -30,7 +30,6 @@
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
         <javadoc.source>8</javadoc.source>
 
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
     </properties>
 
     <artifactId>pinpoint-bootstrap-java9</artifactId>

diff --git a/collector/pom.xml b/collector/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <guava.version>${guava-jdk8.version}</guava.version>
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>

diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>

diff --git a/commons-server-cluster/pom.xml b/commons-server-cluster/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
         <test.jdk.home>${jdk.home}</test.jdk.home>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>

diff --git a/commons-server/pom.xml b/commons-server/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
         <test.jdk.home>${jdk.home}</test.jdk.home>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>

diff --git a/flink/pom.xml b/flink/pom.xml
@@ -32,7 +32,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
         <thrift.version>${thrift-jdk8.version}</thrift.version>

diff --git a/hbase/pom.xml b/hbase/pom.xml
@@ -16,7 +16,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>

diff --git a/hbase2-module/hbase2-batch/pom.xml b/hbase2-module/hbase2-batch/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
 
         <pinpoint.batch.executable.name>${project.artifactId}-${project.version}</pinpoint.batch.executable.name>

diff --git a/hbase2-module/hbase2-collector/pom.xml b/hbase2-module/hbase2-collector/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <guava.version>${guava-jdk8.version}</guava.version>
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>

diff --git a/hbase2-module/hbase2-flink/pom.xml b/hbase2-module/hbase2-flink/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
         <log4j2.version>${log4j2-jdk8.version}</log4j2.version>
     </properties>
 

diff --git a/hbase2-module/hbase2-web/pom.xml b/hbase2-module/hbase2-web/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <jdk.version>11</jdk.version>
         <jdk.home>${env.JAVA_11_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
 
         <grunt.build.command>build_release_without_lint</grunt.build.command>
 

diff --git a/plugins-it/activemq-it/pom.xml b/plugins-it/activemq-it/pom.xml
@@ -29,7 +29,8 @@
     <packaging>jar</packaging>
 
     <properties>
-
+        <jdk.version>1.8</jdk.version>
+        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
     </properties>
 
     <dependencies>

diff --git a/plugins-it/kafka-it/pom.xml b/plugins-it/kafka-it/pom.xml
@@ -16,7 +16,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins-it/kotlin-coroutines-it/pom.xml b/plugins-it/kotlin-coroutines-it/pom.xml
@@ -16,7 +16,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
 
         <kotlin.version>1.5.32</kotlin.version>
     </properties>

diff --git a/plugins-it/lambda-it/pom.xml b/plugins-it/lambda-it/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins-it/oracledb-it/pom.xml b/plugins-it/oracledb-it/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
     </properties>
 
     <dependencies>

diff --git a/plugins/akka-http/pom.xml b/plugins/akka-http/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/druid/pom.xml b/plugins/druid/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java17</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/elasticsearch/pom.xml b/plugins/elasticsearch/pom.xml
@@ -14,7 +14,6 @@
 
     <properties>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/elasticsearch8/pom.xml b/plugins/elasticsearch8/pom.xml
@@ -14,7 +14,6 @@
 
     <properties>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/hbase/pom.xml b/plugins/hbase/pom.xml
@@ -30,7 +30,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java17</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/jdk-completable-future/pom.xml b/plugins/jdk-completable-future/pom.xml
@@ -14,7 +14,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/kafka/pom.xml b/plugins/kafka/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/kotlin-coroutines/pom.xml b/plugins/kotlin-coroutines/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/mssql-jdbc/pom.xml b/plugins/mssql-jdbc/pom.xml
@@ -15,7 +15,7 @@
 
   <properties>
     <jdk.version>1.8</jdk.version>
-    <jdk.home>${env.JAVA_8_HOME}</jdk.home>    <sniffer.artifactid>java17</sniffer.artifactid>
+    <jdk.home>${env.JAVA_8_HOME}</jdk.home>
   </properties>
 
   <dependencies>

diff --git a/plugins/netty/pom.xml b/plugins/netty/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/ning-asynchttpclient/pom.xml b/plugins/ning-asynchttpclient/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/openwhisk/pom.xml b/plugins/openwhisk/pom.xml
@@ -23,7 +23,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/reactor-netty/pom.xml b/plugins/reactor-netty/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/reactor/pom.xml b/plugins/reactor/pom.xml
@@ -16,7 +16,6 @@
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
         <test.jdk.home>${env.JAVA_8_HOME}</test.jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/redis-lettuce/pom.xml b/plugins/redis-lettuce/pom.xml
@@ -16,7 +16,6 @@
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
         <test.jdk.home>${env.JAVA_8_HOME}</test.jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/redis-redisson/pom.xml b/plugins/redis-redisson/pom.xml
@@ -16,7 +16,6 @@
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
         <test.jdk.home>${env.JAVA_8_HOME}</test.jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/rocketmq/pom.xml b/plugins/rocketmq/pom.xml
@@ -15,7 +15,6 @@
   <properties>
     <jdk.version>1.8</jdk.version>
     <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-    <sniffer.artifactid>java18</sniffer.artifactid>
   </properties>
 
   <dependencies>

diff --git a/plugins/spring-webflux/pom.xml b/plugins/spring-webflux/pom.xml
@@ -16,7 +16,6 @@
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
         <test.jdk.home>${env.JAVA_8_HOME}</test.jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/undertow-servlet/pom.xml b/plugins/undertow-servlet/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java17</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/undertow/pom.xml b/plugins/undertow/pom.xml
@@ -31,7 +31,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java17</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/plugins/vertx/pom.xml b/plugins/vertx/pom.xml
@@ -15,7 +15,6 @@
     <properties>
         <jdk.version>1.8</jdk.version>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-        <sniffer.artifactid>java18</sniffer.artifactid>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -136,7 +136,6 @@
         <hbase2.client.version>2.4.11</hbase2.client.version>
 
         <plugin.jacoco.skip>true</plugin.jacoco.skip>
-        <plugin.animal-sniffer.skip>false</plugin.animal-sniffer.skip>
 
         <!-- library -->
         <metrics.version>3.2.6</metrics.version>
@@ -216,9 +215,6 @@
         <plugin.pmd.version>3.15.0</plugin.pmd.version>
 
         <plugin.enforcer.version>3.0.0</plugin.enforcer.version>
-        <plugin.animal-sniffer.version>1.20</plugin.animal-sniffer.version>
-
-        <sniffer.artifactid>java17</sniffer.artifactid>
 
         <!-- frontend-plugin -->
         <plugin.frontend.version>1.12.0</plugin.frontend.version>
@@ -1390,32 +1386,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <version>${plugin.animal-sniffer.version}</version>
-                <configuration>
-                    <signature>
-                        <groupId>org.codehaus.mojo.signature</groupId>
-                        <artifactId>${sniffer.artifactid}</artifactId>
-                        <version>1.0</version>
-                    </signature>
-                    <ignores>
-                        <ignore>sun.*</ignore>
-                    </ignores>
-                    <skip>${plugin.animal-sniffer.skip}</skip>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>ensure-java-${jdk.version}-class-library</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
@@ -1469,8 +1439,6 @@
             <properties>
                 <env>local</env>
                 <spring.profiles.active>local</spring.profiles.active>
-                <!-- skip development environment-->
-                <plugin.animal-sniffer.skip>true</plugin.animal-sniffer.skip>
             </properties>
         </profile>
         <!-- for Release -->