diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d1691c..75f94ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,30 +2,31 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for Social Data Indexer Smart Executor Plugin -## [v2.0.0-SNAPSHOT] +## [v.2.0.0-SNAPSHOT] -- Switched to new smart-executor APIs +- Ported plugin to smart-executor APIs 3.0.0 [#21570] -## [v1-2-1] - 2017-05-01 -- Minor fixes - +## [v.1.2.1] [2017-05-01] -## [v1-2-0] - 2017-02-01 +- Minor fixes + + +## [v.1.2.0] [2017-02-01] - Added notification mechanism in case of failures -## [v1-1-1] - 2016-10-20 +## [v.1.1.1] [2016-10-20] - Astyanax dependency version updated: moved to 2.0.2 (as declared by Portal-BOM) -## [v1-1-0] - 2016-07-01 +## [v.1.1.0] [2016-07-01] - Minor fix -## [v1-0-0] - 2016-02-29 +## [v.1.0.0] [2016-02-29] - First Release diff --git a/FUNDING.md b/FUNDING.md new file mode 100644 index 0000000..9e48b94 --- /dev/null +++ b/FUNDING.md @@ -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); diff --git a/README.md b/README.md index 14c119c..1fb0dda 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,19 @@ -# Smart Executor API +# Social Data Indexer Smart Executor Plugin -Smart Executor API is a library containing classes shared across smart-executor* components +Social Data Indexer Smart Executor Plugin ## Built With * [OpenJDK](https://openjdk.java.net/) - The JDK used * [Maven](https://maven.apache.org/) - Dependency Management -## Documentation - -[Smart Executor API](https://wiki.gcube-system.org/gcube/SmartExecutor) - ## Change log -See [Releases](https://code-repo.d4science.org/gCubeSystem/smart-executor-api/releases). +See [Releases](https://code-repo.d4science.org/gCubeSystem/social-data-indexer-se-plugin/releases). ## Authors +* **Costantino Perciante** ISTI-CNR * **Luca Frosini** ([ORCID](https://orcid.org/0000-0003-3183-2291)) - [ISTI-CNR Infrascience Group](http://nemis.isti.cnr.it/groups/infrascience) ## How to Cite this Software @@ -27,45 +24,24 @@ Tell people how to cite this software. @Manual{, - title = {Smart Executor API}, - author = {{Frosini, Luca}}, + title = {Social Data Indexer Smart Executor Plugin}, + author = {{Perciante, Costantino}, {Frosini, Luca}}, organization = {ISTI - CNR}, address = {Pisa, Italy}, year = 2019, url = {http://www.gcube-system.org/} } -## License +### License This project is licensed under the EUPL V.1.1 License - see the [LICENSE.md](LICENSE.md) file for details. ## About the gCube Framework + This software is part of the [gCubeFramework](https://www.gcube-system.org/ "gCubeFramework"): an 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 including: - -- 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); - - +The projects leading to this software have received funding from a series of European Union programmes see [FUNDING.md](FUNDING.md) diff --git a/pom.xml b/pom.xml index 5519f2e..4579ec6 100644 --- a/pom.xml +++ b/pom.xml @@ -58,12 +58,12 @@ org.gcube.socialnetworking social-data-indexing-common - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [1.0.0, 2.0.0-SNAPSHOT) org.gcube.portal social-networking-library - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [1.0.0, 2.0.0-SNAPSHOT) org.elasticsearch @@ -89,7 +89,7 @@ org.gcube.common.portal portal-manager - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + [2.0.0, 3.0.0-SNAPSHOT) org.gcube.vremanagement @@ -98,7 +98,7 @@ org.gcube.dvos usermanagement-core - [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) + [2.0.0, 3.0.0-SNAPSHOT) com.liferay.portal @@ -129,7 +129,7 @@ com.sun.mail javax.mail - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [1.0.0, 2.0.0-SNAPSHOT) @@ -144,7 +144,6 @@ ${apache.http.version} - diff --git a/src/test/resources/META-INF/plugin.properties b/src/test/resources/META-INF/plugin.properties new file mode 100644 index 0000000..2a50335 --- /dev/null +++ b/src/test/resources/META-INF/plugin.properties @@ -0,0 +1,4 @@ +groupId=org.gcube.socialnetworking +artifactId=social-data-indexer-se-plugin +version=2.0.0-SNAPSHOT +description=Social Data Indexer Smart Executor Plugin \ No newline at end of file