------------------------------------------------------------
revno: 328
committer: Lars Helge Oeverland larshe...@gmail.com
branch nick: trunk
timestamp: Mon 2009-05-25 20:28:22 +0200
message:
Cleaned up the web POMs
modified:
dhis-2/dhis-web/dhis-web-commons/pom.xml
dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml
dhis-2/dhis-web/dhis-web-dataentry/pom.xml
dhis-2/dhis-web/dhis-web-datamart/pom.xml
dhis-2/dhis-web/dhis-web-gis/pom.xml
dhis-2/dhis-web/dhis-web-importexport/pom.xml
dhis-2/dhis-web/dhis-web-jforum-integration/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml
dhis-2/dhis-web/dhis-web-openhealth-integration/pom.xml
dhis-2/dhis-web/dhis-web-reporting/pom.xml
dhis-2/dhis-web/dhis-web-validationrule/pom.xml
gis/dhis-web-mapping/pom.xml
=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml 2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml 2009-05-25 18:28:22 +0000
@@ -114,6 +114,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-email</artifactId>
</dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2009-04-22
21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2009-05-25
18:28:22 +0000
@@ -54,39 +54,17 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-support-system</artifactId>
</dependency>
-
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
-
- <!-- JasperReports -->
-
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- </dependency>
-
+
<!-- Other -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.amplecode</groupId>
<artifactId>staxwax</artifactId>
</dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ </dependency>
</dependencies>
</project>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/pom.xml 2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/pom.xml 2009-05-25 18:28:22 +0000
@@ -38,25 +38,10 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-options</artifactId>
</dependency>
-
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
+
<!-- Other -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-datamart/pom.xml'
--- dhis-2/dhis-web/dhis-web-datamart/pom.xml 2009-04-26 13:54:10 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/pom.xml 2009-05-25 18:28:22 +0000
@@ -55,24 +55,9 @@
<artifactId>dhis-support-system</artifactId>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
<!-- Other -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.amplecode</groupId>
<artifactId>cave-process</artifactId>
</dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-gis/pom.xml'
--- dhis-2/dhis-web/dhis-web-gis/pom.xml 2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-gis/pom.xml 2009-05-25 18:28:22 +0000
@@ -53,29 +53,8 @@
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
<!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
+
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/pom.xml'
--- dhis-2/dhis-web/dhis-web-importexport/pom.xml 2009-05-05 13:31:22
+0000
+++ dhis-2/dhis-web/dhis-web-importexport/pom.xml 2009-05-25 18:28:22
+0000
@@ -63,26 +63,5 @@
<type>war</type>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
</dependencies>
</project>
=== modified file 'dhis-2/dhis-web/dhis-web-jforum-integration/pom.xml'
--- dhis-2/dhis-web/dhis-web-jforum-integration/pom.xml 2009-04-22 21:31:10
+0000
+++ dhis-2/dhis-web/dhis-web-jforum-integration/pom.xml 2009-05-25 18:28:22
+0000
@@ -47,23 +47,5 @@
<artifactId>dhis-support-test</artifactId>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
</dependencies>
</project>
=== 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
2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml
2009-05-25 18:28:22 +0000
@@ -55,22 +55,5 @@
<artifactId>dhis-useradminandsecurity</artifactId>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
</dependencies>
</project>
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml'
---
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml
2009-04-22 21:31:10 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml
2009-05-25 18:28:22 +0000
@@ -54,25 +54,10 @@
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
</dependency>
-
- <!-- WebWork -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
+
<!-- Other -->
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml
2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml
2009-05-25 18:28:22 +0000
@@ -47,24 +47,6 @@
<type>war</type>
</dependency>
- <!-- Other -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
</dependencies>
</project>
=== 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
2009-04-22 21:31:10 +0000
+++
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml
2009-05-25 18:28:22 +0000
@@ -43,22 +43,5 @@
<type>war</type>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
</dependencies>
</project>
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml
2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml
2009-05-25 18:28:22 +0000
@@ -42,24 +42,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-options</artifactId>
</dependency>
-
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
+
</dependencies>
</project>
=== modified file
'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml
2009-04-22 21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml
2009-05-25 18:28:22 +0000
@@ -47,22 +47,5 @@
<type>war</type>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
</dependencies>
</project>
=== modified file 'dhis-2/dhis-web/dhis-web-openhealth-integration/pom.xml'
--- dhis-2/dhis-web/dhis-web-openhealth-integration/pom.xml 2009-04-22
21:31:10 +0000
+++ dhis-2/dhis-web/dhis-web-openhealth-integration/pom.xml 2009-05-25
18:28:22 +0000
@@ -35,22 +35,5 @@
<artifactId>dhis-service-reporting</artifactId>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
</dependencies>
</project>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/pom.xml'
--- dhis-2/dhis-web/dhis-web-reporting/pom.xml 2009-05-05 13:31:22 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/pom.xml 2009-05-25 18:28:22 +0000
@@ -63,17 +63,6 @@
<artifactId>dhis-support-external</artifactId>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
-
<!-- JasperReports -->
<dependency>
@@ -86,15 +75,7 @@
</dependency>
<!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
+
<dependency>
<groupId>net.sourceforge.jexcelapi</groupId>
<artifactId>jxl</artifactId>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/pom.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/pom.xml 2009-04-24 12:59:52
+0000
+++ dhis-2/dhis-web/dhis-web-validationrule/pom.xml 2009-05-25 18:28:22
+0000
@@ -50,21 +50,10 @@
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
</dependency>
-
- <!-- WebWork -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
-
+
<!-- Other -->
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</dependency>
=== modified file 'gis/dhis-web-mapping/pom.xml'
--- gis/dhis-web-mapping/pom.xml 2009-05-14 00:33:00 +0000
+++ gis/dhis-web-mapping/pom.xml 2009-05-25 18:28:22 +0000
@@ -59,31 +59,5 @@
<type>war</type>
</dependency>
- <!-- Web -->
-
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>webwork</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- </dependency>
-
- <!-- Other -->
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>ognl</groupId>
- <artifactId>ognl</artifactId>
- <version>2.7</version>
- </dependency>
</dependencies>
</project>
--
Trunk
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
