From cc86c02b7fccb530e80fa84b34008275d4ab4194 Mon Sep 17 00:00:00 2001
From: "luca.frosini" <luca.frosini@isti.cnr.it>
Date: Mon, 27 Feb 2017 10:32:13 +0000
Subject: [PATCH] Fixed changelog. Merged from Release 4.3.0

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry@144341 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml | 18 +++++++++++++++++-
 pom.xml              |  8 ++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 12698b6..d187f8a 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE xml>
 <ReleaseNotes>
-	<Changeset component="org.gcube.information-system.resource-registry.1-0-0" date="${buildDate}">
+	<Changeset component="org.gcube.information-system.resource-registry.1-3-0" date="${buildDate}">
+		<Change>Added API Remove From Context</Change>
+		<Change>Added API to support Entity-Relation navigation</Change>
+		<Change>Added API to get the list of ER types and their own schema</Change>
+		<Change>Added support for Propagation Constraint</Change>
+		<Change>Added ResourceRegistryException serialization</Change>
+		<Change>Full Code Redesign</Change>
+	</Changeset>
+	<Changeset component="org.gcube.information-system.resource-registry.1-2-0" date="2016-12-16">
+		<Change>Added API AddToContext</Change>
+		<Change>Added support for referentail Integrity Directive</Change>
+		<Change>Added API to support update Resource (with all facets)</Change>
+	</Changeset>
+	<Changeset component="org.gcube.information-system.resource-registry.1-1-0" date="2016-11-03">
+		<Change>Improved code quality</Change>
+	</Changeset>
+	<Changeset component="org.gcube.information-system.resource-registry.1-0-0" date="2016-07-27">
 		<Change>First Release</Change>	
 	</Changeset>
 </ReleaseNotes>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 80f22d3..c2e7e03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
 			<artifactId>common-smartgears-app</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>authorization-client</artifactId>
@@ -103,13 +103,13 @@
 			<artifactId>javax.ws.rs-api</artifactId>
 			<version>2.0.1</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.glassfish.jersey.containers</groupId>
 			<artifactId>jersey-container-servlet</artifactId>
 			<version>2.13</version>
 		</dependency>
- 		
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
@@ -183,7 +183,7 @@
 				<configuration>
 					<warName>resource-registry</warName>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<!--  webXml>src\main\webapp\WEB-INF\web.xml</webXml -->
+					<!-- webXml>src\main\webapp\WEB-INF\web.xml</webXml -->
 				</configuration>
 				<executions>
 					<execution>