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
This commit is contained in:
parent
b041f78e1f
commit
769df038c5
|
@ -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
|
|
@ -1,7 +1,10 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE xml>
|
<!DOCTYPE xml>
|
||||||
<ReleaseNotes>
|
<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>Google Analytics Plugin for Catalogue pageviews #18290</Change>
|
||||||
<Change>Updated Catalogue Dashboard harvester ENUM #18848</Change>
|
<Change>Updated Catalogue Dashboard harvester ENUM #18848</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -12,7 +12,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.gcube.accounting</groupId>
|
<groupId>org.gcube.accounting</groupId>
|
||||||
<artifactId>accounting-dashboard-harvester-se-plugin</artifactId>
|
<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>
|
<name>Accounting Dashboard Harvester Smart Executor Plugin</name>
|
||||||
<description>
|
<description>
|
||||||
Accounting Dashboard Harvester Smart Executor Plugin harvest accounting
|
Accounting Dashboard Harvester Smart Executor Plugin harvest accounting
|
||||||
|
|
|
@ -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.ReportRequest;
|
||||||
import com.google.api.services.analyticsreporting.v4.model.ReportRow;
|
import com.google.api.services.analyticsreporting.v4.model.ReportRow;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Massimiliano Assante (ISTI - CNR)
|
||||||
|
*/
|
||||||
public class CoreServicesAccessesHarvester extends BasicHarvester {
|
public class CoreServicesAccessesHarvester extends BasicHarvester {
|
||||||
|
|
||||||
private static Logger logger = LoggerFactory.getLogger(CoreServicesAccessesHarvester.class);
|
private static Logger logger = LoggerFactory.getLogger(CoreServicesAccessesHarvester.class);
|
||||||
|
|
|
@ -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.authorization.client.exceptions.ObjectNotFound;
|
||||||
import org.gcube.common.scope.impl.ScopeBean;
|
import org.gcube.common.scope.impl.ScopeBean;
|
||||||
import org.gcube.common.scope.impl.ScopeBean.Type;
|
import org.gcube.common.scope.impl.ScopeBean.Type;
|
||||||
import org.gcube.dataharvest.datamodel.CoreServiceAccessesReportRow;
|
|
||||||
import org.gcube.dataharvest.datamodel.HarvestedDataKey;
|
import org.gcube.dataharvest.datamodel.HarvestedDataKey;
|
||||||
import org.gcube.dataharvest.harvester.CatalogueAccessesHarvester;
|
import org.gcube.dataharvest.harvester.CatalogueAccessesHarvester;
|
||||||
import org.gcube.dataharvest.harvester.CoreServicesAccessesHarvester;
|
import org.gcube.dataharvest.harvester.CoreServicesAccessesHarvester;
|
||||||
|
@ -741,8 +740,8 @@ public class AccountingDataHarvesterPluginTest extends ContextTest {
|
||||||
|
|
||||||
//AccountingDao dao = getAccountingDao();
|
//AccountingDao dao = getAccountingDao();
|
||||||
|
|
||||||
Date start = DateUtils.getStartCalendar(2020, Calendar.APRIL, 1).getTime();
|
Date start = DateUtils.getStartCalendar(2020, Calendar.JANUARY, 1).getTime();
|
||||||
Date end = DateUtils.getStartCalendar(2020, Calendar.MAY, 1).getTime();
|
Date end = DateUtils.getStartCalendar(2020, Calendar.FEBRUARY, 1).getTime();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Date start = DateUtils.getPreviousPeriod(measureType, false).getTime();
|
* Date start = DateUtils.getPreviousPeriod(measureType, false).getTime();
|
||||||
|
|
Loading…
Reference in New Issue