dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #22224
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10652: more fixes to local/vn. Excel modules can now be built with a simple mvn clean install in the roo...
------------------------------------------------------------
revno: 10652
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-04-22 12:19:30 +0700
message:
more fixes to local/vn. Excel modules can now be built with a simple mvn clean install in the root dir, and then you just add dhis-web-spreadsheet-reporting to dhis-web-portal pom.xml
removed:
local/vn/dhis-api-chr/
local/vn/dhis-api-chr/src/
local/vn/dhis-api-chr/src/main/
local/vn/dhis-api-chr/src/main/resources/
local/vn/dhis-api-chr/src/main/resources/META-INF/
local/vn/dhis-service-chr/
local/vn/dhis-service-chr/src/
local/vn/dhis-service-chr/src/test/
local/vn/dhis-service-chr/src/test/java/
local/vn/dhis-service-chr/src/test/java/org/
local/vn/dhis-service-chr/src/test/java/org/hisp/
local/vn/dhis-service-chr/src/test/java/org/hisp/dhis/
local/vn/dhis-service-chr/src/test/java/org/hisp/dhis/vn/
local/vn/dhis-service-chr/src/test/java/org/hisp/dhis/vn/report/
local/vn/dhis-web-chr-form/
local/vn/dhis-web-chr-form/src/
local/vn/dhis-web-chr-form/src/main/
local/vn/dhis-web-chr-form/src/main/webapp/
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/and.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/cal.gif
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/divide.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/equal.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/far.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/greater.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/intro.jpg
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/left_parent.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/less.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/minus.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/multiply.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/nuse.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/open.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/or.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/plus.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/right_parent.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/tiemchung.png
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/javascripts/
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/javascripts/calendar/
local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/javascripts/calendar/vssver.scc
local/vn/dhis-web-dataentry-chr/
local/vn/dhis-web-dataentry-chr/src/
local/vn/dhis-web-dataentry-chr/src/main/
local/vn/dhis-web-dataentry-chr/src/main/resources/
local/vn/dhis-web-dataentry-chr/src/main/resources/org/
local/vn/dhis-web-dataentry-chr/src/main/resources/org/hisp/
local/vn/dhis-web-dataentry-chr/src/main/resources/org/hisp/dhis/
local/vn/dhis-web-dataentry-chr/src/main/resources/org/hisp/dhis/de/
local/vn/dhis-web-dataentry-chr/src/main/resources/org/hisp/dhis/de/i18n_module_en_GB.properties
local/vn/dhis-web-dataentry-chr/src/main/webapp/
local/vn/dhis-web-dataentry-chr/src/main/webapp/dhis-web-dataentry/
local/vn/dhis-web-dataentry-chr/src/main/webapp/dhis-web-dataentry/responseVoid.vm
modified:
local/vn/dhis-service-spreadsheet-reporting/pom.xml
local/vn/dhis-service-vn/pom.xml
local/vn/dhis-web-spreadsheet-reporting/pom.xml
local/vn/pom.xml
--
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
=== removed directory 'local/vn/dhis-api-chr'
=== removed directory 'local/vn/dhis-api-chr/src'
=== removed directory 'local/vn/dhis-api-chr/src/main'
=== removed directory 'local/vn/dhis-api-chr/src/main/resources'
=== removed directory 'local/vn/dhis-api-chr/src/main/resources/META-INF'
=== removed directory 'local/vn/dhis-service-chr'
=== removed directory 'local/vn/dhis-service-chr/src'
=== removed directory 'local/vn/dhis-service-chr/src/test'
=== removed directory 'local/vn/dhis-service-chr/src/test/java'
=== removed directory 'local/vn/dhis-service-chr/src/test/java/org'
=== removed directory 'local/vn/dhis-service-chr/src/test/java/org/hisp'
=== removed directory 'local/vn/dhis-service-chr/src/test/java/org/hisp/dhis'
=== removed directory 'local/vn/dhis-service-chr/src/test/java/org/hisp/dhis/vn'
=== removed directory 'local/vn/dhis-service-chr/src/test/java/org/hisp/dhis/vn/report'
=== modified file 'local/vn/dhis-service-spreadsheet-reporting/pom.xml'
--- local/vn/dhis-service-spreadsheet-reporting/pom.xml 2012-11-26 09:12:15 +0000
+++ local/vn/dhis-service-spreadsheet-reporting/pom.xml 2013-04-22 05:19:30 +0000
@@ -1,37 +1,41 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-services</artifactId>
- <version>2.11-SNAPSHOT</version>
- </parent>
-
- <artifactId>dhis-service-spreadsheet-reporting</artifactId>
- <packaging>jar</packaging>
- <name>DHIS Spreadsheet Reporting Service</name>
-
- <dependencies>
-
- <!-- DHIS -->
-
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-aggregationengine-default</artifactId>
- </dependency>
-
- </dependencies>
- <properties>
- <rootDir>../../</rootDir>
- </properties>
-</project>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-local-vn</artifactId>
+ <version>2.12-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>dhis-service-spreadsheet-reporting</artifactId>
+ <packaging>jar</packaging>
+ <name>DHIS Spreadsheet Reporting Service</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-aggregationengine-default</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <rootDir>../</rootDir>
+ </properties>
+</project>
+
=== modified file 'local/vn/dhis-service-vn/pom.xml'
--- local/vn/dhis-service-vn/pom.xml 2012-11-26 09:12:15 +0000
+++ local/vn/dhis-service-vn/pom.xml 2013-04-22 05:19:30 +0000
@@ -1,33 +1,32 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-services</artifactId>
- <version>2.11-SNAPSHOT</version>
- </parent>
-
- <artifactId>dhis-service-vn</artifactId>
- <packaging>jar</packaging>
- <name>DHIS VN Service</name>
-
- <dependencies>
-
- <!-- DHIS -->
-
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
-
- </dependencies>
- <properties>
- <rootDir>../../</rootDir>
- </properties>
-</project>
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-local-vn</artifactId>
+ <version>2.12-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>dhis-service-vn</artifactId>
+ <name>DHIS VN Service</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <rootDir>../</rootDir>
+ </properties>
+</project>
=== removed directory 'local/vn/dhis-web-chr-form'
=== removed directory 'local/vn/dhis-web-chr-form/src'
=== removed directory 'local/vn/dhis-web-chr-form/src/main'
=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp'
=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form'
=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images'
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/and.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/and.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/and.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/cal.gif'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/cal.gif 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/cal.gif 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/divide.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/divide.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/divide.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/equal.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/equal.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/equal.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/far.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/far.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/far.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/greater.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/greater.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/greater.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/intro.jpg'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/intro.jpg 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/intro.jpg 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/left_parent.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/left_parent.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/left_parent.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/less.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/less.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/less.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/minus.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/minus.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/minus.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/multiply.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/multiply.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/multiply.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/nuse.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/nuse.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/nuse.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/open.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/open.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/open.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/or.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/or.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/or.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/plus.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/plus.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/plus.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/right_parent.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/right_parent.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/right_parent.png 1970-01-01 00:00:00 +0000 differ
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/tiemchung.png'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/tiemchung.png 2009-09-01 03:49:33 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/images/tiemchung.png 1970-01-01 00:00:00 +0000 differ
=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/javascripts'
=== removed directory 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/javascripts/calendar'
=== removed file 'local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/javascripts/calendar/vssver.scc'
Binary files local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/javascripts/calendar/vssver.scc 2009-09-15 09:05:45 +0000 and local/vn/dhis-web-chr-form/src/main/webapp/dhis-web-chr-form/javascripts/calendar/vssver.scc 1970-01-01 00:00:00 +0000 differ
=== removed directory 'local/vn/dhis-web-dataentry-chr'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src/main'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src/main/resources'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src/main/resources/org'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src/main/resources/org/hisp'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src/main/resources/org/hisp/dhis'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src/main/resources/org/hisp/dhis/de'
=== removed file 'local/vn/dhis-web-dataentry-chr/src/main/resources/org/hisp/dhis/de/i18n_module_en_GB.properties'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src/main/webapp'
=== removed directory 'local/vn/dhis-web-dataentry-chr/src/main/webapp/dhis-web-dataentry'
=== removed file 'local/vn/dhis-web-dataentry-chr/src/main/webapp/dhis-web-dataentry/responseVoid.vm'
=== modified file 'local/vn/dhis-web-spreadsheet-reporting/pom.xml'
--- local/vn/dhis-web-spreadsheet-reporting/pom.xml 2013-04-22 04:23:14 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/pom.xml 2013-04-22 05:19:30 +0000
@@ -1,98 +1,105 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-web</artifactId>
- <version>2.11</version>
- </parent>
-
- <artifactId>dhis-web-spreadsheet-reporting</artifactId>
- <packaging>war</packaging>
- <name>DHIS Web Spreadsheet Reporting</name>
-
- <build>
- <finalName>dhis-web-spreadsheet-reporting</finalName>
- </build>
-
- <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>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-spreadsheet-reporting</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-vn</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-datamart-default</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-aggregationengine-default</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>net.sourceforge.jexcelapi</groupId>
- <artifactId>jxl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.amplecode</groupId>
- <artifactId>quick</artifactId>
- </dependency>
-
- <!-- POI Library -->
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <!--version>3.5-FINAL</version-->
- <version>3.9</version>
- </dependency>
-
- <!-- Used for Ms Office 2007 and over -->
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-ooxml</artifactId>
- <!--version>3.5-FINAL</version-->
- <version>3.9</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi-scratchpad</artifactId>
- <!--version>3.5-FINAL</version-->
- <version>3.9</version>
- </dependency>
- <!---->
-
- </dependencies>
-
- <properties>
- <rootDir>../../</rootDir>
- </properties>
-</project>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-local-vn</artifactId>
+ <version>2.12-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>dhis-web-spreadsheet-reporting</artifactId>
+ <packaging>war</packaging>
+ <name>DHIS Web Spreadsheet Reporting</name>
+
+ <build>
+ <finalName>dhis-web-spreadsheet-reporting</finalName>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-commons-resources</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-spreadsheet-reporting</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-vn</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-datamart-default</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-aggregationengine-default</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Other -->
+ <dependency>
+ <groupId>net.sourceforge.jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>2.6.12</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.amplecode</groupId>
+ <artifactId>quick</artifactId>
+ <version>1.7.1</version>
+ </dependency>
+
+ <!-- POI Library -->
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.9</version>
+ </dependency>
+
+ <!-- Used for Ms Office 2007 and over -->
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml</artifactId>
+ <version>3.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi-scratchpad</artifactId>
+ <version>3.9</version>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <rootDir>../</rootDir>
+ </properties>
+</project>
+
=== modified file 'local/vn/pom.xml'
--- local/vn/pom.xml 2013-04-22 04:23:14 +0000
+++ local/vn/pom.xml 2013-04-22 05:19:30 +0000
@@ -1,17 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-local-vn</artifactId>
- <version>2.11</version>
- <packaging>pom</packaging>
- <name>Local Vietnam Modules</name>
-
- <modules>
- <module>dhis-service-vn</module>
- <module>dhis-service-spreadsheet-reporting</module>
- <module>dhis-web-spreadsheet-reporting</module>
- </modules>
-</project>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-local-vn</artifactId>
+ <version>2.12-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Local Vietnam Modules</name>
+
+ <modules>
+ <module>dhis-service-vn</module>
+ <module>dhis-service-spreadsheet-reporting</module>
+ <module>dhis-web-spreadsheet-reporting</module>
+ </modules>
+
+ <properties>
+ <rootDir>../../dhis-2/</rootDir>
+ </properties>
+
+</project>
