From d1d34cae1c0a3e7c33ca3e5a555c228f24e09e3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=91=E6=88=9F?= <jinji.lf@alibaba-inc.com>
Date: Mon, 20 Jul 2020 20:29:50 +0800
Subject: [PATCH] let agent be resource of core jar

---
 agent/pom.xml |  1 +
 core/pom.xml  | 32 +++++++++++++++++++++++++++-----
 pom.xml       |  2 +-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/agent/pom.xml b/agent/pom.xml
index 11c745a..10c6a02 100755
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -17,6 +17,7 @@
   </dependencies>
 
   <build>
+    <finalName>${artifactId}</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 644a5e9..18f791b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -12,8 +12,7 @@
 
     <properties>
         <plugin.compiler.version>3.8.1</plugin.compiler.version>
-        <plugin.surefire.version>3.0.0-M4</plugin.surefire.version>
-
+        <plugin.resources.version>3.1.0</plugin.resources.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.compiler.level>1.7</project.compiler.level>
     </properties>
@@ -41,11 +40,34 @@
                     <compilerArgument>-proc:none</compilerArgument>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${plugin.surefire.version}</version>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${plugin.resources.version}</version>
+                <configuration>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>copy-testable-agent-resources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <encoding>utf-8</encoding>
+                            <outputDirectory>${basedir}/target/classes</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/../agent/target</directory>
+                                    <includes>
+                                        <include>testable-agent.jar</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index 36b265c..09fbd31 100755
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>core</module>
     <module>agent</module>
+    <module>core</module>
   </modules>
 
 </project>