diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-09-17 15:36:51 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2015-09-17 15:36:51 +0200 |
| commit | 20d34c482023e2fedc45f6917c67d372cbcbda0f (patch) | |
| tree | caf2b1a793e04cac73698368aabd3f37986d3a80 /sonar-application/assembly.xml | |
| parent | 530478f620406f535bd3055f88fab4edaa7da1c5 (diff) | |
| download | sonarqube-20d34c482023e2fedc45f6917c67d372cbcbda0f.tar.gz sonarqube-20d34c482023e2fedc45f6917c67d372cbcbda0f.zip | |
SONAR-6552 fix bad merge
- fix ruby activerecord adapter
- do not package jtds.jar
Diffstat (limited to 'sonar-application/assembly.xml')
| -rw-r--r-- | sonar-application/assembly.xml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index 932f86ea1e5..5fb7b1b236f 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -114,14 +114,6 @@ <scope>provided</scope> </dependencySet> <dependencySet> - <outputDirectory>lib/jdbc/jtds/</outputDirectory> - <includes> - <include>net.sourceforge.jtds:jtds</include> - </includes> - <unpack>false</unpack> - <scope>provided</scope> - </dependencySet> - <dependencySet> <outputDirectory>lib/jdbc/h2/</outputDirectory> <includes> <include>com.h2database:h2</include> |