Append classifier to basedir (#27)

diff --git a/it/pom.xml b/it/pom.xml
index f84b78c5dcb9794fbba1161f5d02316905b8d14c..ea1dfac2883ebb18e3c6ec0d2ba4ad5c7763140e 100644 (file)
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator</artifactId>
-      <version>3.15.0.974</version>
+      <version>3.15.0.979</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/src/main/assembly/dist-linux.xml b/src/main/assembly/dist-linux.xml
index d4d192392c6bb9a0b90925171e6168d4c89a67f3..f24416a1e3c52ae0895106687dd37fcf93640a0c 100644 (file)
--- a/src/main/assembly/dist-linux.xml
+++ b/src/main/assembly/dist-linux.xml
@@ -4,7 +4,7 @@
   <formats>
     <format>zip</format>
   </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
+  <baseDirectory>sonar-scanner-${project.version}-linux</baseDirectory>
   <fileSets>
 
     <!-- jre basic, except bin/ -->

diff --git a/src/main/assembly/dist-macosx.xml b/src/main/assembly/dist-macosx.xml
index 65ad78e2fe334ac8a685a1061605581fb0580d24..1babd6ac5a68e70ae9872e65bf9f8d6b34950894 100644 (file)
--- a/src/main/assembly/dist-macosx.xml
+++ b/src/main/assembly/dist-macosx.xml
@@ -4,7 +4,7 @@
   <formats>
     <format>zip</format>
   </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
+  <baseDirectory>sonar-scanner-${project.version}-macosx</baseDirectory>
   <fileSets>
 
     <!-- jre basic, except bin/ -->

diff --git a/src/main/assembly/dist-windows.xml b/src/main/assembly/dist-windows.xml
index 132859bdf1a21b4859ad46e1e1eb644e1fb5093b..c65c2e441ad5727079c4b65a55c530aa6bac465f 100644 (file)
--- a/src/main/assembly/dist-windows.xml
+++ b/src/main/assembly/dist-windows.xml
@@ -4,7 +4,7 @@
   <formats>
     <format>zip</format>
   </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
+  <baseDirectory>sonar-scanner-${project.version}-windows</baseDirectory>
   <fileSets>
 
     <!-- jre basic, except bin/ -->