From 4caf0d2243f0bb4b9657d9ed29291bf6aa5d53cb Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 16 Jun 2017 09:38:15 +0000
Subject: [PATCH] Merged changes made in branch for release.

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry-client@150400 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                           | 2 +-
 .settings/org.eclipse.jdt.core.prefs | 3 ---
 distro/changelog.xml                 | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.classpath b/.classpath
index e43402f..fae1a2b 100644
--- a/.classpath
+++ b/.classpath
@@ -22,7 +22,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index ec4300d..4ede96d 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,2 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
diff --git a/distro/changelog.xml b/distro/changelog.xml
index f7920a8..ad4392a 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -3,7 +3,7 @@
 <ReleaseNotes>
 	<Changeset component="org.gcube.information-system.resource-registry-client.1-3-0" date="${buildDate}">
 		<Change>Removed common-generic-clients, common-gcube-calls and common-fw-clients from dependencies</Change>
-		<Change>The client is now a generic http-client (using HTTPCall class provided in API) autoquery th old is to get resource-registry isntance. It is not implement as gcube-proxy</Change>
+		<Change>The client is now a generic http-client (using HTTPCall class provided in API) autoquery th old is to get resource-registry instance. It is not implement as gcube-proxy anymore.</Change>
 		<Change>Added exists() method which uses HEAD HTTP method to get existence from Resource Registry</Change>
 	</Changeset>
 	<Changeset component="org.gcube.information-system.resource-registry-client.1-2-0" date="2017-03-16">