From 769df038c5ebb62a33bac5b5bd4e11337273bab7 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 21 May 2020 15:32:02 +0200
Subject: [PATCH] Merged branch of feature/19047

Created new changelog.md file. Keeping in this release old changelog.xml
file for backward compatibility.

Ready for release of version 1.6.0
---
 changelog.md                                  | 64 +++++++++++++++++++
 changelog.xml                                 |  5 +-
 pom.xml                                       |  2 +-
 .../CoreServicesAccessesHarvester.java        |  3 +
 .../AccountingDataHarvesterPluginTest.java    |  5 +-
 5 files changed, 74 insertions(+), 5 deletions(-)
 create mode 100644 changelog.md

diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..c87f699
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,64 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+## [1.6.0] - []
+
+### Added
+
+**Features**
+
+[#19047] Added core services accesses 
+
+
+## [1.5.0] - [2020-03-30]
+
+### Added
+
+**Features**
+
+[#18290] Google Analytics Plugin for Catalogue pageviews 
+
+[#18848] Updated Catalogue Dashboard harvester ENUM 
+
+
+## [1.4.0] - [2020-01-20]
+
+### Changed
+
+**Fixes**
+
+[#17800] Allowed partial harvesting of the current period 
+
+
+## [1.3.0] - [2019-11-11]
+
+### Added
+
+**Features**
+
+[#17800] Allowed partial harvesting of the current period 
+
+
+## [1.2.0] - [2019-10-04]
+
+
+### Changed
+
+[#17128] Removed Home Library dependecy 
+
+[#17128] Removed ckan-util-library dependecy
+
+## [1.1.0] - [2019-02-26]
+
+### Changed
+
+**Fixes**
+
+[#12985] Fixed scope of dependencies
+
+## [1.0.0] - [2018-10-10]
+
+First Release
diff --git a/changelog.xml b/changelog.xml
index 2ed7d28..f060404 100644
--- a/changelog.xml
+++ b/changelog.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xml>
 <ReleaseNotes>
-	<Changeset component="org.gcube.accounting.accounting-dashboard-harvester-se-plugin.1.5.0" date="${buildDate}">
+	<Changeset component="org.gcube.accounting.accounting-dashboard-harvester-se-plugin.1.6.0" date="${buildDate}">
+		<Change>Added core services accesses #19047</Change>
+	</Changeset>
+	<Changeset component="org.gcube.accounting.accounting-dashboard-harvester-se-plugin.1.5.0" date="2020-03-30">
 		<Change>Google Analytics Plugin for Catalogue pageviews #18290</Change>
 		<Change>Updated Catalogue Dashboard harvester ENUM #18848</Change>
 	</Changeset>
diff --git a/pom.xml b/pom.xml
index 1923ac7..44d983c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.accounting</groupId>
 	<artifactId>accounting-dashboard-harvester-se-plugin</artifactId>
-	<version>1.5.0</version>
+	<version>1.6.0-SNAPSHOT</version>
 	<name>Accounting Dashboard Harvester Smart Executor Plugin</name>
 	<description>
 		Accounting Dashboard Harvester Smart Executor Plugin harvest accounting
diff --git a/src/main/java/org/gcube/dataharvest/harvester/CoreServicesAccessesHarvester.java b/src/main/java/org/gcube/dataharvest/harvester/CoreServicesAccessesHarvester.java
index 3308123..a9997a4 100644
--- a/src/main/java/org/gcube/dataharvest/harvester/CoreServicesAccessesHarvester.java
+++ b/src/main/java/org/gcube/dataharvest/harvester/CoreServicesAccessesHarvester.java
@@ -70,6 +70,9 @@ import com.google.api.services.analyticsreporting.v4.model.Report;
 import com.google.api.services.analyticsreporting.v4.model.ReportRequest;
 import com.google.api.services.analyticsreporting.v4.model.ReportRow;
 
+/**
+ * @author Massimiliano Assante (ISTI - CNR)
+ */
 public class CoreServicesAccessesHarvester extends BasicHarvester {
 
 	private static Logger logger = LoggerFactory.getLogger(CoreServicesAccessesHarvester.class);
diff --git a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
index 0c4fe98..fc40923 100644
--- a/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
+++ b/src/test/java/org/gcube/dataharvest/AccountingDataHarvesterPluginTest.java
@@ -21,7 +21,6 @@ import org.gcube.accounting.accounting.summary.access.model.update.AccountingRec
 import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
 import org.gcube.common.scope.impl.ScopeBean;
 import org.gcube.common.scope.impl.ScopeBean.Type;
-import org.gcube.dataharvest.datamodel.CoreServiceAccessesReportRow;
 import org.gcube.dataharvest.datamodel.HarvestedDataKey;
 import org.gcube.dataharvest.harvester.CatalogueAccessesHarvester;
 import org.gcube.dataharvest.harvester.CoreServicesAccessesHarvester;
@@ -741,8 +740,8 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
 			
 			//AccountingDao dao = getAccountingDao();
 			
-			Date start = DateUtils.getStartCalendar(2020, Calendar.APRIL, 1).getTime();
-			Date end = DateUtils.getStartCalendar(2020, Calendar.MAY, 1).getTime();
+			Date start = DateUtils.getStartCalendar(2020, Calendar.JANUARY, 1).getTime();
+			Date end = DateUtils.getStartCalendar(2020, Calendar.FEBRUARY, 1).getTime();
 
 			/*
 			 * Date start = DateUtils.getPreviousPeriod(measureType, false).getTime();