Directory extensions/jdbc-driver/oracle is missing

diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index d51c87576d4b3fe7ea185db89235bb07dd5ca59a..8503774565431ac53f0538e7f78aa7771860fa7a 100644 (file)
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -1,94 +1,101 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<assembly>\r
-  <id>distribution</id>\r
-  <formats>\r
-    <format>zip</format>\r
-  </formats>\r
-  <includeBaseDirectory>true</includeBaseDirectory>\r
-  <dependencySets>\r
-    <dependencySet>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>distribution</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
       <outputDirectory>lib</outputDirectory>
-      <useTransitiveFiltering>true</useTransitiveFiltering>\r
-      <excludes>\r
-        <exclude>org.codehaus.sonar:sonar-server</exclude>\r
-        <exclude>mysql:mysql-connector-java</exclude>\r
-        <exclude>org.apache.derby:derbyclient</exclude>\r
-        <exclude>postgresql:postgresql</exclude>\r
+      <useTransitiveFiltering>true</useTransitiveFiltering>
+      <excludes>
+        <exclude>org.codehaus.sonar:sonar-server</exclude>
+        <exclude>mysql:mysql-connector-java</exclude>
+        <exclude>org.apache.derby:derbyclient</exclude>
+        <exclude>postgresql:postgresql</exclude>
         <exclude>net.sourceforge.jtds:jtds</exclude>
         <exclude>org.codehaus.sonar.plugins:*</exclude>
-        <exclude>org.codehaus.sonar.runtime:*</exclude>\r
-      </excludes>\r
+        <exclude>org.codehaus.sonar.runtime:*</exclude>
+      </excludes>
     </dependencySet>
-    <dependencySet>\r
+    <dependencySet>
       <outputDirectory>lib/deprecated-maven-plugin</outputDirectory>
-      <useTransitiveDependencies>false</useTransitiveDependencies>\r
-      <includes>\r
-        <include>org.codehaus.sonar.runtime:sonar-core-maven-plugin</include>\r
-      </includes>\r
-    </dependencySet>\r
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.codehaus.sonar.runtime:sonar-core-maven-plugin</include>
+      </includes>
+    </dependencySet>
 
-    <dependencySet>\r
+    <dependencySet>
       <outputDirectory>lib/core-plugins</outputDirectory>
-      <useTransitiveDependencies>false</useTransitiveDependencies>\r
-      <includes>\r
-        <include>org.codehaus.sonar.plugins:*</include>\r
-      </includes>\r
-    </dependencySet>\r
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.codehaus.sonar.plugins:*</include>
+      </includes>
+    </dependencySet>
 
-    <dependencySet>\r
+    <dependencySet>
       <outputDirectory>lib/core-plugins</outputDirectory>
-      <useTransitiveDependencies>false</useTransitiveDependencies>\r
-      <includes>\r
-        <include>org.codehaus.sonar.plugins:*</include>\r
-      </includes>\r
-    </dependencySet>\r
-    <dependencySet>\r
-      <outputDirectory>war/sonar-server</outputDirectory>\r
-      <includes>\r
-        <include>org.codehaus.sonar:sonar-server</include>\r
-      </includes>\r
-      <unpack>true</unpack>\r
-    </dependencySet>\r
-    <dependencySet>\r
-      <outputDirectory>extensions/jdbc-driver/mysql/</outputDirectory>\r
-      <includes>\r
-        <include>mysql:mysql-connector-java</include>\r
-      </includes>\r
-      <unpack>false</unpack>\r
-      <scope>runtime</scope>\r
-    </dependencySet>\r
-    <dependencySet>\r
-      <outputDirectory>extensions/jdbc-driver/derby/</outputDirectory>\r
-      <includes>\r
-        <include>org.apache.derby:derbyclient</include>\r
-      </includes>\r
-      <unpack>false</unpack>\r
-      <scope>runtime</scope>\r
-    </dependencySet>\r
-    <dependencySet>\r
-      <outputDirectory>extensions/jdbc-driver/postgresql/</outputDirectory>\r
-      <includes>\r
-        <include>postgresql:postgresql</include>\r
-      </includes>\r
-      <unpack>false</unpack>\r
-      <scope>runtime</scope>\r
-    </dependencySet>\r
-    <dependencySet>\r
-      <outputDirectory>extensions/jdbc-driver/mssql/</outputDirectory>\r
-      <includes>\r
-        <include>net.sourceforge.jtds:jtds</include>\r
-      </includes>\r
-      <unpack>false</unpack>\r
-      <scope>runtime</scope>\r
-    </dependencySet>\r
-  </dependencySets>\r
-\r
-  <fileSets>\r
-    <fileSet>\r
-      <directory>${basedir}/src/main/assembly</directory>\r
-      <outputDirectory>/</outputDirectory>\r
-      <fileMode>0755</fileMode>\r
-      <directoryMode>0755</directoryMode>\r
-    </fileSet>\r
-  </fileSets>\r
-</assembly>\r
+      <useTransitiveDependencies>false</useTransitiveDependencies>
+      <includes>
+        <include>org.codehaus.sonar.plugins:*</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>war/sonar-server</outputDirectory>
+      <includes>
+        <include>org.codehaus.sonar:sonar-server</include>
+      </includes>
+      <unpack>true</unpack>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extensions/jdbc-driver/mysql/</outputDirectory>
+      <includes>
+        <include>mysql:mysql-connector-java</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extensions/jdbc-driver/derby/</outputDirectory>
+      <includes>
+        <include>org.apache.derby:derbyclient</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extensions/jdbc-driver/postgresql/</outputDirectory>
+      <includes>
+        <include>postgresql:postgresql</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>extensions/jdbc-driver/mssql/</outputDirectory>
+      <includes>
+        <include>net.sourceforge.jtds:jtds</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/assembly</directory>
+      <outputDirectory>/</outputDirectory>
+      <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/assembly/bin</directory>
+      <outputDirectory>extensions/jdbc-driver/oracle/</outputDirectory>
+      <excludes>
+        <exclude>**/*</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+</assembly>