dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 29
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-03-10 08:42:12 +0100
message:
  Conformed the dependency versions in the Indian modules.
modified:
  dhis-2/pom.xml
  local/in/dhis-web-dashboard/pom.xml
  local/in/dhis-web-reports-national/pom.xml
  local/in/dhis-web-validationrule/pom.xml

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2009-03-09 14:06:58 +0000
+++ dhis-2/pom.xml	2009-03-10 07:42:12 +0000
@@ -220,6 +220,11 @@
       </dependency>
       <dependency>
         <groupId>org.hisp.dhis</groupId>
+        <artifactId>dhis-service-aggregationengine-default</artifactId>
+        <version>${version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.hisp.dhis</groupId>
         <artifactId>dhis-service-jdbc</artifactId>
         <version>${version}</version>
       </dependency>

=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml	2009-03-10 06:15:33 +0000
+++ local/in/dhis-web-dashboard/pom.xml	2009-03-10 07:42:12 +0000
@@ -33,13 +33,6 @@
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-organisationunit</artifactId>
     </dependency>
-<!--	  
-    <dependency>
-      <groupId>org.hisp.dhis</groupId>
-      <artifactId>dhis-service-target</artifactId>
-	   <version>${version}</version>	
-    </dependency>
--->
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-commons</artifactId>
@@ -52,7 +45,6 @@
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	<version>${version}</version>
     </dependency>
     <dependency>
       <groupId>org.hisp.dhis</groupId>
@@ -98,7 +90,7 @@
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
     </dependency>
-    <dependency>
+   <dependency>
       <groupId>net.sourceforge.jexcelapi</groupId>
       <artifactId>jxl</artifactId>
     </dependency>

=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml	2009-03-10 06:15:33 +0000
+++ local/in/dhis-web-reports-national/pom.xml	2009-03-10 07:42:12 +0000
@@ -15,24 +15,6 @@
   
   <build>
     <finalName>dhis-web-reports</finalName>
-	<plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.0.2</version>
-        <configuration>
-          <archiveClasses>true</archiveClasses>
-          <dependentWarExcludes>**/web.xml,index.html</dependentWarExcludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <configuration>
-          <contextPath>/</contextPath>
-        </configuration>
-      </plugin>
-    </plugins>
   </build>
   
   <dependencies>
@@ -67,14 +49,11 @@
 	<dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	<version>${version}</version>
+    </dependency>	  
+    <dependency>
+      <groupId>net.sourceforge.jexcelapi</groupId>
+      <artifactId>jxl</artifactId>
     </dependency>
-	  
-    <dependency>
-      <groupId>jexcelapi</groupId>
- 	  <artifactId>jxl</artifactId>
-	  <version>2.6</version>	 	  
- 	</dependency>
     
 	<!-- Web -->
     
@@ -89,10 +68,5 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring</artifactId>
     </dependency>
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>5.0.4</version>
-    </dependency>
   </dependencies>	  
 </project>

=== modified file 'local/in/dhis-web-validationrule/pom.xml'
--- local/in/dhis-web-validationrule/pom.xml	2009-03-10 06:15:33 +0000
+++ local/in/dhis-web-validationrule/pom.xml	2009-03-10 07:42:12 +0000
@@ -56,7 +56,6 @@
      <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-service-aggregationengine-default</artifactId>
-	<version>${version}</version>
     </dependency>
   
     



--

https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.