From 2d312dbf0be0a2ed860be29abdc787b643256893 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Thu, 10 Jun 2021 17:13:33 +0200 Subject: [PATCH] Ported to smart-executor 3.0.0 --- CHANGELOG.md | 3 ++- README.md | 2 +- ...roperties => AccountingDashboardHarvesterPlugin.properties} | 0 .../gcube/dataharvest/AccountingDashboardHarvesterPlugin.java | 2 ++ ...roperties => AccountingDashboardHarvesterPlugin.properties} | 0 5 files changed, 5 insertions(+), 2 deletions(-) rename gcube/extra-resources/META-INF/{plugin.properties => AccountingDashboardHarvesterPlugin.properties} (100%) rename src/test/resources/META-INF/{plugin.properties => AccountingDashboardHarvesterPlugin.properties} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84dc825..9e4f7f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for "accounting-dashboard-harvester-se-plugin" -## [v2.0.0-SNAPSHOT] - 2021-06-03 +## [v2.0.0-SNAPSHOT] +- Ported plugin to smart-executor APIs 3.0.0 [#21616] - Added RStudio Harvester [#21557] - Added Jupyter Harvester [#21031] - Switched accounting JSON management to gcube-jackson [#19115] diff --git a/README.md b/README.md index 97c6d31..b4b9b7e 100644 --- a/README.md +++ b/README.md @@ -50,4 +50,4 @@ open-source software toolkit used for building and operating Hybrid Data Infrastructures enabling the dynamic deployment of Virtual Research Environments by favouring the realisation of reuse oriented policies. -The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md) \ No newline at end of file +The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md) diff --git a/gcube/extra-resources/META-INF/plugin.properties b/gcube/extra-resources/META-INF/AccountingDashboardHarvesterPlugin.properties similarity index 100% rename from gcube/extra-resources/META-INF/plugin.properties rename to gcube/extra-resources/META-INF/AccountingDashboardHarvesterPlugin.properties diff --git a/src/main/java/org/gcube/dataharvest/AccountingDashboardHarvesterPlugin.java b/src/main/java/org/gcube/dataharvest/AccountingDashboardHarvesterPlugin.java index e4c33ea..7488094 100644 --- a/src/main/java/org/gcube/dataharvest/AccountingDashboardHarvesterPlugin.java +++ b/src/main/java/org/gcube/dataharvest/AccountingDashboardHarvesterPlugin.java @@ -16,6 +16,7 @@ import org.gcube.accounting.accounting.summary.access.AccountingDao; import org.gcube.accounting.accounting.summary.access.model.ScopeDescriptor; import org.gcube.accounting.accounting.summary.access.model.internal.Dimension; import org.gcube.accounting.accounting.summary.access.model.update.AccountingRecord; +import org.gcube.com.fasterxml.jackson.annotation.JsonIgnore; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; @@ -135,6 +136,7 @@ public class AccountingDashboardHarvesterPlugin extends Plugin { }; + @JsonIgnore public Properties getConfigParameters() throws IOException { Properties properties = new Properties(); try { diff --git a/src/test/resources/META-INF/plugin.properties b/src/test/resources/META-INF/AccountingDashboardHarvesterPlugin.properties similarity index 100% rename from src/test/resources/META-INF/plugin.properties rename to src/test/resources/META-INF/AccountingDashboardHarvesterPlugin.properties