Merge remote-tracking branch 'origin/master'

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
 

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);
+    - D4Science (grant no. 212488);
-- the H2020 research and innovation programme and D4Science.org
+    - D4Science-II (grant no.239019);
-    - 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) 
+    - 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

@@ -10,7 +10,7 @@
     <fileSets>
         <fileSet>
             <directory>.</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>${file.separator}</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
             <includes>
                 <include>README.md</include>
@@ -23,8 +23,8 @@
     </fileSets>
     <files>
         <file>
-            <source>target/${build.finalName}.${project.packaging}</source>
+            <source>target${file.separator}${build.finalName}.${project.packaging}</source>
-            <outputDirectory>/${artifactId}</outputDirectory>
+            <outputDirectory>${file.separator}${artifactId}</outputDirectory>
         </file>
     </files>
 </assembly>