Compare commits

...

13 Commits

6 changed files with 39 additions and 26 deletions

2
.gitignore vendored
View File

@ -2,3 +2,5 @@ target
.classpath .classpath
.project .project
.settings .settings
/.DS_Store
/bin/

View File

@ -2,10 +2,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for Smart Executor API # Changelog for Smart Executor API
## [v3.1.0]
## [v3.0.0-SNAPSHOT] [r5.0.0] - - updated gcube-bom
## [v3.0.0]
- Switched smart-executor JSON management to gcube-jackson [#19647] - Switched smart-executor JSON management to gcube-jackson [#19647]
- Plugins must provide a property file with name <PluginName>.properties [#21596]
## [v2.0.0] ## [v2.0.0]

26
FUNDING.md Normal file
View File

@ -0,0 +1,26 @@
# Acknowledgments
The projects leading to this software have received funding from a series of European Union programmes including:
- the Sixth Framework Programme for Research and Technological Development
- [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
- the Seventh Framework Programme for research, technological development and demonstration
- [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
- [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
- [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
- [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
- [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
- the H2020 research and innovation programme
- [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
- [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
- [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
- [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
- [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
- [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
- [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
- [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
- [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
- [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
- [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
- [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
- [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);

View File

@ -46,26 +46,6 @@ open-source software toolkit used for building and operating Hybrid Data
Infrastructures enabling the dynamic deployment of Virtual Research Environments Infrastructures enabling the dynamic deployment of Virtual Research Environments
by favouring the realisation of reuse oriented policies. by favouring the realisation of reuse oriented policies.
The projects leading to this software have received funding from a series of European Union programmes including: The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md)
- the Sixth Framework Programme for Research and Technological Development
- DILIGENT (grant no. 004260).
- the Seventh Framework Programme for research, technological development and demonstration
- D4Science (grant no. 212488);
- D4Science-II (grant no.239019);
- ENVRI (grant no. 283465);
- iMarine(grant no. 283644);
- EUBrazilOpenBio (grant no. 288754).
- the H2020 research and innovation programme
- SoBigData (grant no. 654024);
- PARTHENOS (grant no. 654119);
- EGIEngage (grant no. 654142);
- ENVRIplus (grant no. 654182);
- BlueBRIDGE (grant no. 675680);
- PerformFish (grant no. 727610);
- AGINFRAplus (grant no. 731001);
- DESIRA (grant no. 818194);
- ARIADNEplus (grant no. 823914);
- RISIS2 (grant no. 824091);

View File

@ -10,7 +10,7 @@
<groupId>org.gcube.vremanagement</groupId> <groupId>org.gcube.vremanagement</groupId>
<artifactId>smart-executor-api</artifactId> <artifactId>smart-executor-api</artifactId>
<version>3.0.0-SNAPSHOT</version> <version>3.1.0</version>
<description>Smart Executor Service API Library</description> <description>Smart Executor Service API Library</description>
<properties> <properties>
@ -29,7 +29,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <artifactId>gcube-bom</artifactId>
<version>2.0.0-SNAPSHOT</version> <version>2.1.0</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@ -20,7 +20,7 @@ public abstract class Plugin implements PluginDefinition {
private static Logger logger = LoggerFactory.getLogger(Plugin.class); private static Logger logger = LoggerFactory.getLogger(Plugin.class);
public static final String PLUGIN_PROPERTIES_FILENAME = "plugin.properties"; public static final String PLUGIN_PROPERTIES_SUFFIX_FILENAME = ".properties";
public static final String GROUP_PROPERTY = "groupId"; public static final String GROUP_PROPERTY = "groupId";
public static final String NAME_PROPERTY = "artifactId"; public static final String NAME_PROPERTY = "artifactId";
@ -52,7 +52,8 @@ public abstract class Plugin implements PluginDefinition {
properties = new Properties(); properties = new Properties();
try { try {
InputStream input = getClass().getClassLoader().getResourceAsStream("META-INF" + File.separator + PLUGIN_PROPERTIES_FILENAME); String filename = this.getClass().getSimpleName() + PLUGIN_PROPERTIES_SUFFIX_FILENAME;
InputStream input = getClass().getClassLoader().getResourceAsStream("META-INF" + File.separator + filename);
properties.load(input); properties.load(input);
} catch(IOException e) { } catch(IOException e) {
throw new RuntimeException(e); throw new RuntimeException(e);