=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-09-01 21:38:52 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2013-09-03 14:53:19 +0000 @@ -608,6 +608,7 @@ congo_brazzaville congo_kinshasa ecuador + east_africa_community ethiopia gambia ghana === added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/east_africa_community.png' Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/east_africa_community.png 1970-01-01 00:00:00 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/flags/east_africa_community.png 2013-09-03 14:53:19 +0000 differ === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-08-16 12:29:21 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-09-03 14:53:19 +0000 @@ -681,6 +681,7 @@ vietnam=Vietnam pepfar=PEPFAR nigeria=Nigeria +east_africa_community=East Africa Community ivory_coast=Ivory Coast botswana=Botswana global_fund=Global Fund === modified file 'dhis-2/pom.xml' --- dhis-2/pom.xml 2013-08-22 13:19:57 +0000 +++ dhis-2/pom.xml 2013-09-03 14:53:19 +0000 @@ -138,102 +138,104 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - ${project.build.sourceEncoding} - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - - - org.hisp.dhis.test - true - - - -Xmx256m - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - ${project.build.sourceEncoding} - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.3 - - true - true - true - ${rootDir}findbugs-exclude.xml - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - generate-resources + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + + + org.hisp.dhis.test + true + + + -Xmx256m + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + ${project.build.sourceEncoding} + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.3 + + true + true + true + ${rootDir}findbugs-exclude.xml + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.7 + + + generate-resources + + + + + + + + + + + + + + run + + + + + + + com.googlecode.maven-java-formatter-plugin + maven-java-formatter-plugin + 0.3.1 - - - - - - - - - - - - - run - - - - - - - com.googlecode.maven-java-formatter-plugin - maven-java-formatter-plugin - 0.3.1 - - ${rootDir}DHISFormatter.xml - LF - - - - - + ${rootDir}DHISFormatter.xml + LF + + + + + +