From 9c113f2c9c97743fdfabd0a0127ac3012535d7b9 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 5 Sep 2022 14:10:34 +0200
Subject: [PATCH] Including fixes #23676, #23789 implemented in the ws-tree

---
 .classpath                                    |  6 +--
 .../com.gwtplugins.gdt.eclipse.core.prefs     |  2 +-
 .settings/org.eclipse.wst.common.component    | 48 ++++++++++++++-----
 CHANGELOG.md                                  |  4 ++
 pom.xml                                       |  4 +-
 5 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/.classpath b/.classpath
index 033cf9f..8f16539 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.28.5/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/workspace-6.28.6-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.28.5/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/workspace-6.28.6-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.28.5/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/workspace-6.28.6-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 0123369..46414a8 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.28.5
+lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.28.6-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 3cc3599..495ff7f 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                                                  
+                                                                                                                                                                                                          
     
     
     
@@ -47,8 +47,12 @@
     
     
     
-    <wb-module deploy-name="workspace-6.28.5">
-                                                                                                                                                                                                                                                                                                                                                                                                        
+    
+    
+    <wb-module deploy-name="workspace-6.28.6-SNAPSHOT">
+                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
         
         
         
@@ -97,7 +101,9 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                                                                    
+                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
+        
         
         
         
@@ -146,7 +152,9 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
         
         
         
@@ -195,7 +203,9 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-                                                                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
         
         
         
@@ -243,7 +253,9 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-                                                                                                                                
+                                                                                                                                                
+        
+        
         
         
         
@@ -259,7 +271,15 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                                                                                                                                                                                                                                    
+                
+        <dependent-module archiveName="workspace-tree-widget-6.35.2-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
+                        
+            <dependency-type>uses</dependency-type>
+                    
+        </dependent-module>
+                                                                                                                                                                                                                                                                                                                                                                                                                    
+        
+        
         
         
         
@@ -308,7 +328,9 @@
         
         
         <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
-                                                                                                                                                                                                                                                                                                                                                                                                        
+                                                                                                                                                                                                                                                                                                                                                                                                                        
+        
+        
         
         
         
@@ -357,7 +379,9 @@
         
         
         <property name="context-root" value="workspace"/>
-                                                                                                                                                                                                                                                                                                                                                                                                  
+                                                                                                                                                                                                                                                                                                                                                                                                                  
+    
+    
     
     
     
@@ -406,7 +430,9 @@
     
     
     </wb-module>
-                                                                                                                                                                                                
+                                                                                                                                                                                                        
+
+
 
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a502a9d..4915eab 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.28.6-SNAPSHOT] - 2022-09-05
+
+- Just to release the fixes #23676, #23789 implemented in the ws-tree
+
 ## [v6.28.5] - 2022-06-27
 
 - [#23523] Updated to maven-portal-bom 3.6.4
diff --git a/pom.xml b/pom.xml
index 70f1952..9e8cbd7 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.28.5</version>
+	<version>6.28.6-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.4</version>
+				<version>3.7.0-SNAPSHOT</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>