From 4b1fa89878c8c3c6b60f0e3d7790c310428952fa Mon Sep 17 00:00:00 2001
From: hengyunabc <hengyunabc@gmail.com>
Date: Fri, 14 Sep 2018 18:30:31 +0800
Subject: [PATCH] fix install-local.sh do not set ARTHAS_VERSION problem

---
 agent/pom.xml                                |  2 +-
 bin/install-local.sh                         |  3 +--
 client/pom.xml                               |  2 +-
 core/pom.xml                                 |  2 +-
 packaging/src/main/assembly/assembly-doc.xml |  1 -
 packaging/src/main/assembly/assembly.xml     |  8 +-------
 pom.xml                                      | 20 +++++++++++++++-----
 7 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/agent/pom.xml b/agent/pom.xml
index 155ec99d4..e8689e7a9 100644
--- a/agent/pom.xml
+++ b/agent/pom.xml
@@ -42,7 +42,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                         <phase>package</phase>
                         <configuration>
diff --git a/bin/install-local.sh b/bin/install-local.sh
index 0d709abcf..b43fe8528 100644
--- a/bin/install-local.sh
+++ b/bin/install-local.sh
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 # define newset arthas's version
-# need ../arthas-packages.sh replace the version number
-ARTHAS_VERSION=0.0
+ARTHAS_VERSION=${project.version}
 
 # define newset arthas lib home
 ARTHAS_LIB_HOME=${HOME}/.arthas/lib/${ARTHAS_VERSION}/arthas
diff --git a/client/pom.xml b/client/pom.xml
index e0b9ba6bd..b0f4d7e7b 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -29,7 +29,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                         <phase>package</phase>
                         <configuration>
diff --git a/core/pom.xml b/core/pom.xml
index edcaf07aa..941ab1159 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -36,7 +36,7 @@
                 <executions>
                     <execution>
                         <goals>
-                            <goal>attached</goal>
+                            <goal>single</goal>
                         </goals>
                         <phase>package</phase>
                         <configuration>
diff --git a/packaging/src/main/assembly/assembly-doc.xml b/packaging/src/main/assembly/assembly-doc.xml
index a5865f915..cc167dcd3 100644
--- a/packaging/src/main/assembly/assembly-doc.xml
+++ b/packaging/src/main/assembly/assembly-doc.xml
@@ -10,7 +10,6 @@
   <fileSets>
     <fileSet>
       <directory>../site/target/site/sphinx/</directory>
-      <outputDirectory>/doc</outputDirectory>
       <includes>
         <include>**/*</include>
       </includes>
diff --git a/packaging/src/main/assembly/assembly.xml b/packaging/src/main/assembly/assembly.xml
index e115d6fe6..2d6079841 100644
--- a/packaging/src/main/assembly/assembly.xml
+++ b/packaging/src/main/assembly/assembly.xml
@@ -10,38 +10,32 @@
   <files>
     <file>
       <source>../spy/target/arthas-spy.jar</source>
-      <outputDirectory>/</outputDirectory>
       <destName>arthas-spy.jar</destName>
     </file>
     <file>
       <source>../core/target/arthas-core-jar-with-dependencies.jar</source>
-      <outputDirectory>/</outputDirectory>
       <destName>arthas-core.jar</destName>
     </file>
     <file>
       <source>../agent/target/arthas-agent-jar-with-dependencies.jar</source>
-      <outputDirectory>/</outputDirectory>
       <destName>arthas-agent.jar</destName>
     </file>
     <file>
       <source>../client/target/arthas-client-jar-with-dependencies.jar</source>
-      <outputDirectory>/</outputDirectory>
       <destName>arthas-client.jar</destName>
     </file>
 
     <file>
       <source>../bin/install-local.sh</source>
-      <outputDirectory>/</outputDirectory>
       <fileMode>0755</fileMode>
+      <filtered>true</filtered>
     </file>
     <file>
       <source>../bin/as.sh </source>
-      <outputDirectory>/</outputDirectory>
       <fileMode>0755</fileMode>
     </file>
     <file>
       <source>../bin/as.bat</source>
-      <outputDirectory>/</outputDirectory>
     </file>
   </files>
 </assembly>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0c49e7f9d..4238dccd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,12 +174,22 @@
     </dependencyManagement>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>