From fda0f8a7d4f972bff8276e5e7b543b67b0b143d8 Mon Sep 17 00:00:00 2001
From: Oscar Gonzalez Fernandez <ogfernandez@gmail.com>
Date: Wed, 30 Apr 2014 20:05:54 +0200
Subject: [PATCH] Remove dependencies already present in business

If the dependency is already present in business, no need to declare
it in webapp, since webapp depends on business.
---
 libreplan-webapp/pom.xml | 45 ++++++++++++----------------------------
 pom.xml                  |  6 +++---
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/libreplan-webapp/pom.xml b/libreplan-webapp/pom.xml
index e3cf8b5dc..6069bcb73 100644
--- a/libreplan-webapp/pom.xml
+++ b/libreplan-webapp/pom.xml
@@ -302,21 +302,7 @@
           <groupId>com.igalia.java.zk.components</groupId>
           <artifactId>customdetailrowcomponent</artifactId>
         </dependency>
-        <!-- Gettext commons -->
-        <dependency>
-            <groupId>org.xnap.commons</groupId>
-            <artifactId>gettext-commons</artifactId>
-        </dependency>
-        <!-- JDBC driver -->
-        <dependency>
-            <groupId>${jdbcDriver.groupId}</groupId>
-            <artifactId>${jdbcDriver.artifactId}</artifactId>
-        </dependency>
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
+
         <dependency>
           <groupId>org.springframework</groupId>
           <artifactId>spring-web</artifactId>
@@ -334,14 +320,7 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-ldap</artifactId>
          </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-        </dependency>
+
         <!--  Spring security -->
         <dependency>
             <groupId>org.springframework.security</groupId>
@@ -398,24 +377,26 @@
             <groupId>org.libreplan</groupId>
             <artifactId>libreplan-business</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <!-- datasource for testing -->
-        <dependency>
-           <groupId>com.jolbox</groupId>
-           <artifactId>bonecp</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 01232c277..285d3553b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -380,9 +380,9 @@
                 <classifier>jdk15</classifier>
             </dependency>
             <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.2</version>
+                 <groupId>commons-collections</groupId>
+                 <artifactId>commons-collections</artifactId>
+                 <version>3.2</version>
             </dependency>
             <dependency>
                 <groupId>net.sf.ezmorph</groupId>