From 7287de7b4b608170ed6f30b4fe1527ca0af95cbe Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Wed, 23 Jul 2014 16:29:16 +0200
Subject: SONAR-4898 - Shaded sonar-application. Now app can run with "java
 -jar lib/sonar*.jar

---
 sonar-application/assembly.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'sonar-application/assembly.xml')

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index e0166150ec8..2304815d061 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -25,6 +25,7 @@
       <includes>
         <include>tanukisoft:wrapper</include>
       </includes>
+      <scope>provided</scope>
     </dependencySet>
 
 
@@ -37,13 +38,15 @@
         <exclude>org.postgresql:postgresql</exclude>
         <exclude>net.sourceforge.jtds:jtds</exclude>
         <exclude>tanukisoft:wrapper</exclude>
+        <exclude>tanukisoft:wrapper</exclude>
         <exclude>org.codehaus.sonar:sonar-server-app</exclude>
         <exclude>org.codehaus.sonar:sonar-web</exclude>
         <exclude>org.codehaus.sonar:sonar-search</exclude>
         <exclude>org.codehaus.sonar.plugins:*</exclude>
         <exclude>org.codehaus.sonar-plugins.java:*</exclude>
-        <exclude>org.codehaus.sonar:sonar-batch-maven-compat</exclude>
+        <exclude>org.sonatype.jsw-binaries:jsw-binaries</exclude>
       </excludes>
+      <scope>runtime</scope>
     </dependencySet>
 
 
@@ -55,7 +58,7 @@
       <includes>
         <include>org.codehaus.sonar:sonar-search</include>
       </includes>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependencySet>
 
     <dependencySet>
@@ -65,7 +68,7 @@
       <includes>
         <include>org.codehaus.sonar:sonar-server-app</include>
       </includes>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependencySet>
 
 
@@ -76,6 +79,7 @@
       <includes>
         <include>org.codehaus.sonar:sonar-batch-maven-compat</include>
       </includes>
+      <scope>provided</scope>
     </dependencySet>
     <!-- Plugins -->
     <dependencySet>
@@ -84,6 +88,7 @@
       <includes>
         <include>org.codehaus.sonar.plugins:*</include>
       </includes>
+      <scope>provided</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>lib/bundled-plugins</outputDirectory>
@@ -91,6 +96,7 @@
       <includes>
         <include>org.codehaus.sonar-plugins.*:sonar-*-plugin</include>
       </includes>
+      <scope>provided</scope>
     </dependencySet>
     <!-- Server -->
     <dependencySet>
@@ -99,6 +105,7 @@
         <include>org.codehaus.sonar:sonar-web</include>
       </includes>
       <unpack>true</unpack>
+      <scope>provided</scope>
     </dependencySet>
     <!-- JDBC drivers -->
     <dependencySet>
@@ -107,7 +114,7 @@
         <include>mysql:mysql-connector-java</include>
       </includes>
       <unpack>false</unpack>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>extensions/jdbc-driver/postgresql/</outputDirectory>
@@ -115,7 +122,7 @@
         <include>org.postgresql:postgresql</include>
       </includes>
       <unpack>false</unpack>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependencySet>
     <dependencySet>
       <outputDirectory>extensions/jdbc-driver/mssql/</outputDirectory>
@@ -123,7 +130,7 @@
         <include>net.sourceforge.jtds:jtds</include>
       </includes>
       <unpack>false</unpack>
-      <scope>runtime</scope>
+      <scope>provided</scope>
     </dependencySet>
     <!-- Java Service Wrapper -->
     <dependencySet>
-- 
cgit v1.2.3