From 3ef2a7311179e438b31215a8e50494f3b0bff2b4 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Wed, 9 Feb 2011 09:33:58 +0000
Subject: [PATCH] Sonar runner: move assembly sources in src/main/assembly

---
 src/main/assembly/assembly.xml => assembly.xml       | 6 +++---
 pom.xml                                              | 2 +-
 src/{ => main/assembly}/bin/sonar-runner             | 0
 src/{ => main/assembly}/bin/sonar-runner.bat         | 0
 src/{ => main/assembly}/conf/sonar-runner.properties | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/main/assembly/assembly.xml => assembly.xml (86%)
 rename src/{ => main/assembly}/bin/sonar-runner (100%)
 rename src/{ => main/assembly}/bin/sonar-runner.bat (100%)
 rename src/{ => main/assembly}/conf/sonar-runner.properties (100%)

diff --git a/src/main/assembly/assembly.xml b/assembly.xml
similarity index 86%
rename from src/main/assembly/assembly.xml
rename to assembly.xml
index 0419764..b451abb 100644
--- a/src/main/assembly/assembly.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 6967359..bc2f33a 100644
--- a/pom.xml
+++ b/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>
diff --git a/src/bin/sonar-runner b/src/main/assembly/bin/sonar-runner
similarity index 100%
rename from src/bin/sonar-runner
rename to src/main/assembly/bin/sonar-runner
diff --git a/src/bin/sonar-runner.bat b/src/main/assembly/bin/sonar-runner.bat
similarity index 100%
rename from src/bin/sonar-runner.bat
rename to src/main/assembly/bin/sonar-runner.bat
diff --git a/src/conf/sonar-runner.properties b/src/main/assembly/conf/sonar-runner.properties
similarity index 100%
rename from src/conf/sonar-runner.properties
rename to src/main/assembly/conf/sonar-runner.properties
-- 
2.39.5