diff --git a/pom.xml b/pom.xml index 185d2be..f22b7eb 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 4.0.0 org.gcube.accounting accounting-dashboard-harvester-se-plugin - 1.6.0 + 2.0.0-SNAPSHOT Accounting Dashboard Harvester Smart Executor Plugin Accounting Dashboard Harvester Smart Executor Plugin harvest accounting @@ -36,7 +36,7 @@ org.gcube.vremanagement smart-executor-bom - 1.0.0 + 2.0.0-SNAPSHOT pom import @@ -89,12 +89,12 @@ org.gcube.accounting accounting-analytics - [2.0.0,3.0.0-SNAPSHOT) + [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) org.gcube.accounting accounting-analytics-persistence-couchbase - [1.0.0,2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) org.gcube.accounting @@ -191,4 +191,4 @@ - \ No newline at end of file + diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java index de9666e..fd4d419 100644 --- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java +++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java @@ -142,8 +142,9 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { inputs.put(AccountingDashboardHarvesterPlugin.MEASURE_TYPE_INPUT_PARAMETER, aggregationType.name()); inputs.put(AccountingDashboardHarvesterPlugin.GET_VRE_USERS_INPUT_PARAMETER, true); - inputs.put(AccountingDashboardHarvesterPlugin.RERUN_INPUT_PARAMETER, true); + inputs.put(AccountingDashboardHarvesterPlugin.RERUN_INPUT_PARAMETER, false); inputs.put(AccountingDashboardHarvesterPlugin.DRY_RUN_INPUT_PARAMETER, false); + inputs.put(AccountingDashboardHarvesterPlugin.PARTIAL_HARVESTING, false); /* Calendar from = DateUtils.getStartCalendar(2016, Calendar.SEPTEMBER, 1); @@ -152,12 +153,18 @@ public class AccountingDataHarvesterPluginTest extends ContextTest { inputs.put(AccountingDataHarvesterPlugin.START_DATE_INPUT_PARAMETER, fromDate); */ - // + // 3rd of the month for MONTHLY Harvesting at 10:00 + // CronExpression cronExpression = new CronExpression("0 0 10 3 1/1 ? *"); + + // Every day at 10:00 for partial harvesting CronExpression cronExpression = new CronExpression("0 0 10 3 1/1 ? *"); + Scheduling scheduling = new Scheduling(cronExpression); scheduling.setGlobal(false); LaunchParameter launchParameter = new LaunchParameter(AccountingDashboardHarvesterPluginDeclaration.NAME, inputs, scheduling); + //LaunchParameter launchParameter = new LaunchParameter(AccountingDashboardHarvesterPluginDeclaration.NAME, inputs); + smartExecutor.launch(launchParameter); logger.info("End.");