From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Thu, 3 Apr 2014 20:07:04 +0000 (+0200)
Subject: SONAR-5117 Upgrade to Tomcat 7.0.52
X-Git-Tag: 4.3~141
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=469975855667211c189655a61c99d0d81cd8b243;p=sonarqube.git

SONAR-5117 Upgrade to Tomcat 7.0.52
---

diff --git a/pom.xml b/pom.xml
index d7a92dcf1de..c67a8562e8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>