diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-07-24 21:50:19 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-07-24 21:50:19 +0200 |
| commit | f07a28f60ad0cc18f4e318109389032fb30bba06 (patch) | |
| tree | 0829512c5500ba10048ff7134cca1efe0d161a89 /sonar-application/assembly.xml | |
| parent | cde4bd7a61e5a9a8c27d115f07f53b691445d0ff (diff) | |
| download | sonarqube-f07a28f60ad0cc18f4e318109389032fb30bba06.tar.gz sonarqube-f07a28f60ad0cc18f4e318109389032fb30bba06.zip | |
SONAR-4898 move sonar-server-app to sonar-server
Diffstat (limited to 'sonar-application/assembly.xml')
| -rw-r--r-- | sonar-application/assembly.xml | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index 2304815d061..50553043ab1 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -38,8 +38,7 @@ <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-server</exclude> <exclude>org.codehaus.sonar:sonar-web</exclude> <exclude>org.codehaus.sonar:sonar-search</exclude> <exclude>org.codehaus.sonar.plugins:*</exclude> @@ -49,12 +48,24 @@ <scope>runtime</scope> </dependencySet> + <dependencySet> + <outputDirectory>lib/common</outputDirectory> + <useTransitiveFiltering>true</useTransitiveFiltering> + <useProjectArtifact>false</useProjectArtifact> + <includes> + <include>org.elasticsearch:elasticsearch</include> + </includes> + <scope>provided</scope> + </dependencySet> + + + <dependencySet> <outputDirectory>lib/search</outputDirectory> <useProjectArtifact>false</useProjectArtifact> <useTransitiveDependencies>true</useTransitiveDependencies> - <useTransitiveFiltering>true</useTransitiveFiltering> + <useTransitiveFiltering>false</useTransitiveFiltering> <includes> <include>org.codehaus.sonar:sonar-search</include> </includes> @@ -63,16 +74,16 @@ <dependencySet> <outputDirectory>lib/server</outputDirectory> + <useProjectArtifact>false</useProjectArtifact> <useTransitiveDependencies>true</useTransitiveDependencies> <useTransitiveFiltering>true</useTransitiveFiltering> <includes> - <include>org.codehaus.sonar:sonar-server-app</include> + <include>org.codehaus.sonar:sonar-server</include> </includes> <scope>provided</scope> </dependencySet> - <dependencySet> <outputDirectory>lib/batch</outputDirectory> <useTransitiveDependencies>false</useTransitiveDependencies> |