diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2014-04-03 22:07:04 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2014-04-03 22:07:04 +0200 |
| commit | 469975855667211c189655a61c99d0d81cd8b243 (patch) | |
| tree | 76634ef5e4869f39665b8584301fc7767ba52235 | |
| parent | 08c0337eda8c259dc95e413d951dffe4f32fa667 (diff) | |
| download | sonarqube-469975855667211c189655a61c99d0d81cd8b243.tar.gz sonarqube-469975855667211c189655a61c99d0d81cd8b243.zip | |
SONAR-5117 Upgrade to Tomcat 7.0.52
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | sonar-server/pom.xml | 11 |
2 files changed, 13 insertions, 2 deletions
@@ -76,7 +76,7 @@ <jetty.version>8.1.12.v20130726</jetty.version> <logback.version>1.0.13</logback.version> <slf4j.version>1.7.5</slf4j.version> - <tomcat.version>7.0.42</tomcat.version> + <tomcat.version>7.0.53</tomcat.version> <elasticsearch.version>0.90.9</elasticsearch.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.min.version>3.0.5</maven.min.version> @@ -1034,7 +1034,7 @@ <dependency> <groupId>org.skyscreamer</groupId> <artifactId>jsonassert</artifactId> - <version>1.2.2</version> + <version>1.2.3</version> </dependency> <dependency> <groupId>junit</groupId> diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml index f1e00cd756c..b5a47bdeb16 100644 --- a/sonar-server/pom.xml +++ b/sonar-server/pom.xml @@ -45,6 +45,16 @@ <dependency> <groupId>org.codehaus.sonar</groupId> <artifactId>sonar-core</artifactId> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -133,6 +143,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>commons-dbcp</groupId> |