From 4728abe4129d66cc74355a2c9410590d01e6cb1a Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Tue, 22 Jun 2021 10:24:37 +0200
Subject: [PATCH] moved to 6.27.1-SNAPSHOT. Including ws-tree bug fix #21575

---
 .classpath                                    |   6 +-
 .../com.gwtplugins.gdt.eclipse.core.prefs     |   2 +-
 .settings/org.eclipse.wst.common.component    | 140 ++++++++++++++++--
 CHANGELOG.md                                  |   4 +
 pom.xml                                       |   4 +-
 src/test/resources/.gitignore                 |  11 ++
 6 files changed, 149 insertions(+), 18 deletions(-)

diff --git a/.classpath b/.classpath
index f5abf1a..138a2cb 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**" kind="src" output="target/workspace-6.27.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/workspace-6.27.1-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -22,7 +22,7 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="target/workspace-6.27.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/workspace-6.27.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -35,5 +35,5 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/workspace-6.27.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/workspace-6.27.1-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index c00ed49..0e13e06 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/francescomangiacrapa/git/workspace/target/workspace-6.27.0-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.27.1-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 8d1d729..bd6dc80 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,13 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                              
+                                                                              
     
     
     
     
     
     
-    <wb-module deploy-name="workspace-6.27.0-SNAPSHOT">
-                                                                
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <wb-module deploy-name="workspace-6.27.1-SNAPSHOT">
+                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -15,7 +39,19 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                            
+                                                                                                                                                            
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -23,7 +59,19 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                
+                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -31,21 +79,53 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                                                        
+                                                                                                                                                        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                        
-        
+                                                
         
         
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                            
+        <dependent-module archiveName="workspace-explorer-2.2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-explorer/workspace-explorer">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="catalogue-util-library-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/catalogue-util-library/catalogue-util-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="ws-task-executor-widget-1.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ws-task-executor-widget-TRUNK/ws-task-executor-widget-TRUNK">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+                                                                                                                                                            
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -53,7 +133,19 @@
         
         
         <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
-                                                                
+                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -61,7 +153,19 @@
         
         
         <property name="context-root" value="workspace"/>
-                                                          
+                                                                                                                                                          
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -69,7 +173,19 @@
     
     
     </wb-module>
-                            
+                                                                            
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d4b91c..b5f74a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 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).
 
+## [v6.27.1-SNAPSHOT] - 2021-06-22
+
+[#21575] Including ws-tree bug fix
+
 ## [v6.27.0] - 2021-05-10
 
 [#21387] Harmonized version of jackson libs to 2.8.11 to resolve conflict
diff --git a/pom.xml b/pom.xml
index 653caa9..ea24ec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace</artifactId>
 	<packaging>war</packaging>
-	<version>6.27.0</version>
+	<version>6.27.1-SNAPSHOT</version>
 	<name>gCube Workspace Portlet</name>
 	<description>
 		gCube Workspace Portlet is a web-gui to manage the gCube workspace, a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. 
@@ -46,7 +46,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>3.6.2</version>
+				<version>3.6.2-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/src/test/resources/.gitignore b/src/test/resources/.gitignore
index 1905434..26bce6e 100644
--- a/src/test/resources/.gitignore
+++ b/src/test/resources/.gitignore
@@ -5,3 +5,14 @@
 /pred4s.gcubekey
 /preprod.gcubekey
 /devVRE.gcubekey
+/CNR.it.gcubekey
+/D4OS.gcubekey
+/D4Research.gcubekey
+/FARM.gcubekey
+/ISTI.gcubekey
+/OpenAIRE.gcubekey
+/ParthenosVO.gcubekey
+/SmartArea.gcubekey
+/SoBigData.gcubekey
+/d4science.research-infrastructures.eu.gcubekey
+/gCubeApps.gcubekey