diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 680c947..f140c11 100644
--- a/.settings/com.gwtplugins.gdt.eclipse.core.prefs
+++ b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
@@ -1,4 +1,4 @@
 eclipse.preferences.version=1
-lastWarOutDir=/home/francesco/git/species-discovery/target/species-discovery-3.10.0
+lastWarOutDir=/home/francescomangiacrapa/git/species-discovery/target/species-discovery-3.10.0
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/changelog.md b/CHANGELOG.md
similarity index 68%
rename from changelog.md
rename to CHANGELOG.md
index e9ec1d7..f21ffc3 100644
--- a/changelog.md
+++ b/CHANGELOG.md
@@ -3,37 +3,37 @@
 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).
 
-## [v3-10-0] [r4-23-0] - 2020-05-22
+## [v3.11.0] - 27-10-2021
 
-[#19221] Ported to git/jenkins
+- [#21969] Removed HL dependency
+- Ported to maven-portal-bom v3.6.3
+- Ported to workspace-explorer 2.X.Y
 
-**Fixes**
+## [v3.10.0] - 22-05-2020
 
-[#19312] the WorkspaceExplorer window appears behind the Job Window (z-index issue)
+- [#19221] Migrateto git/jenkins
 
+#### Fixes
+- [#19312] the WorkspaceExplorer window appears behind the Job Window (z-index issue)
 
-
-## [3-9-1] - [20-03-2017]
+## [v3.9.1] - 20-03-2017
 
 [Bug #7568] Managed ASL session expiration during polling on SPD jobs
 
 
-
-## [3-9-0] - [11-01-2016]
+## [v3.9.0] - 11-01-2016
 
 [Feature #6313] SPD portlet upgrade: porting to spd-client-library 4.0.0
 
 [Task #7001] Create Gis Layer via job
 
 
-
-## [3-8-1] - [15-09-2016]
+## [v3.8.1] - 15-09-2016
 
 Removed Gis -viewer dependency
 
 
-
-## [3-8-0] - [15-05-2015]
+## [v3.8.0] - 15-05-2015
 
 Upgraded to gwt 2.6.1
 
@@ -42,86 +42,73 @@ Integrated with Workspace Explorer
 Updated to Liferay 6.2
 
 
-
-## [3-7-2] - [15-05-2015]
+## [v3.7.2] - 15-05-2015
 
 Changed dateformat at dd-MM-yyyy
 
 
-
-## [3-7-1] - [09-12-2014]
+## [v3.7.1] - 09-12-2014
 
 Removed openlayers dependency from pom
 
 
-
-## [3-7-0] - [04-06-2014]
+## [v3.7.0] - 04-06-2014
 
 Updated pom to support new portal configuration (gcube release 3.2)
 
 
-
-## [3-6-0] - [23-04-2014]
+## [v3.6.0] - 23-04-2014
 
 Portlet updated to support service updating
 
 
-
-## [3-5-0] - [24-10-2013]
+## [v3.5.0] - 24-10-2013
 
 Portlet updated to support GWT 2.5.1
 
 Ticket 2224: was implemented
 
 
-
-## [3-4-0] - [06-09-2013]
+## [v3.4.0] - 06-09-2013
 
 Enhancements on GUI of SPD portlet was realized (view last query, new expand button are available)
 
 The functionalities was updated in order to fit the changes in the service client. New advanced options are now available: "Expand with synonyms", "Unfold the taxa group by".
 
 
-
-## [3-3-0] - [09-07-2013]
+## [v3.3.0] - 09-07-2013
 
 Bug Fixed: on species classification
 
 
-
-## [3-2-0] - [29-05-2013]
+## [v3.2.0] - 29-05-2013
 
 Bug Fixed: #612 (SPD: Error when saving csv file in workspace)
 
 
-
-## [3-1-0] - [14-04-2013]
+## [v3.1.0] - 14-04-2013
 
 Synch with SPD service changes
 
 
-
-## [3-0-0] - [05-03-2013]
+## [v3.0.0] - 05-03-2013
 
 Ticket #1260: This component has been mavenized
 
 
-
-## [2-3-0] - [17-01-2013]
+## [v2.3.0] - 17-01-2013
 
 Ticket #986: Species Occurrence jobs / Re-submit job and "info"
 
 Ticket #1002: SPD portlet persistence refactoring
 
 
-
-## [2-2-0] - [30-11-2012]
+## [v2.2.0] - 30-11-2012
 
 Ticket #508: Implementation of requirements resulting from ticket #508
 
 
-
-## [2-0-0] - [13-09-2012]
+## [v2.0.0] - 13-09-2012
 
 Ticket #81: Implementation of requirements resulting from user feedback
 
@@ -130,15 +117,11 @@ Dynamic clustering of result set items
 Revised the occurrence points visualization strategy through the GIS Viewer
 
 
-
-## [1-0-1] - [23-07-2012]
+## [v1.0.1] - 23-07-2012
 
 Fixed 447: Map generation fails in Species Discovery Portlet
 
 
-
-## [1-0-0] - [04-05-2012]
+## [v1.0.0] - 04-05-2012
 
 First release
-
-
diff --git a/SpeciesDiscoveryTest-dev.launch b/SpeciesDiscoveryTest-dev.launch
deleted file mode 100644
index 546b1d2..0000000
--- a/SpeciesDiscoveryTest-dev.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.google.gwt.eclipse.core.launch.gwtJUnit">
-<stringAttribute key="com.google.gwt.eclipse.core.LOG_LEVEL" value="INFO"/>
-<booleanAttribute key="com.google.gwt.eclipse.core.NOT_HEADLESS" value="false"/>
-<stringAttribute key="com.google.gwt.eclipse.core.OUT_DIR" value="www-test"/>
-<booleanAttribute key="com.google.gwt.eclipse.core.STANDARDS_MODE" value="false"/>
-<stringAttribute key="com.google.gwt.eclipse.core.STYLE" value="OBFUSCATED"/>
-<stringAttribute key="com.google.gwt.eclipse.core.WEB_MODE" value="false"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/speciesdiscovery/src/test/java/org/gcube/portlets/user/speciesdiscovery/client/GwtTestSpeciesDiscovery.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.speciesdiscovery.client.GwtTestSpeciesDiscovery"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="speciesdiscovery"/>
-</launchConfiguration>
diff --git a/SpeciesDiscoveryTest-prod.launch b/SpeciesDiscoveryTest-prod.launch
deleted file mode 100644
index f4cb15a..0000000
--- a/SpeciesDiscoveryTest-prod.launch
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="com.google.gwt.eclipse.core.launch.gwtJUnit">
-<stringAttribute key="com.google.gwt.eclipse.core.LOG_LEVEL" value="INFO"/>
-<booleanAttribute key="com.google.gwt.eclipse.core.NOT_HEADLESS" value="false"/>
-<stringAttribute key="com.google.gwt.eclipse.core.OUT_DIR" value="www-test"/>
-<booleanAttribute key="com.google.gwt.eclipse.core.STANDARDS_MODE" value="false"/>
-<stringAttribute key="com.google.gwt.eclipse.core.STYLE" value="OBFUSCATED"/>
-<stringAttribute key="com.google.gwt.eclipse.core.WEB_MODE" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/speciesdiscovery/src/test/java/org/gcube/portlets/user/speciesdiscovery/client/GwtTestSpeciesDiscovery.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="com.google.gdt.eclipse.maven.mavenClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.gcube.portlets.user.speciesdiscovery.client.GwtTestSpeciesDiscovery"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="speciesdiscovery"/>
-</launchConfiguration>
diff --git a/pom.xml b/pom.xml
index 1996104..326dd9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.0</version>
+				<version>3.6.3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -170,7 +170,7 @@
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>workspace-explorer</artifactId>
-			<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
+			<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 			<exclusions>
 				<exclusion>
@@ -252,16 +252,16 @@
 		</dependency>
 
 		<!-- HOME LIBRARY -->
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library-jcr</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.gcube.common</groupId>
-			<artifactId>home-library</artifactId>
-			<scope>provided</scope>
-		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.gcube.common</groupId> -->
+		<!-- <artifactId>home-library-jcr</artifactId> -->
+		<!-- <scope>provided</scope> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>org.gcube.common</groupId> -->
+		<!-- <artifactId>home-library</artifactId> -->
+		<!-- <scope>provided</scope> -->
+		<!-- </dependency> -->
 
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>
@@ -280,24 +280,20 @@
 			<scope>provided</scope>
 		</dependency>
 
-
 		<!-- LOGGER -->
-
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<scope>runtime</scope>
+			<!-- <version>1.6.4</version> -->
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<scope>runtime</scope>
+			<!-- <version>1.6.4</version> -->
+			<scope>provided</scope>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>