Sonar runner: move assembly sources in src/main/assembly

src/main/assembly/assembly.xml → assembly.xml

@@ -15,7 +15,7 @@
   </dependencySets>
   <fileSets>
     <fileSet>
-      <directory>src/bin</directory>
+      <directory>src/main/assembly/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <includes>
         <include>sonar-runner.bat</include>
@@ -23,7 +23,7 @@
       <lineEnding>dos</lineEnding>
     </fileSet>
     <fileSet>
-      <directory>src/bin</directory>
+      <directory>src/main/assembly/bin</directory>
       <outputDirectory>bin</outputDirectory>
       <includes>
         <include>sonar-runner</include>
@@ -32,7 +32,7 @@
       <fileMode>0755</fileMode>
     </fileSet>
     <fileSet>
-      <directory>src/conf</directory>
+      <directory>src/main/assembly/conf</directory>
       <outputDirectory>conf</outputDirectory>
       <fileMode>0644</fileMode>
     </fileSet>

pom.xml

@@ -104,7 +104,7 @@
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptors>
-                <descriptor>${basedir}/src/main/assembly/assembly.xml</descriptor>
+                <descriptor>${basedir}/assembly.xml</descriptor>
               </descriptors>
             </configuration>
           </execution>