From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Sun, 17 May 2015 13:29:54 +0000 (+0200)
Subject: SONAR-6517 do not package the xml libs provided by Java 1.7+
X-Git-Tag: 5.2-RC1~1918
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7f852552da74db8c2b15d56c55d0b9faff720479;p=sonarqube.git

SONAR-6517 do not package the xml libs provided by Java 1.7+

xml-apis.jar and stax-api.jar do not need to be packaged into distribution nor to be defined as dependencies of sonar-plugin-api.
---

diff --git a/pom.xml b/pom.xml
index 2a59429c32d..20ac8d90088 100644
--- a/pom.xml
+++ b/pom.xml
@@ -835,6 +835,13 @@
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-annotations</artifactId>
         <version>3.4.0.GA</version>
+        <exclusions>
+          <exclusion>
+            <!-- provided by Java 1.7 -->
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
@@ -941,6 +948,13 @@
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>woodstox-core-lgpl</artifactId>
         <version>4.4.0</version>
+        <exclusions>
+          <exclusion>
+            <!-- provided by Java 1.7 -->
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.staxmate</groupId>
diff --git a/server/sonar-server/pom.xml b/server/sonar-server/pom.xml
index 060f744bfa1..41ea17e5ab8 100644
--- a/server/sonar-server/pom.xml
+++ b/server/sonar-server/pom.xml
@@ -59,6 +59,13 @@
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
       <version>1.6.1</version>
+      <exclusions>
+        <exclusion>
+          <!-- provided by Java 1.7 -->
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>