diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-07-14 21:38:09 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2014-07-14 21:38:09 +0200 |
| commit | 0bfc9acc2ec2a6c584afac4ed8d9c27a993c37c8 (patch) | |
| tree | bf989d659c0d7a0328317972b90d898c7bc9b115 | |
| parent | 9a55c20b4fa5ea3082decc45614c79630f0b38e1 (diff) | |
| download | sonarqube-0bfc9acc2ec2a6c584afac4ed8d9c27a993c37c8.tar.gz sonarqube-0bfc9acc2ec2a6c584afac4ed8d9c27a993c37c8.zip | |
Fix location of sonar-application.jar
| -rw-r--r-- | sonar-application/assembly.xml | 2 | ||||
| -rw-r--r-- | sonar-application/src/main/assembly/conf/wrapper.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index 07c014cb7ad..bed1ebb79b4 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -8,7 +8,7 @@ <dependencySets> <!-- Libraries --> <dependencySet> - <outputDirectory>lib/server</outputDirectory> + <outputDirectory>lib</outputDirectory> <useTransitiveFiltering>true</useTransitiveFiltering> <excludes> <exclude>mysql:mysql-connector-java</exclude> diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf index b1c547f16e4..19be89188ed 100644 --- a/sonar-application/src/main/assembly/conf/wrapper.conf +++ b/sonar-application/src/main/assembly/conf/wrapper.conf @@ -31,7 +31,7 @@ wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp # Java Classpath (include wrapper.jar) Add class path elements as # needed starting from 1 -wrapper.java.classpath.1=../../lib/server/*.jar +wrapper.java.classpath.1=../../lib/*.jar wrapper.java.classpath.2=../../conf wrapper.java.classpath.3=../../extensions/jdbc-driver/mysql/*.jar wrapper.java.classpath.4=../../extensions/jdbc-driver/oracle/*.jar |