=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java 2015-12-02 00:45:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java 2015-12-07 13:01:20 +0000
@@ -130,8 +130,6 @@
private Period periodW; // Weekly
private Period periodW4; // Weekly
private Period periodW5; // Weekly
- private Period periodW50; // Weekly
- private Period periodW51; // Weekly
private Period periodY; // Yearly
private OrganisationUnit organisationUnitA;
@@ -230,8 +228,6 @@
periodW = createPeriod( "2014W1" ); // Weekly, Monday 2013-12-30 to Sunday 2014-01-05
periodW4 = createPeriod( "2014W4" ); // Weekly, Monday 2014-01-20 to Sunday 2014-01-26
periodW5 = createPeriod( "2014W5" ); // Weekly, Monday 2014-01-27 to Sunday 2014-02-02
- periodW50 = createPeriod( "2014W50" ); // Weekly, Monday 2014-12-22 to Sunday 2014-12-28
- periodW51 = createPeriod( "2014W51" ); // Weekly, Monday 2014-12-29 to Sunday 2015-01-04
periodY = createPeriod( "2014" ); // Yearly
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2015-11-19 16:14:50 +0000
+++ dhis-2/pom.xml 2015-12-07 13:01:20 +0000
@@ -239,7 +239,7 @@
1.7
- generate-resources
+ prepare-package