From cba13c365f86bbdbf570045fbb2e0c8eb8fa4727 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Thu, 14 Oct 2021 10:52:38 +0200
Subject: [PATCH] added .gitignore for resolving conflict

---
 .settings/.gitignore | 1 +
 CHANGELOG.md         | 2 +-
 pom.xml              | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 .settings/.gitignore

diff --git a/.settings/.gitignore b/.settings/.gitignore
new file mode 100644
index 0000000..5a6a423
--- /dev/null
+++ b/.settings/.gitignore
@@ -0,0 +1 @@
+/org.eclipse.wst.common.component
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7912a35..4575e84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v2.0.0-SNAPSHOT] - 2021-07-30
+## [v2.0.0] - 2021-07-30
 
 #### Enhancements
 
diff --git a/pom.xml b/pom.xml
index aefd6e0..acc10fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>geoportal-data-viewer-app</artifactId>
 	<packaging>war</packaging>
-	<version>2.0.0-SNAPSHOT</version>
+	<version>2.0.0</version>
 	<name>GeoPortal Data Viewer App</name>
 	<description>The GeoPortal Data Viewer App is an application to access, discovery and navigate the GeoNa products by a Web-Map Interface</description>
 
@@ -54,7 +54,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.3-SNAPSHOT</version>
+				<version>3.6.3</version>
 				<type>pom</type>
 				<scope>import</scope>
 				<exclusions>