From 37433b76a15667dbfc9bc17c96c5c15925b5e7fc Mon Sep 17 00:00:00 2001
From: emeroad <emeroad@gmail.com>
Date: Thu, 21 Mar 2024 11:08:08 +0900
Subject: [PATCH] [#noissue] Cleanup maven

---
 agent-module/agent/src/assembly/component/core.xml | 4 ++--
 agent-module/plugins/jboss/pom.xml                 | 8 ++++++++
 agent-module/plugins/jetty/pom.xml                 | 8 ++++++++
 agent-module/plugins/resin/pom.xml                 | 8 ++++++++
 agent-module/plugins/tomcat/pom.xml                | 6 ++++++
 agent-module/plugins/undertow-servlet/pom.xml      | 8 ++++++++
 agent-module/plugins/undertow/pom.xml              | 8 ++++++++
 agent-module/plugins/weblogic/pom.xml              | 8 ++++++++
 agent-module/plugins/websphere/pom.xml             | 8 ++++++++
 pom.xml                                            | 4 ++--
 10 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/agent-module/agent/src/assembly/component/core.xml b/agent-module/agent/src/assembly/component/core.xml
index ef647a18f211..4f86b74cf7ba 100644
--- a/agent-module/agent/src/assembly/component/core.xml
+++ b/agent-module/agent/src/assembly/component/core.xml
@@ -66,7 +66,7 @@
                 <exclude>com.navercorp.pinpoint:pinpoint-bootstrap-java16</exclude>
                 <exclude>com.navercorp.pinpoint:pinpoint-profiler-test</exclude>
                 <exclude>com.navercorp.pinpoint:pinpoint-plugins-assembly</exclude>
-                <exclude>com.navercorp.pinpoint:pinpoint-tools</exclude>
+                <exclude>com.navercorp.pinpoint:pinpoint-agent-tools</exclude>
 <!--                <exclude>*:pom</exclude>-->
             </excludes>
             <outputDirectory>lib</outputDirectory>
@@ -96,7 +96,7 @@
         </dependencySet>
         <dependencySet>
             <includes>
-                <include>com.navercorp.pinpoint:pinpoint-tools</include>
+                <include>com.navercorp.pinpoint:pinpoint-agent-tools</include>
             </includes>
             <outputDirectory>tools</outputDirectory>
         </dependencySet>
diff --git a/agent-module/plugins/jboss/pom.xml b/agent-module/plugins/jboss/pom.xml
index da690f55ae1f..4c169f250178 100644
--- a/agent-module/plugins/jboss/pom.xml
+++ b/agent-module/plugins/jboss/pom.xml
@@ -134,6 +134,14 @@
                                     <include>com.navercorp.pinpoint:pinpoint-common-servlet</include>
                                 </includes>
                             </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>com.navercorp.pinpoint:pinpoint-common-servlet</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>com.navercorp.pinpoint.plugin.common.servlet</pattern>
diff --git a/agent-module/plugins/jetty/pom.xml b/agent-module/plugins/jetty/pom.xml
index 073dae3dda82..d24a65e93444 100644
--- a/agent-module/plugins/jetty/pom.xml
+++ b/agent-module/plugins/jetty/pom.xml
@@ -95,6 +95,14 @@
                                     <include>com.navercorp.pinpoint:pinpoint-common-servlet</include>
                                 </includes>
                             </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>com.navercorp.pinpoint:pinpoint-common-servlet</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>com.navercorp.pinpoint.plugin.common.servlet</pattern>
diff --git a/agent-module/plugins/resin/pom.xml b/agent-module/plugins/resin/pom.xml
index 4a4159f99b92..0fb3310821e4 100644
--- a/agent-module/plugins/resin/pom.xml
+++ b/agent-module/plugins/resin/pom.xml
@@ -100,6 +100,14 @@
                                     <include>com.navercorp.pinpoint:pinpoint-common-servlet</include>
                                 </includes>
                             </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>com.navercorp.pinpoint:pinpoint-common-servlet</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>com.navercorp.pinpoint.plugin.common.servlet</pattern>
diff --git a/agent-module/plugins/tomcat/pom.xml b/agent-module/plugins/tomcat/pom.xml
index a73de5c8b73f..2ca277a38f6f 100644
--- a/agent-module/plugins/tomcat/pom.xml
+++ b/agent-module/plugins/tomcat/pom.xml
@@ -106,6 +106,12 @@
                                 </includes>
                             </artifactSet>
                             <filters>
+                                <filter>
+                                    <artifact>com.navercorp.pinpoint:pinpoint-common-servlet</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
                                 <filter>
                                     <artifact>com.navercorp.pinpoint:pinpoint-jboss-plugin</artifact>
                                     <includes>
diff --git a/agent-module/plugins/undertow-servlet/pom.xml b/agent-module/plugins/undertow-servlet/pom.xml
index 6000275d6940..9a237d6ac03d 100644
--- a/agent-module/plugins/undertow-servlet/pom.xml
+++ b/agent-module/plugins/undertow-servlet/pom.xml
@@ -78,6 +78,14 @@
                                     <include>com.navercorp.pinpoint:pinpoint-common-servlet</include>
                                 </includes>
                             </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>com.navercorp.pinpoint:pinpoint-common-servlet</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>com.navercorp.pinpoint.plugin.common.servlet</pattern>
diff --git a/agent-module/plugins/undertow/pom.xml b/agent-module/plugins/undertow/pom.xml
index 8479ad4cce05..f8deae07c713 100644
--- a/agent-module/plugins/undertow/pom.xml
+++ b/agent-module/plugins/undertow/pom.xml
@@ -78,6 +78,14 @@
                                     <include>com.navercorp.pinpoint:pinpoint-common-servlet</include>
                                 </includes>
                             </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>com.navercorp.pinpoint:pinpoint-common-servlet</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>com.navercorp.pinpoint.plugin.common.servlet</pattern>
diff --git a/agent-module/plugins/weblogic/pom.xml b/agent-module/plugins/weblogic/pom.xml
index 2c1e2b832df1..983ac60846c1 100644
--- a/agent-module/plugins/weblogic/pom.xml
+++ b/agent-module/plugins/weblogic/pom.xml
@@ -94,6 +94,14 @@
                                     <include>com.navercorp.pinpoint:pinpoint-common-servlet</include>
                                 </includes>
                             </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>com.navercorp.pinpoint:pinpoint-common-servlet</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>com.navercorp.pinpoint.plugin.common.servlet</pattern>
diff --git a/agent-module/plugins/websphere/pom.xml b/agent-module/plugins/websphere/pom.xml
index d19188ed5a34..297c73413427 100644
--- a/agent-module/plugins/websphere/pom.xml
+++ b/agent-module/plugins/websphere/pom.xml
@@ -90,6 +90,14 @@
                                     <include>com.navercorp.pinpoint:pinpoint-common-servlet</include>
                                 </includes>
                             </artifactSet>
+                            <filters>
+                                <filter>
+                                    <artifact>com.navercorp.pinpoint:pinpoint-common-servlet</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/MANIFEST.MF</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
                             <relocations>
                                 <relocation>
                                     <pattern>com.navercorp.pinpoint.plugin.common.servlet</pattern>
diff --git a/pom.xml b/pom.xml
index 31af8757dc1d..01037728fefa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,7 @@
         <maven.compiler.target>${jdk.version}</maven.compiler.target>
         <maven.compiler.compilerVersion>${jdk.version}</maven.compiler.compilerVersion>
         <jdk.home>${env.JAVA_8_HOME}</jdk.home>
+        <maven.compiler.executable>${jdk.home}/bin/javac</maven.compiler.executable>
         <test.jdk.home>${jdk.home}</test.jdk.home>
 
         <docker.repository.name>pinpointdocker</docker.repository.name>
@@ -1696,11 +1697,10 @@
                 <configuration>
                     <fork>true</fork>
                     <debug>true</debug>
-                    <verbose>true</verbose>
+                    <verbose>false</verbose>
                     <parameters>true</parameters>
                     <showDeprecation>true</showDeprecation>
                     <detail>true</detail>
-                    <executable>${jdk.home}/bin/javac</executable>
                 </configuration>
             </plugin>
             <plugin>