From bbd50dbce1292c2f9ccc00d43b379e199c3f5ab3 Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 9 Apr 2021 15:28:34 +0200
Subject: [PATCH] merged with "task_20762"

---
 .classpath                                     |  6 +++---
 .../com.gwtplugins.gdt.eclipse.core.prefs      |  2 +-
 .settings/org.eclipse.wst.common.component     | 18 ++++++++++++++----
 CHANGELOG.md                                   |  6 ++++++
 pom.xml                                        | 11 ++---------
 src/main/webapp/workspacebootstrap.min.css     |  2 +-
 6 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/.classpath b/.classpath
index 8db4226..7ab3f22 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/workspace-6.25.4-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/workspace-6.26.0-SNAPSHOT/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.25.4-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/workspace-6.26.0-SNAPSHOT/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.25.4-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/workspace-6.26.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs
index 5b73619..a4b015a 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-mangiacrapa/git/workspace/target/workspace-6.25.4-SNAPSHOT
+lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.26.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index f307c86..36b616f 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-  <wb-module deploy-name="workspace-6.25.4-SNAPSHOT">
+      
+    <wb-module deploy-name="workspace-6.25.4-SNAPSHOT">
+                
         <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="/" 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"/>
-    <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
+            
+        <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
+                
         <property name="context-root" value="workspace"/>
-  </wb-module>
+          
+    </wb-module>
+    
 </project-modules>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c612aa..575e025 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@
 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.26.0-SNAPSHOT] - 2021-02-22
+
+#### Enhancements
+
+[#20762] Moved to ckan-metadata-publisher-widget 2.X
+
 ## [v6.25.4] - 2021-03-10
 
 #### Enhancements
diff --git a/pom.xml b/pom.xml
index 6f03914..62827d4 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.25.4</version>
+	<version>6.26.0-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. 
@@ -118,13 +118,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>ckan-metadata-publisher-widget</artifactId>
-			<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
-			<scope>compile</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>com.github.gwtbootstrap</groupId>
 			<artifactId>gwt-bootstrap</artifactId>
@@ -197,7 +190,7 @@
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>workspace-tree-widget</artifactId>
-			<version>[6.31.3-SNAPSHOT, 6.31.3]</version>
+			<version>[6.31.3-SNAPSHOT, 7.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
 
diff --git a/src/main/webapp/workspacebootstrap.min.css b/src/main/webapp/workspacebootstrap.min.css
index 60a1f3f..72ab01d 100644
--- a/src/main/webapp/workspacebootstrap.min.css
+++ b/src/main/webapp/workspacebootstrap.min.css
@@ -4857,7 +4857,7 @@ button.btn.btn-mini, input[type="submit"].btn.btn-mini { *
 
 .modal-body {
 	position: relative;
-	max-height: 500px !important;
+	max-height: 500px;
 	padding: 15px;
 	overflow-y: auto
 }