diff options
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/assembly.xml | 5 | ||||
| -rw-r--r-- | sonar-application/pom.xml | 9 | ||||
| -rw-r--r-- | sonar-application/src/main/assembly/conf/wrapper.conf | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml index 8010c915144..07c014cb7ad 100644 --- a/sonar-application/assembly.xml +++ b/sonar-application/assembly.xml @@ -8,10 +8,9 @@ <dependencySets> <!-- Libraries --> <dependencySet> - <outputDirectory>lib</outputDirectory> + <outputDirectory>lib/server</outputDirectory> <useTransitiveFiltering>true</useTransitiveFiltering> <excludes> - <exclude>org.codehaus.sonar:sonar-server</exclude> <exclude>mysql:mysql-connector-java</exclude> <exclude>postgresql:postgresql</exclude> <exclude>net.sourceforge.jtds:jtds</exclude> @@ -46,7 +45,7 @@ <dependencySet> <outputDirectory>web</outputDirectory> <includes> - <include>org.codehaus.sonar:sonar-server</include> + <include>org.codehaus.sonar:sonar-web</include> </includes> <unpack>true</unpack> </dependencySet> diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 049eb5aa3a6..6d402ab02b5 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -79,6 +79,11 @@ <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-server</artifactId> <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.sonar</groupId> + <artifactId>sonar-web</artifactId> + <version>${project.version}</version> <type>war</type> </dependency> <dependency> @@ -264,8 +269,8 @@ <configuration> <rules> <requireFilesSize> - <minsize>80000000</minsize> - <maxsize>90000000</maxsize> + <minsize>85000000</minsize> + <maxsize>95000000</maxsize> <files> <file>${project.build.directory}/sonarqube-${project.version}.zip</file> </files> diff --git a/sonar-application/src/main/assembly/conf/wrapper.conf b/sonar-application/src/main/assembly/conf/wrapper.conf index 19be89188ed..b1c547f16e4 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/*.jar +wrapper.java.classpath.1=../../lib/server/*.jar wrapper.java.classpath.2=../../conf wrapper.java.classpath.3=../../extensions/jdbc-driver/mysql/*.jar wrapper.java.classpath.4=../../extensions/jdbc-driver/oracle/*.jar |