From b682e8a41489dffc406a502ec7385e1edcc19e3e Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 4 Oct 2019 16:46:07 +0200 Subject: [PATCH 1/3] Added file separator in place of / in descriptor.xml to be cross-platform compliant --- gCubeComponents/descriptor.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gCubeComponents/descriptor.xml b/gCubeComponents/descriptor.xml index 844962e..6ca7b76 100644 --- a/gCubeComponents/descriptor.xml +++ b/gCubeComponents/descriptor.xml @@ -10,7 +10,7 @@ . - / + ${file.separator} true README.md @@ -23,8 +23,8 @@ - target/${build.finalName}.${project.packaging} - /${artifactId} + target${file.separator}${build.finalName}.${project.packaging} + ${file.separator}${artifactId} \ No newline at end of file From 65b04f1c4beeca93fe5c7de3b125647291205dc9 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 4 Oct 2019 16:47:11 +0200 Subject: [PATCH 2/3] Removed remained === --- gCubeComponents/LICENSE.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/gCubeComponents/LICENSE.md b/gCubeComponents/LICENSE.md index 4b821d4..3af0507 100644 --- a/gCubeComponents/LICENSE.md +++ b/gCubeComponents/LICENSE.md @@ -292,8 +292,6 @@ This licence shall be governed by the Belgian law if: - or registered office inside a European Union country. -=== - ## Appendix From 0a38c8a5631a1a7198b54aeadeadd91b541c9401 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Fri, 4 Oct 2019 16:52:23 +0200 Subject: [PATCH 3/3] Fixed EU project structure and order --- gCubeComponents/README.md | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gCubeComponents/README.md b/gCubeComponents/README.md index 674e514..f9933a5 100644 --- a/gCubeComponents/README.md +++ b/gCubeComponents/README.md @@ -60,11 +60,24 @@ 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); + - 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), EUBrazilOpenBio (grant no. 288754), iMarine(grant no. 283644); -- the H2020 research and innovation programme and D4Science.org - - BlueBRIDGE (grant no. 675680), EGIEngage (grant no. 654142), ENVRIplus (grant no. 654182), Parthenos (grant no. 654119), SoBigData (grant no. 654024), DESIRA (grant no. 818194), ARIADNEplus (grant no. 823914), RISIS2 (grant no. 824091), PerformFish (grant no. 727610), AGINFRAplus (grant no. 731001) + - 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); ## Acknowledgments