From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Fri, 4 Apr 2014 09:23:03 +0000 (+0200)
Subject: Revert "SONAR-5117 fix compatibility of build with maven 3.0.x"
X-Git-Tag: 4.3~133
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ffa67599a95c7cf1cb9540eef10eba4252ef2b4e;p=sonarqube.git

Revert "SONAR-5117 fix compatibility of build with maven 3.0.x"

This reverts commit 514b752d87d4918cee373d8dd9c6ad1a3bfd183b.
---

diff --git a/sonar-server/pom.xml b/sonar-server/pom.xml
index 9563421b4e1..b5a47bdeb16 100644
--- a/sonar-server/pom.xml
+++ b/sonar-server/pom.xml
@@ -175,34 +175,7 @@
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
-      <!--
-       bug of maven 3.0.x (maybe 3.1). Fixed in 3.2
-       Scope of transitive dependencies of sonar-core:test-jar is "compile"
-       but should be "test"
-      -->
-      <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>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
@@ -384,9 +357,7 @@
     <profile>
       <id>js-tests</id>
       <activation>
-        <property>
-          <name>!skipTests</name>
-        </property>
+        <property><name>!skipTests</name></property>
       </activation>
       <build>
         <plugins>