From 3d7132dbec266eddfbe5bfeef2306185b9eb19f7 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Mon, 22 Jun 2020 11:18:24 +0200
Subject: [PATCH] Just to include the ckan-util-library patched at [#19493]

---
 .classpath                                      | 6 +++---
 .settings/com.gwtplugins.gdt.eclipse.core.prefs | 2 +-
 .settings/org.eclipse.wst.common.component      | 5 +----
 changelog.md => CHANGELOG.md                    | 5 +++++
 descriptor.xml                                  | 2 +-
 pom.xml                                         | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)
 rename changelog.md => CHANGELOG.md (98%)

diff --git a/.classpath b/.classpath
index 110bd13..b4798ae 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/workspace-6.24.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/workspace-6.24.0/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/workspace-6.24.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/workspace-6.24.0/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -35,5 +35,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/workspace-6.24.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/workspace-6.24.0/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index aa1e255..96844a8 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/workspace/target/workspace-6.24.0-SNAPSHOT
+lastWarOutDir=/home/francesco/git/workspace/target/workspace-6.24.0
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index be14d48..cf40ed3 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="workspace-6.24.0-SNAPSHOT">
+  <wb-module deploy-name="workspace-6.24.0">
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="workspace-tree-widget-6.30.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget/workspace-tree-widget">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="workspace"/>
   </wb-module>
diff --git a/changelog.md b/CHANGELOG.md
similarity index 98%
rename from changelog.md
rename to CHANGELOG.md
index 187836e..89da6ab 100644
--- a/changelog.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 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-24.1] [r4-24-0] - 2020-05-18
+
+Just to include the ckan-util-library patched at [#19493]
+
+
 ## [v6-24.0] [r4-23-0] - 2020-05-18
 
 **New Features**
diff --git a/descriptor.xml b/descriptor.xml
index 142b18c..0487853 100644
--- a/descriptor.xml
+++ b/descriptor.xml
@@ -15,7 +15,7 @@
 				<include>README.md</include>
 				<include>LICENSE.md</include>
 				<include>profile.xml</include>
-				<include>changelog.md</include>
+				<include>CHANGELOG.md</include>
 			</includes>
 			<fileMode>755</fileMode>
 			<filtered>true</filtered>
diff --git a/pom.xml b/pom.xml
index a92e3f0..fdd69cb 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.24.0</version>
+	<version>6.24.1</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.