From df146ab8ec64cd38e19e302e6d80aded13fb871a Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Tue, 22 Jul 2014 17:17:23 +0200
Subject: reworked assembly

---
 sonar-application/assembly.xml | 50 ++++++++++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 16 deletions(-)

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

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index bc4eed0b655..c897becdee0 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -7,17 +7,31 @@
   <includeBaseDirectory>true</includeBaseDirectory>
   <dependencySets>
     <!-- Libraries -->
+
     <dependencySet>
       <outputDirectory>lib</outputDirectory>
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <useTransitiveFiltering>false</useTransitiveFiltering>
+      <useProjectArtifact>true</useProjectArtifact>
+      <includes>
+        <include>org.codehaus.sonar:sonar-application</include>
+        <include>tanukisoft:wrapper</include>
+      </includes>
+    </dependencySet>
+
+
+    <dependencySet>
+      <outputDirectory>lib/common</outputDirectory>
       <useTransitiveFiltering>true</useTransitiveFiltering>
+      <useProjectArtifact>false</useProjectArtifact>
       <excludes>
         <exclude>mysql:mysql-connector-java</exclude>
         <exclude>org.postgresql:postgresql</exclude>
         <exclude>net.sourceforge.jtds:jtds</exclude>
         <exclude>tanukisoft:wrapper</exclude>
-        <exclude>org.codehaus.sonar:sonar-search</exclude>
-        <exclude>org.codehaus.sonar:sonar-process</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>
@@ -27,23 +41,27 @@
 
     <dependencySet>
       <outputDirectory>lib/search</outputDirectory>
+      <useProjectArtifact>false</useProjectArtifact>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
       <useTransitiveFiltering>true</useTransitiveFiltering>
-      <outputDirectory>lib</outputDirectory>
-      <useTransitiveFiltering>true</useTransitiveFiltering>
-      <excludes>
-        <exclude>mysql:mysql-connector-java</exclude>
-        <exclude>org.postgresql:postgresql</exclude>
-        <exclude>net.sourceforge.jtds:jtds</exclude>
-        <exclude>tanukisoft:wrapper</exclude>
-        <exclude>org.codehaus.sonar:sonar-search</exclude>
-        <exclude>org.codehaus.sonar:sonar-process</exclude>
-        <exclude>org.codehaus.sonar:sonar-web</exclude>
-        <exclude>org.codehaus.sonar.plugins:*</exclude>
-        <exclude>org.codehaus.sonar-plugins.java:*</exclude>
-        <exclude>org.codehaus.sonar:sonar-batch-maven-compat</exclude>
-      </excludes>
+      <includes>
+        <include>org.codehaus.sonar:sonar-search</include>
+      </includes>
+      <scope>runtime</scope>
+    </dependencySet>
 
+    <dependencySet>
+      <outputDirectory>lib/server</outputDirectory>
+      <useTransitiveDependencies>true</useTransitiveDependencies>
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <includes>
+        <include>org.codehaus.sonar:sonar-server-app</include>
+      </includes>
+      <scope>runtime</scope>
     </dependencySet>
+
+
+
     <dependencySet>
       <outputDirectory>lib/batch</outputDirectory>
       <useTransitiveDependencies>false</useTransitiveDependencies>
-- 
cgit v1.2.3