gCubeComponents/CHANGELOG.md

@@ -1,24 +1,37 @@
-This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
 # Changelog for "project name"
 
 ## [Unreleased]
-- description [#TICKET_NUMBER]
-- description [#TICKET_NUMBER]
+- description (link to related issue on redmine)
+- description (link to related issue on redmine)
 - ...
 
-## [v1.1.0] - 2020-01-31
-
-- description [#TICKET_NUMBER]
-- description [#TICKET_NUMBER]
-- description [#TICKET_NUMBER]
-- description [#TICKET_NUMBER]
-- description [#TICKET_NUMBER]
+## [v1.1.0] [r4.19.0] - 2020-01-31
+### New Features
+- description (link to related issue on redmine)
+- description (link to related issue on redmine)
+- description (link to related issue on redmine)
 - ...
 
-## [v1.0.0] - 2019-10-20
-- description [#TICKET_NUMBER]
-- description [#TICKET_NUMBER]
-- description [#TICKET_NUMBER]
-- description [#TICKET_NUMBER]
+### Enhancements
+- description (link to related issue on redmine)
 - ...
+- ...
+
+### Fixes
+- description (link to related issue on redmine)
+- ...
+- ...
+
+## [v1.0.0] [r4.15.0] - 2019-10-20
+### New Features
+- description (link to related issue on redmine)
+- description (link to related issue on redmine)
+- description (link to related issue on redmine)
+- ...
+
+### Fixes
+- description (link to related issue on redmine)
+- ...
+- ...
+
+This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

gCubeComponents/FUNDING.md

@@ -1,26 +0,0 @@
-# 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);

gCubeComponents/README.md

@@ -57,7 +57,28 @@ 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)
+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);
+
 
 ## Acknowledgments
  

gCubeComponents/descriptor.xml

@@ -16,7 +16,6 @@
                 <include>README.md</include>
                 <include>LICENSE.md</include>
                 <include>CHANGELOG.md</include>
-                <include>FUNDING.md</include>
                 <include>profile.xml</include>
             </includes>
             <fileMode>755</fileMode>