diff options
| -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 |