dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01437
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 439: Cleaned up pom files in indian modules.
------------------------------------------------------------
revno: 439
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Wed 2009-07-08 12:51:52 +0200
message:
Cleaned up pom files in indian modules.
modified:
local/in/dhis-web-dashboard/pom.xml
local/in/dhis-web-dataentry-linelisting/pom.xml
local/in/dhis-web-excelimport/pom.xml
local/in/dhis-web-leprosy/pom.xml
local/in/dhis-web-mobile/pom.xml
local/in/dhis-web-reports-national/pom.xml
local/in/dhis-web-validationrule-in/pom.xml
local/in/pom.xml
=== modified file 'local/in/dhis-web-dashboard/pom.xml'
--- local/in/dhis-web-dashboard/pom.xml 2009-07-08 09:58:18 +0000
+++ local/in/dhis-web-dashboard/pom.xml 2009-07-08 10:51:52 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dashboard</artifactId>
@@ -23,6 +23,16 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons-resources</artifactId>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-api</artifactId>
</dependency>
<dependency>
@@ -35,16 +45,8 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons-resources</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-aggregationengine-default</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
=== modified file 'local/in/dhis-web-dataentry-linelisting/pom.xml'
--- local/in/dhis-web-dataentry-linelisting/pom.xml 2009-07-08 09:58:18 +0000
+++ local/in/dhis-web-dataentry-linelisting/pom.xml 2009-07-08 10:51:52 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-dataentry-national</artifactId>
@@ -21,7 +21,17 @@
<!-- DHIS -->
- <dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons-resources</artifactId>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-api</artifactId>
</dependency>
@@ -41,16 +51,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-organisationunit</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons-resources</artifactId>
- <type>war</type>
- </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
@@ -64,6 +64,7 @@
</dependency>
<!-- Other -->
+
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
=== modified file 'local/in/dhis-web-excelimport/pom.xml'
--- local/in/dhis-web-excelimport/pom.xml 2009-07-08 09:58:18 +0000
+++ local/in/dhis-web-excelimport/pom.xml 2009-07-08 10:51:52 +0000
@@ -6,40 +6,28 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-excelimport</artifactId>
<packaging>war</packaging>
<name>DHIS Excel Import Module</name>
- <build>
- <finalName>dhis-web-excelimport</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>
<!-- DHIS -->
- <dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons-resources</artifactId>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-api</artifactId>
</dependency>
@@ -54,22 +42,13 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-organisationunit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons-resources</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-aggregationengine-default</artifactId>
- <version>${version}</version>
+ <version>${version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-external</artifactId>
</dependency>
=== modified file 'local/in/dhis-web-leprosy/pom.xml'
--- local/in/dhis-web-leprosy/pom.xml 2009-07-08 09:58:18 +0000
+++ local/in/dhis-web-leprosy/pom.xml 2009-07-08 10:51:52 +0000
@@ -6,35 +6,13 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-leprosy</artifactId>
<packaging>war</packaging>
<name>DHIS Leprosy Module</name>
-
- <build>
- <finalName>dhis-web-leprosy</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>
<!-- DHIS -->
=== modified file 'local/in/dhis-web-mobile/pom.xml'
--- local/in/dhis-web-mobile/pom.xml 2009-07-08 09:58:18 +0000
+++ local/in/dhis-web-mobile/pom.xml 2009-07-08 10:51:52 +0000
@@ -6,35 +6,13 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-mobile</artifactId>
<packaging>war</packaging>
<name>DHIS Mobile Module</name>
-
- <build>
- <finalName>dhis-web-mobile</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>
<!-- DHIS -->
@@ -64,10 +42,10 @@
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-aggregationengine-default</artifactId>
- <version>${version}</version>
+ <version>${version}</version>
</dependency>
<dependency>
=== modified file 'local/in/dhis-web-reports-national/pom.xml'
--- local/in/dhis-web-reports-national/pom.xml 2009-07-08 09:58:18 +0000
+++ local/in/dhis-web-reports-national/pom.xml 2009-07-08 10:51:52 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-reports-national</artifactId>
@@ -20,8 +20,18 @@
<dependencies>
<!-- DHIS -->
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons-resources</artifactId>
+ <type>war</type>
+ </dependency>
- <dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-api</artifactId>
</dependency>
@@ -36,41 +46,33 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-organisationunit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons-resources</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
+ </dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-reporting</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-datamart-default</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-jdbc</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-user-hibernate</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-aggregationengine-default</artifactId>
+ <artifactId>dhis-service-aggregationengine-default</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-external</artifactId>
</dependency>
@@ -93,18 +95,20 @@
<artifactId>jasperreports</artifactId>
</dependency>
<dependency>
- <groupId>poi</groupId>
+ <groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
+ <version>3.2-FINAL</version>
</dependency>
<dependency>
<groupId>jfree</groupId>
<artifactId>jfreechart</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>eclipse</groupId>
<artifactId>jdtcore</artifactId>
</dependency>
-
+ -->
<!-- Other -->
@@ -112,11 +116,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.amplecode</groupId>
<artifactId>cave-process</artifactId>
</dependency>
=== modified file 'local/in/dhis-web-validationrule-in/pom.xml'
--- local/in/dhis-web-validationrule-in/pom.xml 2009-07-08 09:58:18 +0000
+++ local/in/dhis-web-validationrule-in/pom.xml 2009-07-08 10:51:52 +0000
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <version>2.0.2-SNAPSHOT</version>
</parent>
<artifactId>dhis-web-validationrule-in</artifactId>
@@ -23,6 +23,16 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons-resources</artifactId>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-api</artifactId>
</dependency>
<dependency>
@@ -41,21 +51,13 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-system</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web-commons-resources</artifactId>
- <type>war</type>
- </dependency>
<!-- India -->
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-aggregationengine-default</artifactId>
+ <version>${version}</version>
</dependency>
=== modified file 'local/in/pom.xml'
--- local/in/pom.xml 2009-07-08 09:58:18 +0000
+++ local/in/pom.xml 2009-07-08 10:51:52 +0000
@@ -9,19 +9,13 @@
<packaging>pom</packaging>
<name>Local India Modules</name>
- <!-- api -->
-
<modules>
- <!--<module>dhis-in-api</module>
- <module>dhis-in-services</module>-->
-
- <!-- Web Modules -->
-
- <!--<module>dhis-web-mobile</module>-->
- <!--<module>dhis-web-reports-in</module>-->
+ <module>dhis-web-dashboard</module>
<module>dhis-web-dataentry-linelisting</module>
+ <module>dhis-web-excelimport</module>
+ <module>dhis-web-leprosy</module>
+ <module>dhis-web-mobile</module>
<module>dhis-web-reports-national</module>
<module>dhis-web-validationrule-in</module>
- <module>dhis-web-dashboard</module>
</modules>
</project>
--
lp:dhis2
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.
