From 38ff01af52efd37bf8ddf36f8a309010cd1dbbc7 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Thu, 3 Sep 2020 16:23:19 +0200
Subject: [PATCH] gCube Project Template

---
 CHANGELOG.md          |  2 +-
 FUNDING.md            | 26 ++++++++++++++++++++++++++
 distro/changelog.xml  | 16 ----------------
 distro/descriptor.xml | 30 ------------------------------
 distro/gcube-app.xml  | 11 -----------
 distro/profile.xml    | 27 ---------------------------
 pom.xml               | 22 ++--------------------
 7 files changed, 29 insertions(+), 105 deletions(-)
 create mode 100644 FUNDING.md
 delete mode 100644 distro/changelog.xml
 delete mode 100644 distro/descriptor.xml
 delete mode 100644 distro/gcube-app.xml
 delete mode 100644 distro/profile.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff77e5c..c7e3a51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog for org.gcube.data.transfer.data-transfer-service
 
-## Unreleased [v2.0.7-SNAPSHOT] [r5.0.0] 2020-07-16
+## Unreleased [v2.0.7-SNAPSHOT] 2020-07-16
 
 ### Fixes
 
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/distro/changelog.xml b/distro/changelog.xml
deleted file mode 100644
index c9e5fed..0000000
--- a/distro/changelog.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<ReleaseNotes>
-	<Changeset component="data-transfer-service-1.0.0" date="2016-02-22">
-		<Change>First Release</Change>
-	</Changeset>
-	<Changeset component="data-transfer-service-1.1.0" date="2016-09-09">
-		<Change>Added Destination</Change>
-		<Change>Added Plugin</Change>
-	</Changeset>
-	<Changeset component="data-transfer-service-1.2.0" date="2016-10-29">
-		<Change>Improved plugin management</Change>
-		<Change>Endorsed decompress-plugin</Change>		
-	</Changeset>
-	<Changeset component="data-transfer-service-2.0.3" date="2016-10-29">
-		<Change>Added REST interface for upload/download/getFileDescriptor</Change>				
-	</Changeset>
-</ReleaseNotes>
\ No newline at end of file
diff --git a/distro/descriptor.xml b/distro/descriptor.xml
deleted file mode 100644
index dc46ade..0000000
--- a/distro/descriptor.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<assembly
-	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-	<id>servicearchive</id>
-	<formats>
-		<format>tar.gz</format>
-	</formats>
-	<baseDirectory>/</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<directory>${distroDirectory}</directory>
-			<outputDirectory>/</outputDirectory>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>README</include>
-				<include>LICENSE</include>
-				<include>changelog.xml</include>
-			</includes>
-			<fileMode>755</fileMode>
-			<filtered>true</filtered>
-		</fileSet>
-	</fileSets>
-	<files>
-		<file>
-			<source>target/${build.finalName}.${project.packaging}</source>
-			<outputDirectory>/${artifactId}</outputDirectory>
-		</file>
-	</files>
-</assembly>
\ No newline at end of file
diff --git a/distro/gcube-app.xml b/distro/gcube-app.xml
deleted file mode 100644
index e3adfda..0000000
--- a/distro/gcube-app.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<application mode='online'>
-		<name>data-transfer-service</name>
-		<group>DataTransfer</group>
-		<version>${version}</version>
-		<description>Data Tansfer Service</description>
-		<!--  <servlets>
-			<servlet name="org.gcube.data.analysis.rconnector.RConnector" entryPointName="connector"/>
-		</servlets> -->
-		<local-persistence location='target' />
-</application>
-
diff --git a/distro/profile.xml b/distro/profile.xml
deleted file mode 100644
index 0e4e15c..0000000
--- a/distro/profile.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<ID />
-	<Type>Service</Type>
-	<Profile>
-		<Description>${description}</Description>
-		<Class>DataTransfer</Class>
-		<Name>${artifactId}</Name>
-		<Version>1.0.0</Version>
-		<Packages>
-			<Software>
-				<Name>${artifactId}</Name>
-				<Version>${version}</Version>
-				<MavenCoordinates>
-					<groupId>${groupId}</groupId>
-					<artifactId>${artifactId}</artifactId>
-					<version>${version}</version>
-				</MavenCoordinates>
-				<Files>
-					<File>${build.finalName}.jar</File>
-				</Files>
-			</Software>
-		</Packages>
-	</Profile>
-</Resource>
-
-
diff --git a/pom.xml b/pom.xml
index fda52b9..508b934 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,7 @@
 	<name>DataTransferService</name>
 
 
-	<properties>
-		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
-		<distroDirectory>${project.basedir}/distro</distroDirectory>
-		<jersey-version>2.14</jersey-version>
-		<jersey-cdi-version>2.14</jersey-cdi-version>
-		<weld-version>2.2.4.Final</weld-version>
+	<properties>	
 		<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
 	</properties>
 
@@ -128,25 +123,12 @@
 			<artifactId>jersey-media-json-jackson</artifactId>
 		</dependency>
 
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.glassfish.jersey.media</groupId> -->
-<!-- 			<artifactId>jersey-media-moxy</artifactId> -->
-<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-multipart</artifactId>
 		</dependency>
 
-
-<!-- 		<dependency> -->
-<!-- 			<groupId>com.fasterxml.jackson.core</groupId> -->
-<!-- 			<artifactId>jackson-core</artifactId> -->
-<!-- 			<version>2.8.4</version> -->
-<!-- 			<scope>compile</scope> -->
-			
-<!-- 		</dependency> -->
-
 		<!-- test -->
 
 		<dependency>
@@ -175,5 +157,5 @@
 		<finalName>${project.artifactId}</finalName>
 	</build>
 
-	<description>Service used to receive data from other hosting nodes</description>
+	<description>Service used to transfer data from/to SmartGears nodes</description>
 </project>
\ No newline at end of file