Enhanced assembly configuration

agent/pom.xml

@@ -29,10 +29,12 @@
         <dependency>
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-plugins</artifactId>
-            <type>pom</type>
+            <type>zip</type>
+            <scope>runtime</scope>
         </dependency>
 
 
+        <!-- for tests -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -43,8 +45,6 @@
             <artifactId>spring-context</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <!-- for tests -->
         <dependency>
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-test</artifactId>
@@ -92,7 +92,7 @@
                     <!-- AbstractPinpointPluginTestSuite needs this to resolve path of required jars -->
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
-            </plugin>        
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -114,27 +114,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <delete>
-                                    <!-- Delete plugins group pom file -->
-                                    <fileset dir="${project.build.directory}/${project.build.finalName}/plugin" includes="*.pom" />
-                                </delete>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>

agent/src/assembly/distribution.xml

@@ -4,17 +4,19 @@
   <id>pinpoint-naver-agent</id>
   <formats>
     <format>dir</format>
+    <format>zip</format>
+    <format>tar.gz</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
   
   <fileSets>
     <fileSet>
       <directory>${basedir}/src/main/resources</directory>
-      <outputDirectory>/</outputDirectory>
+      <outputDirectory></outputDirectory>
     </fileSet>
     <fileSet>
       <directory>${basedir}/src/main/script</directory>
-      <outputDirectory>/script</outputDirectory>
+      <outputDirectory>script</outputDirectory>
     </fileSet>
   </fileSets>
   
@@ -46,7 +48,7 @@
             <include>com.navercorp.pinpoint:pinpoint-plugins</include>
         </includes>
         <outputDirectory>plugin</outputDirectory>
-        <useTransitiveFiltering>true</useTransitiveFiltering>
+        <unpack>true</unpack>
     </dependencySet>
   </dependencySets>
 </assembly>

plugins/.gitignore

@@ -1,3 +1,4 @@
 /.settings/
 /.project
 /*.iml
+/target/

plugins/assembly.xml

@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+
+  <id>plugins</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

plugins/pom.xml

@@ -52,4 +52,29 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.3</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>assembly.xml</descriptor>
+                    </descriptors>
+                    <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>create-zip</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

pom.xml

@@ -141,6 +141,12 @@
                 <type>pom</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.navercorp.pinpoint</groupId>
+                <artifactId>pinpoint-plugins</artifactId>
+                <type>zip</type>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.navercorp.pinpoint</groupId>
                 <artifactId>pinpoint-test</artifactId>