aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--assembly.xml (renamed from src/main/assembly/assembly.xml)6
-rw-r--r--pom.xml2
-rwxr-xr-xsrc/main/assembly/bin/sonar-runner (renamed from src/bin/sonar-runner)0
-rw-r--r--src/main/assembly/bin/sonar-runner.bat (renamed from src/bin/sonar-runner.bat)0
-rw-r--r--src/main/assembly/conf/sonar-runner.properties (renamed from src/conf/sonar-runner.properties)0
5 files changed, 4 insertions, 4 deletions
diff --git a/src/main/assembly/assembly.xml b/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
index af95fd5..af95fd5 100755
--- a/src/bin/sonar-runner
+++ b/src/main/assembly/bin/sonar-runner
diff --git a/src/bin/sonar-runner.bat b/src/main/assembly/bin/sonar-runner.bat
index 45bca45..45bca45 100644
--- a/src/bin/sonar-runner.bat
+++ b/src/main/assembly/bin/sonar-runner.bat
diff --git a/src/conf/sonar-runner.properties b/src/main/assembly/conf/sonar-runner.properties
index 5f01622..5f01622 100644
--- a/src/conf/sonar-runner.properties
+++ b/src/main/assembly/conf/sonar-runner.properties