=== modified file 'dhis-2/dhis-api/pom.xml'
--- dhis-2/dhis-api/pom.xml 2012-08-03 11:05:49 +0000
+++ dhis-2/dhis-api/pom.xml 2012-08-22 12:45:25 +0000
@@ -51,7 +51,6 @@
org.smslib
smslib
- 3.5.2-r2307
=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2012-07-30 22:03:07 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2012-08-22 12:45:25 +0000
@@ -195,7 +195,6 @@
return null;
}
- @SuppressWarnings( "unchecked" )
private Importer findImporterClass( Class> clazz )
{
for ( Importer i : importerClasses )
=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2012-07-30 22:03:07 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2012-08-22 12:45:25 +0000
@@ -412,7 +412,6 @@
//-------------------------------------------------------------------------------------------------------
@Override
- @SuppressWarnings( "unchecked" )
public ImportTypeSummary importObjects( List objects, ImportOptions options )
{
this.options = options;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormUpgrader.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormUpgrader.java 2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormUpgrader.java 2012-08-22 12:45:25 +0000
@@ -104,8 +104,6 @@
private String upgradeProgramDataEntryFormForTextBox( String htmlCode )
{
- int i = 0;
-
Matcher matcher = ID_PROGRAM_ENTRY_TEXTBOX.matcher( htmlCode );
StringBuffer out = new StringBuffer();
@@ -116,8 +114,6 @@
+ "-val\"";
matcher.appendReplacement( out, upgradedId );
-
- i++;
}
matcher.appendTail( out );
=== modified file 'dhis-2/dhis-services/dhis-service-integration/pom.xml'
--- dhis-2/dhis-services/dhis-service-integration/pom.xml 2012-08-03 11:05:49 +0000
+++ dhis-2/dhis-services/dhis-service-integration/pom.xml 2012-08-22 12:45:25 +0000
@@ -22,7 +22,6 @@
com.sun.xml.bind
jaxb-impl
- 2.2.5
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/pom.xml'
--- dhis-2/dhis-services/dhis-service-mapping/pom.xml 2012-08-03 11:05:49 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/pom.xml 2012-08-22 12:45:25 +0000
@@ -11,7 +11,7 @@
dhis-service-mapping
jar
- DHIS OrganisationUnit API Implementations
+ DHIS Mapping Service Implementation
=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java 2012-07-20 08:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java 2012-08-22 12:45:25 +0000
@@ -99,7 +99,6 @@
throws IOException
{
orgUnits = new ArrayList();
- double version = dataInputStream.readDouble();
int size = dataInputStream.readInt();
for ( int i = 0; i < size; i++ )
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2012-08-21 13:12:22 +0000
+++ dhis-2/pom.xml 2012-08-22 12:45:25 +0000
@@ -178,7 +178,7 @@
org.apache.maven.plugins
maven-antrun-plugin
- 1.6
+ 1.7
generate-resources