dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #04917
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1637: Made dependencies to support projects transitive through dhis-service-core
------------------------------------------------------------
revno: 1637
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Fri 2010-03-12 12:05:35 +0100
message:
Made dependencies to support projects transitive through dhis-service-core
modified:
dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java
dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java
dhis-2/dhis-services/dhis-service-administration/pom.xml
dhis-2/dhis-services/dhis-service-aggregationengine-default/pom.xml
dhis-2/dhis-services/dhis-service-core/pom.xml
dhis-2/dhis-services/dhis-service-datamart-default/pom.xml
dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml
dhis-2/dhis-services/dhis-service-importexport/pom.xml
dhis-2/dhis-services/dhis-service-mapping/pom.xml
dhis-2/dhis-services/dhis-service-patient/pom.xml
dhis-2/dhis-services/dhis-service-reporting/pom.xml
dhis-2/dhis-web/dhis-web-caseentry/pom.xml
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-excel-reporting/pom.xml
dhis-2/dhis-web/dhis-web-importexport/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-patient/pom.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml
dhis-2/dhis-web/dhis-web-mapping/pom.xml
dhis-2/dhis-web/dhis-web-reporting/pom.xml
dhis-2/dhis-web/dhis-web-validationrule/pom.xml
dhis-2/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.
=== modified file 'dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml 2010-03-12 09:56:06 +0000
+++ dhis-2/dhis-i18n/dhis-i18n-db/src/main/resources/META-INF/dhis/beans.xml 2010-03-12 11:05:35 +0000
@@ -4,7 +4,7 @@
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd";>
- <bean id="org.hisp.dhis.i18n.locale.LocaleManagerSession" class="org.hisp.dhis.i18n.locale.SessionLocaleManager">
+ <bean id="org.hisp.dhis.i18n.locale.LocaleManagerDb" class="org.hisp.dhis.i18n.locale.SessionLocaleManager">
<property name="systemLocale" value="en_GB" />
</bean>
<!--
@@ -218,7 +218,7 @@
<bean id="org.hisp.dhis.i18n.I18nService" class="org.hisp.dhis.i18n.DefaultI18nService">
<property name="localeManager">
- <ref bean="org.hisp.dhis.i18n.locale.LocaleManagerSession" />
+ <ref bean="org.hisp.dhis.i18n.locale.LocaleManagerDb" />
</property>
<property name="translationService">
<ref bean="org.hisp.dhis.translation.TranslationService" />
=== modified file 'dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java'
--- dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java 2010-03-12 09:56:06 +0000
+++ dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTest.java 2010-03-12 11:05:35 +0000
@@ -64,7 +64,7 @@
{
i18nService = (I18nService) getBean( I18nService.ID );
- localeManager = (LocaleManager) getBean( "org.hisp.dhis.i18n.locale.LocaleManagerSession" );
+ localeManager = (LocaleManager) getBean( "org.hisp.dhis.i18n.locale.LocaleManagerDb" );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java'
--- dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java 2010-03-12 09:56:06 +0000
+++ dhis-2/dhis-i18n/dhis-i18n-db/src/test/java/org/hisp/dhis/i18n/I18nServiceTranslationTest.java 2010-03-12 11:05:35 +0000
@@ -78,7 +78,7 @@
{
i18nService = (I18nService) getBean( I18nService.ID );
- localeManager = (LocaleManager) getBean( "org.hisp.dhis.i18n.locale.LocaleManagerSession" );
+ localeManager = (LocaleManager) getBean( "org.hisp.dhis.i18n.locale.LocaleManagerDb" );
translationService = (TranslationService) getBean( TranslationService.ID );
=== modified file 'dhis-2/dhis-services/dhis-service-administration/pom.xml'
--- dhis-2/dhis-services/dhis-service-administration/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-services/dhis-service-administration/pom.xml 2010-03-12 11:05:35 +0000
@@ -29,14 +29,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
<!-- Other -->
=== modified file 'dhis-2/dhis-services/dhis-service-aggregationengine-default/pom.xml'
--- dhis-2/dhis-services/dhis-service-aggregationengine-default/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-services/dhis-service-aggregationengine-default/pom.xml 2010-03-12 11:05:35 +0000
@@ -25,10 +25,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-jdbc</artifactId>
- </dependency>
<!-- Other -->
=== modified file 'dhis-2/dhis-services/dhis-service-core/pom.xml'
--- dhis-2/dhis-services/dhis-service-core/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-services/dhis-service-core/pom.xml 2010-03-12 11:05:35 +0000
@@ -39,6 +39,10 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-external</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-i18n-db</artifactId>
</dependency>
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/pom.xml'
--- dhis-2/dhis-services/dhis-service-datamart-default/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/pom.xml 2010-03-12 11:05:35 +0000
@@ -27,20 +27,8 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-jdbc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-options</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
<!-- Other -->
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/pom.xml 2010-03-12 11:05:35 +0000
@@ -24,20 +24,11 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-hibernate</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-aggregationengine-default</artifactId>
</dependency>
-
</dependencies>
<properties>
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/pom.xml'
--- dhis-2/dhis-services/dhis-service-importexport/pom.xml 2010-02-19 18:38:02 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/pom.xml 2010-03-12 11:05:35 +0000
@@ -33,10 +33,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-administration</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-jdbc</artifactId>
- </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-xml</artifactId>
@@ -45,18 +41,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-reporting</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-external</artifactId>
- </dependency>
<!-- Other -->
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/pom.xml'
--- dhis-2/dhis-services/dhis-service-mapping/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/pom.xml 2010-03-12 11:05:35 +0000
@@ -33,18 +33,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-datamart-default</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
<!-- Other -->
=== modified file 'dhis-2/dhis-services/dhis-service-patient/pom.xml'
--- dhis-2/dhis-services/dhis-service-patient/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-services/dhis-service-patient/pom.xml 2010-03-12 11:05:35 +0000
@@ -24,18 +24,6 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/pom.xml'
--- dhis-2/dhis-services/dhis-service-reporting/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/pom.xml 2010-03-12 11:05:35 +0000
@@ -23,10 +23,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-jdbc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-datamart-default</artifactId>
</dependency>
<dependency>
@@ -41,14 +37,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-user-hibernate</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-hibernate</artifactId>
- </dependency>
<!-- Other -->
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/pom.xml 2010-03-12 11:05:35 +0000
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-patient</artifactId>
- <version>${version}</version>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml 2010-03-11 19:16:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml 2010-03-12 11:05:35 +0000
@@ -76,24 +76,16 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-external</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-options</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-i18n-upgrader</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-support-test</artifactId>
+ </dependency>
<!-- Web -->
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2010-02-19 18:38:02 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2010-03-12 11:05:35 +0000
@@ -50,14 +50,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-user-hibernate</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-external</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
<!-- Other -->
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/pom.xml 2010-03-11 10:37:57 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/pom.xml 2010-03-12 11:05:35 +0000
@@ -40,10 +40,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-reporting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-options</artifactId>
</dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-datamart/pom.xml'
--- dhis-2/dhis-web/dhis-web-datamart/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-datamart/pom.xml 2010-03-12 11:05:35 +0000
@@ -46,10 +46,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-user-hibernate</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
<!-- Other -->
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/pom.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/pom.xml 2010-03-02 05:43:25 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/pom.xml 2010-03-12 11:05:35 +0000
@@ -37,10 +37,6 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-datamart-default</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
@@ -49,11 +45,7 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-user-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-external</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-aggregationengine-default</artifactId>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/pom.xml'
--- dhis-2/dhis-web/dhis-web-importexport/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/pom.xml 2010-03-12 11:05:35 +0000
@@ -27,14 +27,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
<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 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml 2010-03-12 11:05:35 +0000
@@ -44,10 +44,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-useradminandsecurity</artifactId>
</dependency>
<dependency>
=== 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 2010-02-26 06:40:34 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml 2010-03-12 11:05:35 +0000
@@ -39,14 +39,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</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-dataset/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml 2010-03-12 11:05:35 +0000
@@ -31,14 +31,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</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-organisationunit/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml 2010-03-12 11:05:35 +0000
@@ -31,10 +31,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</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-02-22 09:19:15 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml 2010-03-12 11:05:35 +0000
@@ -28,18 +28,9 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-patient</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</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-user/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml 2010-03-12 11:05:35 +0000
@@ -31,10 +31,6 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-user-hibernate</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
@@ -46,7 +42,6 @@
<type>war</type>
</dependency>
-
</dependencies>
<properties>
<rootDir>../../../</rootDir>
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/pom.xml'
--- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-02-18 17:01:00 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2010-03-12 11:05:35 +0000
@@ -51,10 +51,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
</dependency>
<dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/pom.xml'
--- dhis-2/dhis-web/dhis-web-reporting/pom.xml 2009-12-22 08:04:43 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/pom.xml 2010-03-12 11:05:35 +0000
@@ -54,10 +54,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-importexport</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-external</artifactId>
- </dependency>
<!-- JasperReports -->
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/pom.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/pom.xml 2009-12-23 12:54:35 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/pom.xml 2010-03-12 11:05:35 +0000
@@ -35,10 +35,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
</dependency>
<dependency>
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2010-02-19 18:38:02 +0000
+++ dhis-2/pom.xml 2010-03-12 11:05:35 +0000
@@ -197,6 +197,11 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-patient</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-excel-reporting</artifactId>
<version>${version}</version>
</dependency>
