SONAR-2257 Cleanup sonar-plugin-api dependencies

Remove dependency on commons-dbcp, picocontainer and some hibernate dependencies.
We can't remove hibernate-annotations for the moment, because it's used, however
should be removed in future.

diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index e6d785380920a0937c733551595032eeae1e3caa..e612ef345f5b272d4fd7f1186542735bb36bc493 100644 (file)
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -61,6 +61,10 @@
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-ehcache</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml
index 4056cff774045fe9f84050abfd89ee511bd700fb..084ca5494d40b034d4c9cd4b4047abcbbc2a5184 100644 (file)
--- a/sonar-plugin-api/pom.xml
+++ b/sonar-plugin-api/pom.xml
@@ -59,42 +59,24 @@
       <artifactId>sonar-squid</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-    </dependency>
+    <!-- TODO we can't remove hibernate-annotations, because currently it's used
+    moreover it contains transitive dependency on dom4j, which is used in some plugins
+    -->
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.hibernate</groupId>
+          <artifactId>hibernate-core</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-commons-annotations</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-ehcache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>geronimo-spec</groupId>
-      <artifactId>geronimo-spec-jta</artifactId>
-    </dependency>
+
     <dependency>
       <groupId>com.google.collections</groupId>
       <artifactId>google-collections</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.picocontainer</groupId>
-      <artifactId>picocontainer</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-dbcp</groupId>
-      <artifactId>commons-dbcp</artifactId>
-    </dependency>
 
     <!-- TODO remove dependencies on Maven
     but for now they should be defined with scope provided