[#noissue] Cleanup maven

pinpoint-apm · Mar 21, 2024 · 37433b7 · 37433b7
1 parent b3be5cd
commit 37433b7
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>