=== modified file 'dhis-2/dhis-services/dhis-service-options/pom.xml'
--- dhis-2/dhis-services/dhis-service-options/pom.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-options/pom.xml	2010-04-27 15:04:10 +0000
@@ -5,7 +5,7 @@
   
   <parent>
     <groupId>org.hisp.dhis</groupId>
-    <artifactId>dhis</artifactId>
+    <artifactId>dhis-services</artifactId>
     <version>2.0.5-SNAPSHOT</version>
   </parent>
   
@@ -25,10 +25,6 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-support-test</artifactId>
-    </dependency>
     	  
   </dependencies>
   <properties>

=== modified file 'dhis-2/dhis-services/dhis-service-patient/pom.xml'
--- dhis-2/dhis-services/dhis-service-patient/pom.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-patient/pom.xml	2010-04-27 15:04:10 +0000
@@ -26,21 +26,6 @@
       <artifactId>dhis-service-core</artifactId>
     </dependency>
     
-    <!-- Other -->
-    
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-    </dependency>
-    
   </dependencies>
   <properties>
     <rootDir>../../</rootDir>

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/pom.xml'
--- dhis-2/dhis-services/dhis-service-reporting/pom.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/pom.xml	2010-04-27 15:04:10 +0000
@@ -53,10 +53,6 @@
       <artifactId>jxl</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-math</groupId>
       <artifactId>commons-math</artifactId>
     </dependency>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml	2010-04-21 19:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml	2010-04-27 15:04:10 +0000
@@ -42,6 +42,9 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-administration</artifactId>
     </dependency>
+	
+	<!-- Other -->
+	
     <dependency>
       <groupId>com.lowagie</groupId>
       <artifactId>itext</artifactId>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml	2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml	2010-04-27 15:04:10 +0000
@@ -31,10 +31,6 @@
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-commons</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml	2010-04-08 16:55:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml	2010-04-27 15:04:10 +0000
@@ -25,9 +25,13 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-api</artifactId>
     </dependency>      
-	  <dependency>
+	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-patient</artifactId>	 
+    </dependency>    
+    <dependency>
+      <groupId>org.hisp.dhis</groupId>
+      <artifactId>dhis-service-core</artifactId>  
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>