From 0061188d52d865c016f8ab732c0d15f95fb60c76 Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Thu, 10 Dec 2020 12:02:12 +0100
Subject: [PATCH 1/3] Excluded gcube 5 components

---
 pom.xml | 126 ++++++++++++++++++++------------------------------------
 1 file changed, 45 insertions(+), 81 deletions(-)

diff --git a/pom.xml b/pom.xml
index c5dee77..38e856f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-service</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.2-SNAPSHOT</version>
 	<name>Geoportal Service</name>
 	<packaging>war</packaging>
 
@@ -47,22 +47,30 @@
 
 
 		<!-- SMARTGEARS -->
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.gcube.core</groupId> -->
-<!-- 			<artifactId>common-smartgears-app</artifactId> -->
-<!-- 			<exclusions> -->
-<!-- 				<exclusion> -->
-<!-- 					<groupId>org.javassist</groupId> -->
-<!-- 					<artifactId>javassist</artifactId> -->
-<!-- 				</exclusion> -->
-<!-- 			</exclusions> -->
-<!-- 		</dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.gcube.core</groupId> -->
+		<!-- <artifactId>common-smartgears-app</artifactId> -->
+		<!-- <exclusions> -->
+		<!-- <exclusion> -->
+		<!-- <groupId>org.javassist</groupId> -->
+		<!-- <artifactId>javassist</artifactId> -->
+		<!-- </exclusion> -->
+		<!-- </exclusions> -->
+		<!-- </dependency> -->
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-smartgears</artifactId>
 		</dependency>
 
 
+		<!-- REMOVE FROM GCUBE 5 -->
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-gcube-calls</artifactId>
+			<version>[1.0.0,1.2.0)</version>
+		</dependency>
+
+
 		<!-- JERSEY -->
 
 		<dependency>
@@ -97,7 +105,7 @@
 			<groupId>org.gcube.application</groupId>
 			<artifactId>geoportal-logic</artifactId>
 			<version>[1.0.4-SNAPSHOT,2.0.0)</version>
-			
+
 		</dependency>
 
 
@@ -112,30 +120,21 @@
 
 
 		<!-- Used to write centroids -->
-		<!-- <dependency>
-			<groupId>net.postgis</groupId>
-			<artifactId>postgis-jdbc</artifactId>
-			<version>2.5.0</version>
-		</dependency> -->
+		<!-- <dependency> <groupId>net.postgis</groupId> <artifactId>postgis-jdbc</artifactId> 
+			<version>2.5.0</version> </dependency> -->
 
 
 
 		<!-- jackson java time -->
 		<!-- Serialization from library -->
-		<!-- <dependency>
-			<groupId>com.fasterxml.jackson.datatype</groupId>
-			<artifactId>jackson-datatype-jsr310</artifactId>
-			<version>2.8.8</version>
-		</dependency> -->
+		<!-- <dependency> <groupId>com.fasterxml.jackson.datatype</groupId> <artifactId>jackson-datatype-jsr310</artifactId> 
+			<version>2.8.8</version> </dependency> -->
 
 
 		<!-- GPKG -->
 		<!-- Read Geopackage -->
-		<!-- <dependency>
-			<groupId>mil.nga.geopackage</groupId>
-			<artifactId>geopackage</artifactId>
-			<version>3.5.0</version>
-		</dependency> -->
+		<!-- <dependency> <groupId>mil.nga.geopackage</groupId> <artifactId>geopackage</artifactId> 
+			<version>3.5.0</version> </dependency> -->
 
 
 
@@ -143,53 +142,26 @@
 
 		<!-- gCube SW -->
 
-		<!-- <dependency>
-			<groupId>org.gcube.spatial.data</groupId>
-			<artifactId>sdi-library</artifactId>
-			<version>[1.0.0,2.0.0)</version>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.data.transfer</groupId>
-			<artifactId>data-transfer-library</artifactId>
-			<version>[1.2.1,2.0.0]</version>
-		</dependency>
-
-
-		<dependency>
-			<groupId>org.gcube.spatial.data</groupId>
-			<artifactId>gis-interface</artifactId>
-			<version>[2.4.0,3.0.0)</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.spatial.data</groupId>
-			<artifactId>geonetwork</artifactId>
-			<version>[3.4.3,4.0.0)</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>storagehub-client-library</artifactId>
-			<version>[1.0.0,2.0.0)</version>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.gcube.spatial.data</groupId> <artifactId>sdi-library</artifactId> 
+			<version>[1.0.0,2.0.0)</version> </dependency> <dependency> <groupId>org.gcube.data.transfer</groupId> 
+			<artifactId>data-transfer-library</artifactId> <version>[1.2.1,2.0.0]</version> 
+			</dependency> <dependency> <groupId>org.gcube.spatial.data</groupId> <artifactId>gis-interface</artifactId> 
+			<version>[2.4.0,3.0.0)</version> </dependency> <dependency> <groupId>org.gcube.spatial.data</groupId> 
+			<artifactId>geonetwork</artifactId> <version>[3.4.3,4.0.0)</version> </dependency> 
+			<dependency> <groupId>org.gcube.common</groupId> <artifactId>storagehub-client-library</artifactId> 
+			<version>[1.0.0,2.0.0)</version> </dependency> -->
 
 
 		<!-- HIBERNATE -->
-		<!-- <dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<version>5.3.1.Final</version>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> 
+			<version>5.3.1.Final</version> </dependency> -->
 
 
 		<!-- SIS -->
 
 
-		<!-- <dependency>
-			<groupId>org.apache.sis.core</groupId>
-			<artifactId>sis-referencing</artifactId>
-			<version>${sis.version}</version>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.apache.sis.core</groupId> <artifactId>sis-referencing</artifactId> 
+			<version>${sis.version}</version> </dependency> -->
 
 		<!-- Common - basic -->
 		<dependency>
@@ -204,20 +176,16 @@
 		</dependency>
 
 		<!-- TEST -->
-		
+
 		<dependency>
 			<groupId>org.glassfish.jersey.test-framework.providers</groupId>
 			<artifactId>jersey-test-framework-provider-simple</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
-		
-		<!-- <dependency>
-			<groupId>org.eclipse.persistence</groupId>
-			<artifactId>eclipselink</artifactId>
-			<version>2.5.0</version>
-			<scope>test</scope>
-		</dependency> -->
+
+
+		<!-- <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> 
+			<version>2.5.0</version> <scope>test</scope> </dependency> -->
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -238,12 +206,8 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- <dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.8.3.0</version>
-			<scope>test</scope>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> 
+			<version>10.8.3.0</version> <scope>test</scope> </dependency> -->
 
 	</dependencies>
 	<repositories>
-- 
2.17.1


From a9a449c2fa4e8b5216b057ebe4716fb79d49dbdf Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Thu, 10 Dec 2020 12:02:24 +0100
Subject: [PATCH 2/3] Delete method

---
 CHANGELOG.md                                     |  5 +++++
 .../geoportal/service/rest/Projects.java         | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a43ad..e6b45e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for org.gcube.application.geoportal-service
 
+## [v1.0.2-SNAPSHOT] 2020-11-11
+Delete method
+Excluded upper bound release gCube 5
+
+
 ## [v1.0.1] 2020-11-11
 
 Project interface
diff --git a/src/main/java/org/gcube/application/geoportal/service/rest/Projects.java b/src/main/java/org/gcube/application/geoportal/service/rest/Projects.java
index b4c481e..668c52a 100644
--- a/src/main/java/org/gcube/application/geoportal/service/rest/Projects.java
+++ b/src/main/java/org/gcube/application/geoportal/service/rest/Projects.java
@@ -110,6 +110,22 @@ public class Projects {
 		return toReturn;
 	}
 
+	
+	// DELETE BY ID
+		@GET
+		@Produces(MediaType.APPLICATION_JSON)
+		@Path("{"+InterfaceConstants.Parameters.PROFILE_ID+"}/{"+InterfaceConstants.Parameters.PROJECT_ID+"}")
+		public void delete(@PathParam(InterfaceConstants.Parameters.PROFILE_ID) String profile,
+				@PathParam(InterfaceConstants.Parameters.PROJECT_ID) String id) {
+			new GuardedMethod<Project>() {
+				@Override
+				protected Project run() throws Exception ,WebApplicationException{
+					// TODO DELETE
+					return null;
+				}
+			}.execute().getResult();
+		}
+	
 	@PUT	
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-- 
2.17.1


From a971a0467709573272473529cfaf0c2fdcfa820a Mon Sep 17 00:00:00 2001
From: Fabio Sinibaldi <fabio.sinibaldi@isti.cnr.it>
Date: Thu, 10 Dec 2020 12:06:09 +0100
Subject: [PATCH 3/3] release

---
 CHANGELOG.md | 2 +-
 pom.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6b45e4..20462b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 # Changelog for org.gcube.application.geoportal-service
 
-## [v1.0.2-SNAPSHOT] 2020-11-11
+## [v1.0.2] 2020-11-11
 Delete method
 Excluded upper bound release gCube 5
 
diff --git a/pom.xml b/pom.xml
index 38e856f..0ad09df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-service</artifactId>
-	<version>1.0.2-SNAPSHOT</version>
+	<version>1.0.2</version>
 	<name>Geoportal Service</name>
 	<packaging>war</packaging>
 
-- 
2.17.1