[#9920] Modify binary naming rule of agent-testweb to maven standard

pinpoint-apm · May 4, 2023 · babac39 · babac39
1 parent 721abe3
commit babac39
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 deletions.
diff --git a/agent-testweb/cassandra4-plugin-testweb/src/main/resources/application.yml b/agent-testweb/cassandra4-plugin-testweb/src/main/resources/application.yml
@@ -2,3 +2,11 @@
 
 server:
   port: 18080
+
+logging:
+  level:
+    root: info
+
+springdoc:
+  swagger-ui:
+    path: /
diff --git a/agent-testweb/jdk-http-plugin-testweb/pom.xml b/agent-testweb/jdk-http-plugin-testweb/pom.xml
@@ -16,8 +16,6 @@
         <pinpoint.agent.jvmargument>
             ${pinpoint.agent.default.jvmargument}
         </pinpoint.agent.jvmargument>
-
-        <pinpoint.server.port>18443</pinpoint.server.port>
     </properties>
 
     <dependencies>

diff --git a/agent-testweb/pom.xml b/agent-testweb/pom.xml
@@ -34,7 +34,6 @@
         <javax.servlet.version>${javax.servlet4.version}</javax.servlet.version>
 
         <spring-boot-build-skip>false</spring-boot-build-skip>
-        <pinpoint.plugintest.executable.name>${project.artifactId}-boot-${project.version}</pinpoint.plugintest.executable.name>
 
         <pinpoint.agent.profile>local</pinpoint.agent.profile>
         <pinpoint.agent.sampling-rate>1</pinpoint.agent.sampling-rate>
@@ -46,7 +45,6 @@
             -Dprofiler.sampling.rate=${pinpoint.agent.sampling-rate}
         </pinpoint.agent.default.jvmargument>
         <pinpoint.agent.jvmargument>${pinpoint.agent.default.jvmargument}</pinpoint.agent.jvmargument>
-        <pinpoint.server.port>18080</pinpoint.server.port>
     </properties>
 
     <modules>
@@ -107,17 +105,13 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
                     <skip>${spring-boot-build-skip}</skip>
-                    <outputDirectory>${project.build.directory}/deploy</outputDirectory>
                     <executable>true</executable>
-                    <attach>false</attach>
-
-                    <finalName>${pinpoint.plugintest.executable.name}</finalName>
+                    <attach>${spring-boot-maven-plugin.attatch}</attach>
+                    <classifier>exec</classifier>
                     <jvmArguments>${pinpoint.agent.jvmargument}</jvmArguments>
                     <agents>${maven.multiModuleProjectDirectory}/agent/target/pinpoint-agent-${project.version}/pinpoint-bootstrap.jar</agents>
+
                     <commandlineArguments>
-                        --server.port=${pinpoint.server.port}
-                        --logging.level.root=info
-                        --springdoc.swagger-ui.path=/
                     </commandlineArguments>
 
                     <fork>true</fork>

diff --git a/agent-testweb/postgresql-plugin-testweb/src/main/resources/application.yml b/agent-testweb/postgresql-plugin-testweb/src/main/resources/application.yml
@@ -2,3 +2,11 @@
 
 server:
   port: 18080
+
+logging:
+  level:
+    root: info
+
+springdoc:
+  swagger-ui:
+    path: /
diff --git a/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/resources/application.yml b/agent-testweb/spring-data-r2dbc-plugin-testweb/src/main/resources/application.yml
@@ -2,3 +2,11 @@
 
 server:
   port: 18080
+
+logging:
+  level:
+    root: info
+
+springdoc:
+  swagger-ui:
+    path: /
diff --git a/pom.xml b/pom.xml
@@ -229,6 +229,8 @@
         <plugin.frontend.node.version>v16.17.1</plugin.frontend.node.version>
         <plugin.frontend.yarn.version>v1.22.19</plugin.frontend.yarn.version>
         <plugin.frontend.node.install.dir>/node_install/node-${plugin.frontend.node.version}</plugin.frontend.node.install.dir>
+
+        <spring-boot-maven-plugin.attatch>false</spring-boot-maven-plugin.attatch>
     </properties>
 
     <dependencies>
@@ -1696,6 +1698,7 @@
             <properties>
                 <env>local</env>
                 <spring.profiles.active>local</spring.profiles.active>
+                <spring-boot-maven-plugin.attatch>false</spring-boot-maven-plugin.attatch>
             </properties>
         </profile>
         <!-- for Release -->
@@ -1707,6 +1710,7 @@
             <properties>
                 <env>release</env>
                 <spring.profiles.active>release</spring.profiles.active>
+                <spring-boot-maven-plugin.attatch>true</spring-boot-maven-plugin.attatch>
             </properties>
         </profile>