diff --git a/.classpath b/.classpath
index 4317984..24bc4d8 100644
--- a/.classpath
+++ b/.classpath
@@ -8,12 +8,14 @@
 	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
 		<attributes>
+			<attribute name="test" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -23,7 +25,7 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</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">
 		<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 443e085..8db228c 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -5,4 +5,5 @@ org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.7
diff --git a/distro/changelog.xml b/distro/changelog.xml
index b2eae57..47fda4c 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,6 +1,6 @@
 <ReleaseNotes>
-	<Changeset component="org.gcube.socialnetworking.social-util-library.1-5-0"
-		date="2019-01-25">
+	<Changeset component="org.gcube.socialnetworking.social-util-library.1-6-0"
+		date="2019-03-29">
 		<Change>Revised social networking library mechanism for http links, mentions and hashtags recognition, #13207</Change>
 	</Changeset>
 	<Changeset component="org.gcube.socialnetworking.social-util-library.1-4-0"
diff --git a/pom.xml b/pom.xml
index 0735491..430d874 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.socialnetworking</groupId>
 	<artifactId>social-util-library</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.6.0-SNAPSHOT</version>
 	<name>social-util-library</name>
 	<description>
 	The social-util-library contains utility functions that can be used by the social-networking portlets.
@@ -24,8 +24,8 @@
 
 	<properties>
 		<distroDirectory>distro</distroDirectory>
-		<maven.compiler.source>1.7</maven.compiler.source>
-		<maven.compiler.target>1.7</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>