aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Mandrikov <mandrikov@gmail.com>2011-03-04 03:06:39 +0300
committerEvgeny Mandrikov <mandrikov@gmail.com>2011-03-04 20:25:06 +0300
commit85bd7105cecbb907ae1301141fdce92e83e2cf2a (patch)
tree72e69db591e3290e40a0f8c60fed5e08125c2ae6
parent257f4eaf740749bc67f572cf70e053cf112bb9fd (diff)
downloadsonarqube-85bd7105cecbb907ae1301141fdce92e83e2cf2a.tar.gz
sonarqube-85bd7105cecbb907ae1301141fdce92e83e2cf2a.zip
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.
-rw-r--r--sonar-core/pom.xml4
-rw-r--r--sonar-plugin-api/pom.xml38
2 files changed, 14 insertions, 28 deletions
diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index e6d78538092..e612ef345f5 100644
--- 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 4056cff7740..084ca5494d4 100644
--- 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