dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #24724
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12171: Made web-commons-resources, web-commons, web-api optional maven dependencies in the web module po...
------------------------------------------------------------
revno: 12171
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-09-19 16:01:30 +0200
message:
Made web-commons-resources, web-commons, web-api optional maven dependencies in the web module poms. This leads to maven ignoring these dependencies when building an aggregate pom, avoiding the WAR overlay step. Reduces build time with 10%.
removed:
dhis-2/dhis-web/dhis-web-light/src/test/
dhis-2/dhis-web/dhis-web-light/src/test/java/
dhis-2/dhis-web/dhis-web-light/src/test/java/org/
dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/
dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/
dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/
dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry/
dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry/action/
dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry/action/GetDataSetsActionTest.java
modified:
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml
dhis-2/dhis-web/dhis-web-appmanager/pom.xml
dhis-2/dhis-web/dhis-web-caseentry/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-importexport/pom.xml
dhis-2/dhis-web/dhis-web-light/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-mobile/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-settings/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-mobile/pom.xml
dhis-2/dhis-web/dhis-web-pivot/pom.xml
dhis-2/dhis-web/dhis-web-portal/pom.xml
dhis-2/dhis-web/dhis-web-reporting/pom.xml
dhis-2/dhis-web/dhis-web-sms/pom.xml
dhis-2/dhis-web/dhis-web-validationrule/pom.xml
dhis-2/dhis-web/dhis-web-visualizer/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-support/dhis-support-hibernate/src/main/resources/ehcache.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml 2013-09-17 16:29:29 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/ehcache.xml 2013-09-19 14:01:30 +0000
@@ -274,6 +274,8 @@
<cache name="org.hisp.dhis.mapping.MapView.organisationUnitLevels" maxElementsInMemory="500" />
+ <cache name="org.hisp.dhis.mapping.MapView.itemOrganisationUnitGroups" maxElementsInMemory="500" />
+
<cache name="org.hisp.dhis.attribute.Attribute.attributeValues" maxElementsInMemory="5000" />
<cache name="org.hisp.dhis.option.OptionSet.options" maxElementsInMemory="2000" />
=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/pom.xml'
--- dhis-2/dhis-web/dhis-web-appmanager/pom.xml 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/pom.xml 2013-09-19 14:01:30 +0000
@@ -27,17 +27,12 @@
<artifactId>ant-compress</artifactId>
<version>1.2</version>
</dependency>
-
<!-- DHIS -->
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-importexport</artifactId>
+ <artifactId>dhis-api</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
@@ -47,11 +42,18 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
</dependencies>
<properties>
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/pom.xml 2013-08-21 12:29:12 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/pom.xml 2013-09-19 14:01:30 +0000
@@ -28,21 +28,28 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-patient</artifactId>
@@ -51,6 +58,7 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-eventreporting</artifactId>
</dependency>
+
</dependencies>
<properties>
<rootDir>../../</rootDir>
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2013-09-17 16:22:09 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/pom.xml 2013-09-19 14:01:30 +0000
@@ -19,26 +19,32 @@
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
<!-- DHIS -->
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-reporting</artifactId>
@@ -47,14 +53,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-mapgeneration</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-datamart-default</artifactId>
- </dependency>
</dependencies>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/pom.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/pom.xml 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/pom.xml 2013-09-19 14:01:30 +0000
@@ -18,31 +18,33 @@
</build>
<dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
+
<!-- DHIS -->
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-reporting</artifactId>
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/pom.xml'
--- dhis-2/dhis-web/dhis-web-importexport/pom.xml 2013-08-22 13:19:57 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/pom.xml 2013-09-19 14:01:30 +0000
@@ -27,8 +27,24 @@
</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>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-importexport</artifactId>
@@ -45,19 +61,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-dxf2</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-web-api</artifactId>
- </dependency>
</dependencies>
<properties>
=== modified file 'dhis-2/dhis-web/dhis-web-light/pom.xml'
--- dhis-2/dhis-web/dhis-web-light/pom.xml 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-light/pom.xml 2013-09-19 14:01:30 +0000
@@ -24,7 +24,11 @@
</dependency>
<!-- DHIS -->
-
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
@@ -33,31 +37,30 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-reporting</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-administration</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-mobile</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
</dependencies>
=== removed directory 'dhis-2/dhis-web/dhis-web-light/src/test'
=== removed directory 'dhis-2/dhis-web/dhis-web-light/src/test/java'
=== removed directory 'dhis-2/dhis-web/dhis-web-light/src/test/java/org'
=== removed directory 'dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp'
=== removed directory 'dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis'
=== removed directory 'dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light'
=== removed directory 'dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry'
=== removed directory 'dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry/action'
=== removed file 'dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry/action/GetDataSetsActionTest.java'
--- dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry/action/GetDataSetsActionTest.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/test/java/org/hisp/dhis/light/dataentry/action/GetDataSetsActionTest.java 1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-package org.hisp.dhis.light.dataentry.action;
-
-/*
- * Copyright (c) 2004-2013, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import static org.mockito.Mockito.*;
-import static org.junit.Assert.*;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.hisp.dhis.dataset.DataSet;
-import org.hisp.dhis.light.utils.FormUtils;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
-import org.hisp.dhis.user.UserCredentials;
-import org.junit.Before;
-import org.junit.Test;
-
-public class GetDataSetsActionTest
-{
- private GetDataSetsAction getDataSetsAction;
-
- private DataSet ds2;
-
- private DataSet ds3;
-
- @Before
- public void setup()
- {
- getDataSetsAction = new GetDataSetsAction();
-
- // Shared dataSets
- ds2 = new DataSet( "2" );
- ds3 = new DataSet( "3" );
-
- Set<DataSet> unitDataSets = createUnitDataSets();
- Set<DataSet> userDataSets = createUserDataSets();
-
- OrganisationUnitService organisationUnitService = mock( OrganisationUnitService.class );
- CurrentUserService currentUserService = mock( CurrentUserService.class );
-
- FormUtils formUtils = new FormUtils();
- formUtils.setCurrentUserService( currentUserService );
- formUtils.setOrganisationUnitService( organisationUnitService );
-
- // Initializing action
- getDataSetsAction.setOrganisationUnitId( 1 );
- getDataSetsAction.setOrganisationUnitService( organisationUnitService );
- getDataSetsAction.setFormUtils( formUtils );
-
- // Populating mocks
- OrganisationUnit unit = new OrganisationUnit();
- unit.setDataSets( unitDataSets );
-
- when( organisationUnitService.getOrganisationUnit( anyInt() ) ).thenReturn( unit );
-
- UserCredentials credentials = mock( UserCredentials.class );
- when( credentials.isSuper() ).thenReturn( false );
- when( credentials.getAllDataSets() ).thenReturn( userDataSets );
-
- User user = new User();
- user.setUserCredentials( credentials );
-
- when( currentUserService.getCurrentUser() ).thenReturn( user );
- }
-
- private Set<DataSet> createUserDataSets()
- {
- Set<DataSet> userDataSets;
- userDataSets = new HashSet<DataSet>();
- userDataSets.add( ds2 );
- userDataSets.add( ds3 );
- userDataSets.add( new DataSet( "5" ) );
- return userDataSets;
- }
-
- private Set<DataSet> createUnitDataSets()
- {
- Set<DataSet> unitDataSets;
- unitDataSets = new HashSet<DataSet>();
- unitDataSets.add( new DataSet( "1" ) );
- unitDataSets.add( ds2 );
- unitDataSets.add( ds3 );
- unitDataSets.add( new DataSet( "4" ) );
- return unitDataSets;
- }
-
- @Test
- public void testUserDataSetsFiltering()
- {
-
- getDataSetsAction.execute();
-
- List<DataSet> dataSets = getDataSetsAction.getDataSets();
- assertEquals( 2, dataSets.size() );
-
- DataSet dataSet1 = dataSets.get( 0 );
- DataSet dataSet2 = dataSets.get( 1 );
-
- assertTrue( (dataSet1.equals( ds2 ) && dataSet2.equals( ds3 ))
- || (dataSet2.equals( ds2 ) && dataSet1.equals( ds3 )) );
- }
-
-}
=== 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 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/pom.xml 2013-09-19 14:01:30 +0000
@@ -28,21 +28,28 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-core</artifactId>
</dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-reporting</artifactId>
=== 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 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/pom.xml 2013-09-19 14:01:30 +0000
@@ -24,32 +24,36 @@
</dependency>
<!-- 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-importexport</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-importexport</artifactId>
+ </dependency>
+
</dependencies>
<properties>
=== 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 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/pom.xml 2013-09-19 14:01:30 +0000
@@ -32,21 +32,24 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
</dependencies>
<properties>
<rootDir>../../../</rootDir>
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/pom.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/pom.xml 2013-08-12 03:29:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-mobile/pom.xml 2013-09-19 14:01:30 +0000
@@ -15,6 +15,11 @@
<dependencies>
<!-- DHIS -->
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
@@ -23,21 +28,23 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-mobile</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-sms</artifactId>
- </dependency>
- -->
+
</dependencies>
<properties>
=== 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 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/pom.xml 2013-09-19 14:01:30 +0000
@@ -18,12 +18,7 @@
</build>
<dependencies>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
+
<!-- DHIS -->
<dependency>
@@ -32,24 +27,27 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-importexport</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-importexport</artifactId>
</dependency>
</dependencies>
=== 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 2013-08-21 12:29:12 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/pom.xml 2013-09-19 14:01:30 +0000
@@ -29,15 +29,7 @@
<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-eventreporting</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
@@ -46,10 +38,21 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-eventreporting</artifactId>
</dependency>
<!-- POI Library -->
=== 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 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/pom.xml 2013-09-19 14:01:30 +0000
@@ -19,27 +19,32 @@
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
<!-- DHIS -->
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
-
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
</dependencies>
<properties>
<rootDir>../../../</rootDir>
=== 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 2013-09-13 13:01:20 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/pom.xml 2013-09-19 14:01:30 +0000
@@ -18,20 +18,11 @@
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
<!-- DHIS -->
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-importexport</artifactId>
+ <artifactId>dhis-api</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
@@ -41,11 +32,23 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-importexport</artifactId>
+ </dependency>
+
</dependencies>
<properties>
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/pom.xml'
--- dhis-2/dhis-web/dhis-web-mapping/pom.xml 2013-06-09 19:12:02 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/pom.xml 2013-09-19 14:01:30 +0000
@@ -32,28 +32,31 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-reporting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-analytics</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-reporting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-analytics</artifactId>
</dependency>
<!-- JSON -->
=== modified file 'dhis-2/dhis-web/dhis-web-mobile/pom.xml'
--- dhis-2/dhis-web/dhis-web-mobile/pom.xml 2013-08-22 13:19:57 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/pom.xml 2013-09-19 14:01:30 +0000
@@ -17,6 +17,11 @@
</build>
<dependencies>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
@@ -25,15 +30,18 @@
<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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-dxf2</artifactId>
@@ -44,18 +52,10 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-importexport</artifactId>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-i18n</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-administration</artifactId>
</dependency>
<dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/pom.xml'
--- dhis-2/dhis-web/dhis-web-pivot/pom.xml 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/pom.xml 2013-09-19 14:01:30 +0000
@@ -32,28 +32,31 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-reporting</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-analytics</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-reporting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-analytics</artifactId>
</dependency>
</dependencies>
=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml 2013-09-19 14:01:30 +0000
@@ -28,6 +28,10 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-commons</artifactId>
</dependency>
<dependency>
@@ -35,6 +39,10 @@
<artifactId>dhis-web-commons-resources</artifactId>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
<!-- Web-API modules -->
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/pom.xml'
--- dhis-2/dhis-web/dhis-web-reporting/pom.xml 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/pom.xml 2013-09-19 14:01:30 +0000
@@ -28,17 +28,28 @@
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-reporting</artifactId>
@@ -53,10 +64,6 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-importexport</artifactId>
</dependency>
=== modified file 'dhis-2/dhis-web/dhis-web-sms/pom.xml'
--- dhis-2/dhis-web/dhis-web-sms/pom.xml 2013-08-12 03:29:54 +0000
+++ dhis-2/dhis-web/dhis-web-sms/pom.xml 2013-09-19 14:01:30 +0000
@@ -18,26 +18,32 @@
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
<!-- DHIS -->
<dependency>
<groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-api</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
- </dependency>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
<!--
<dependency>
<groupId>org.hisp.dhis</groupId>
@@ -48,10 +54,6 @@
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-service-mobile</artifactId>
</dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-support-test</artifactId>
- </dependency>
</dependencies>
=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/pom.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/pom.xml 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/pom.xml 2013-09-19 14:01:30 +0000
@@ -19,11 +19,6 @@
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
<!-- DHIS dependencies -->
<dependency>
@@ -32,28 +27,31 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-importexport</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-reporting</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-importexport</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-reporting</artifactId>
</dependency>
</dependencies>
=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/pom.xml'
--- dhis-2/dhis-web/dhis-web-visualizer/pom.xml 2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/pom.xml 2013-09-19 14:01:30 +0000
@@ -19,11 +19,6 @@
<dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
-
<!-- DHIS -->
<dependency>
@@ -32,24 +27,27 @@
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hisp.dhis</groupId>
- <artifactId>dhis-service-reporting</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>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.hisp.dhis</groupId>
<artifactId>dhis-web-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hisp.dhis</groupId>
+ <artifactId>dhis-service-reporting</artifactId>
</dependency>
<!-- JSON -->
