dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #35846
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18361: Data value and event import. Migrated from dataValueCount to importCount in ImportSummary. Implie...
------------------------------------------------------------
revno: 18361
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-02-20 13:35:55 +0100
message:
Data value and event import. Migrated from dataValueCount to importCount in ImportSummary. Implies small change in web api response.
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummaries.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummary.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importEvents.vm
dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm
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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2015-02-20 11:24:20 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2015-02-20 12:35:55 +0000
@@ -884,7 +884,7 @@
int ignores = totalCount - importCount - updateCount;
- summary.setDataValueCount( new ImportCount( importCount, updateCount, ignores, 0 ) );
+ summary.setImportCount( new ImportCount( importCount, updateCount, ignores, 0 ) );
summary.setStatus( ImportStatus.SUCCESS );
summary.setDescription( "Import process completed successfully" );
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2015-02-10 18:40:27 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/enrollment/AbstractEnrollmentService.java 2015-02-20 12:35:55 +0000
@@ -333,7 +333,6 @@
public ImportSummary addEnrollment( Enrollment enrollment )
{
ImportSummary importSummary = new ImportSummary();
- importSummary.setDataValueCount( null );
org.hisp.dhis.trackedentity.TrackedEntityInstance entityInstance = getTrackedEntityInstance( enrollment
.getTrackedEntityInstance() );
@@ -398,7 +397,6 @@
public ImportSummary updateEnrollment( Enrollment enrollment )
{
ImportSummary importSummary = new ImportSummary();
- importSummary.setDataValueCount( null );
if ( enrollment == null || enrollment.getEnrollment() == null )
{
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2015-02-17 06:00:52 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2015-02-20 12:35:55 +0000
@@ -745,7 +745,7 @@
if ( status != null )
{
importSummary.getConflicts().add( new ImportConflict( dataElement.getUid(), status ) );
- importSummary.getDataValueCount().incrementIgnored();
+ importSummary.getImportCount().incrementIgnored();
return false;
}
@@ -794,7 +794,7 @@
if ( importSummary != null )
{
- importSummary.getDataValueCount().incrementImported();
+ importSummary.getImportCount().incrementImported();
}
}
else
@@ -808,7 +808,7 @@
if ( importSummary != null )
{
- importSummary.getDataValueCount().incrementUpdated();
+ importSummary.getImportCount().incrementUpdated();
}
}
}
@@ -818,7 +818,7 @@
if ( importSummary != null )
{
- importSummary.getDataValueCount().incrementDeleted();
+ importSummary.getImportCount().incrementDeleted();
}
}
}
@@ -942,7 +942,7 @@
{
importSummary.getConflicts().add(
new ImportConflict( "dataElement", dataValue.getDataElement() + " is not a valid data element" ) );
- importSummary.getDataValueCount().incrementIgnored();
+ importSummary.getImportCount().incrementIgnored();
}
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java 2015-02-10 18:40:27 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java 2015-02-20 12:35:55 +0000
@@ -180,7 +180,6 @@
public ImportSummary addTrackedEntityInstance( TrackedEntityInstance trackedEntityInstance )
{
ImportSummary importSummary = new ImportSummary();
- importSummary.setDataValueCount( null );
trackedEntityInstance.trimValuesToNull();
@@ -219,7 +218,6 @@
public ImportSummary updateTrackedEntityInstance( TrackedEntityInstance trackedEntityInstance )
{
ImportSummary importSummary = new ImportSummary();
- importSummary.setDataValueCount( null );
trackedEntityInstance.trimValuesToNull();
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummaries.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummaries.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummaries.java 2015-02-20 12:35:55 +0000
@@ -57,13 +57,6 @@
public ImportSummaries addImportSummary( ImportSummary importSummary )
{
- if ( importSummary.getDataValueCount() != null )
- {
- imported += importSummary.getDataValueCount().getImported();
- updated += importSummary.getDataValueCount().getUpdated();
- ignored += importSummary.getDataValueCount().getIgnored();
- }
-
if ( importSummary.getImportCount() != null )
{
imported += importSummary.getImportCount().getImported();
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummary.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummary.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportSummary.java 2015-02-20 12:35:55 +0000
@@ -44,9 +44,6 @@
private String description;
- /* Phase out this at some point, use importCount instead */
- private ImportCount dataValueCount = new ImportCount();
-
private ImportCount importCount = new ImportCount();
private List<ImportConflict> conflicts = new ArrayList<>();
@@ -111,18 +108,6 @@
@JsonProperty
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
- public ImportCount getDataValueCount()
- {
- return dataValueCount;
- }
-
- public void setDataValueCount( ImportCount dataValueCount )
- {
- this.dataValueCount = dataValueCount;
- }
-
- @JsonProperty
- @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public ImportCount getImportCount()
{
return importCount;
@@ -188,7 +173,7 @@
return "ImportSummary{" +
"status=" + status +
", description='" + description + '\'' +
- ", dataValueCount=" + dataValueCount +
+ ", importCount=" + importCount +
", conflicts=" + conflicts +
", dataSetComplete='" + dataSetComplete + '\'' +
", reference='" + reference + '\'' +
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-02-17 06:00:52 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-02-20 12:35:55 +0000
@@ -28,9 +28,18 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import static org.hisp.dhis.system.util.PredicateUtils.idObjectCollectionsWithScanned;
+import static org.hisp.dhis.system.util.PredicateUtils.idObjects;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.SessionFactory;
@@ -50,10 +59,10 @@
import org.hisp.dhis.dataelement.DataElementOperandService;
import org.hisp.dhis.dataentryform.DataEntryForm;
import org.hisp.dhis.dataentryform.DataEntryFormService;
+import org.hisp.dhis.dxf2.common.ImportOptions;
+import org.hisp.dhis.dxf2.common.ImportUtils;
import org.hisp.dhis.dxf2.importsummary.ImportConflict;
-import org.hisp.dhis.dxf2.common.ImportOptions;
import org.hisp.dhis.dxf2.metadata.ImportTypeSummary;
-import org.hisp.dhis.dxf2.common.ImportUtils;
import org.hisp.dhis.dxf2.metadata.Importer;
import org.hisp.dhis.dxf2.metadata.ObjectBridge;
import org.hisp.dhis.dxf2.metadata.handlers.ObjectHandler;
@@ -83,17 +92,9 @@
import org.hisp.dhis.validation.ValidationRule;
import org.springframework.beans.factory.annotation.Autowired;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static org.hisp.dhis.system.util.PredicateUtils.idObjectCollectionsWithScanned;
-import static org.hisp.dhis.system.util.PredicateUtils.idObjects;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Sets;
/**
* Importer that can handle IdentifiableObject and NameableObject.
@@ -174,7 +175,6 @@
{
this.options = options;
this.summaryType = new ImportTypeSummary( importerClass.getSimpleName() );
- this.summaryType.setDataValueCount( null );
if ( objects.isEmpty() )
{
@@ -205,7 +205,6 @@
{
this.options = options;
this.summaryType = new ImportTypeSummary( importerClass.getSimpleName() );
- this.summaryType.setDataValueCount( null );
if ( object == null )
{
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java 2015-02-20 12:06:02 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java 2015-02-20 12:35:55 +0000
@@ -194,7 +194,7 @@
ImportSummary summary = dataValueSetService.saveDataValueSet( in );
assertNotNull( summary );
- assertNotNull( summary.getDataValueCount() );
+ assertNotNull( summary.getImportCount() );
assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
assertEquals( 0, summary.getConflicts().size() );
@@ -224,7 +224,7 @@
ImportSummary summary = dataValueSetService.saveDataValueSet( in );
assertNotNull( summary );
- assertNotNull( summary.getDataValueCount() );
+ assertNotNull( summary.getImportCount() );
assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
assertEquals( 0, summary.getConflicts().size() );
@@ -254,10 +254,10 @@
ImportSummary summary = dataValueSetService.saveDataValueSet( in );
assertEquals( 0, summary.getConflicts().size() );
- assertEquals( 12, summary.getDataValueCount().getImported() );
- assertEquals( 0, summary.getDataValueCount().getUpdated() );
- assertEquals( 0, summary.getDataValueCount().getDeleted() );
- assertEquals( 0, summary.getDataValueCount().getIgnored() );
+ assertEquals( 12, summary.getImportCount().getImported() );
+ assertEquals( 0, summary.getImportCount().getUpdated() );
+ assertEquals( 0, summary.getImportCount().getDeleted() );
+ assertEquals( 0, summary.getImportCount().getIgnored() );
assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
assertImportDataValues( summary );
@@ -273,10 +273,10 @@
ImportSummary summary = dataValueSetService.saveDataValueSet( in, options );
assertEquals( 0, summary.getConflicts().size() );
- assertEquals( 12, summary.getDataValueCount().getImported() );
- assertEquals( 0, summary.getDataValueCount().getUpdated() );
- assertEquals( 0, summary.getDataValueCount().getDeleted() );
- assertEquals( 0, summary.getDataValueCount().getIgnored() );
+ assertEquals( 12, summary.getImportCount().getImported() );
+ assertEquals( 0, summary.getImportCount().getUpdated() );
+ assertEquals( 0, summary.getImportCount().getDeleted() );
+ assertEquals( 0, summary.getImportCount().getIgnored() );
assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
assertImportDataValues( summary );
@@ -291,10 +291,10 @@
ImportSummary summary = dataValueSetService.saveDataValueSetCsv( in, null, null );
assertEquals( 1, summary.getConflicts().size() ); // Header row
- assertEquals( 12, summary.getDataValueCount().getImported() );
- assertEquals( 0, summary.getDataValueCount().getUpdated() );
- assertEquals( 0, summary.getDataValueCount().getDeleted() );
- assertEquals( 1, summary.getDataValueCount().getIgnored() ); // Header row
+ assertEquals( 12, summary.getImportCount().getImported() );
+ assertEquals( 0, summary.getImportCount().getUpdated() );
+ assertEquals( 0, summary.getImportCount().getDeleted() );
+ assertEquals( 1, summary.getImportCount().getIgnored() ); // Header row
assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
assertImportDataValues( summary );
@@ -331,10 +331,10 @@
System.out.println("upd " + summary);
assertEquals( 0, summary.getConflicts().size() );
- assertEquals( 0, summary.getDataValueCount().getImported() );
- assertEquals( 0, summary.getDataValueCount().getUpdated() );
- assertEquals( 0, summary.getDataValueCount().getDeleted() );
- assertEquals( 12, summary.getDataValueCount().getIgnored() );
+ assertEquals( 0, summary.getImportCount().getImported() );
+ assertEquals( 0, summary.getImportCount().getUpdated() );
+ assertEquals( 0, summary.getImportCount().getDeleted() );
+ assertEquals( 12, summary.getImportCount().getIgnored() );
assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
@@ -350,10 +350,10 @@
ImportSummary summary = dataValueSetService.saveDataValueSet( new ClassPathResource( "datavalueset/dataValueSetC.xml" ).getInputStream() );
assertEquals( 0, summary.getConflicts().size() );
- assertEquals( 3, summary.getDataValueCount().getImported() );
- assertEquals( 0, summary.getDataValueCount().getUpdated() );
- assertEquals( 0, summary.getDataValueCount().getDeleted() );
- assertEquals( 0, summary.getDataValueCount().getIgnored() );
+ assertEquals( 3, summary.getImportCount().getImported() );
+ assertEquals( 0, summary.getImportCount().getUpdated() );
+ assertEquals( 0, summary.getImportCount().getDeleted() );
+ assertEquals( 0, summary.getImportCount().getIgnored() );
assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
@@ -390,7 +390,7 @@
ImportSummary summary = dataValueSetService.saveDataValueSet( in );
- assertEquals( 0, summary.getDataValueCount().getImported() );
+ assertEquals( 0, summary.getImportCount().getImported() );
assertEquals( ImportStatus.ERROR, summary.getStatus() );
Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
@@ -408,10 +408,10 @@
ImportSummary summary = dataValueSetService.saveDataValueSet( in );
assertEquals( 3, summary.getConflicts().size() );
- assertEquals( 1, summary.getDataValueCount().getImported() );
- assertEquals( 0, summary.getDataValueCount().getUpdated() );
- assertEquals( 0, summary.getDataValueCount().getDeleted() );
- assertEquals( 3, summary.getDataValueCount().getIgnored() );
+ assertEquals( 1, summary.getImportCount().getImported() );
+ assertEquals( 0, summary.getImportCount().getUpdated() );
+ assertEquals( 0, summary.getImportCount().getDeleted() );
+ assertEquals( 3, summary.getImportCount().getIgnored() );
assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
@@ -427,7 +427,7 @@
private void assertImportDataValues( ImportSummary summary )
{
assertNotNull( summary );
- assertNotNull( summary.getDataValueCount() );
+ assertNotNull( summary.getImportCount() );
Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java 2015-02-17 06:00:52 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java 2015-02-20 12:35:55 +0000
@@ -307,7 +307,6 @@
else
{
importSummary = new ImportSummary( ImportStatus.SUCCESS, "Empty list of tracked entity instances given." );
- importSummary.setDataValueCount( null );
importSummary.setImportCount( null );
}
@@ -345,7 +344,6 @@
else
{
importSummary = new ImportSummary( ImportStatus.SUCCESS, "Empty list of tracked entity instances given." );
- importSummary.setDataValueCount( null );
importSummary.setImportCount( null );
}
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importEvents.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importEvents.vm 2013-09-05 13:22:42 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importEvents.vm 2015-02-20 12:35:55 +0000
@@ -26,7 +26,7 @@
#foreach( $summary in $importSummaries.importSummaries )
<h4>$i18n.getString( "import_count" )</h4>
-#if( $summary.dataValueCount )
+#if( $summary.importCount )
<table>
<col width="110">
<col width="110">
@@ -36,15 +36,15 @@
</tr>
<tr>
<td>$i18n.getString( "imported" )</td>
- <td style="text-align:center">${summary.dataValueCount.imported}</td>
+ <td style="text-align:center">${summary.importCount.imported}</td>
</tr>
<tr>
<td>$i18n.getString( "updated" )</td>
- <td style="text-align:center">${summary.dataValueCount.updated}</td>
+ <td style="text-align:center">${summary.importCount.updated}</td>
</tr>
<tr>
<td>$i18n.getString( "ignored" )</td>
- <td style="text-align:center">${summary.dataValueCount.ignored}</td>
+ <td style="text-align:center">${summary.importCount.ignored}</td>
</tr>
</table>
#else
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm 2014-11-25 16:39:09 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm 2015-02-20 12:35:55 +0000
@@ -6,7 +6,7 @@
#end
<h4>$i18n.getString( "import_count" )</h4>
-#if( $summary.dataValueCount )
+#if( $summary.importCount )
<table>
<col width="120">
<col width="260">
@@ -16,15 +16,15 @@
</tr>
<tr>
<td>$i18n.getString( "imported" )</td>
- <td>${summary.dataValueCount.imported}</td>
+ <td>${summary.importCount.imported}</td>
</tr>
<tr>
<td>$i18n.getString( "updated" )</td>
- <td>${summary.dataValueCount.updated}</td>
+ <td>${summary.importCount.updated}</td>
</tr>
<tr>
<td>$i18n.getString( "ignored" )</td>
- <td>${summary.dataValueCount.ignored}</td>
+ <td>${summary.importCount.ignored}</td>
</tr>
</table>
#else
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2015-02-19 09:18:17 +0000
+++ dhis-2/pom.xml 2015-02-20 12:35:55 +0000
@@ -25,7 +25,7 @@
<name>HISP</name>
<url>http://www.dhis2.org</url>
</organization>
-
+
<modules>
<module>dhis-api</module>
<module>dhis-services</module>
@@ -187,9 +187,10 @@
</plugin>
<plugin>
+ <!-- Run with mvn clean compile site -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.3</version>
+ <version>3.0.0</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages>
