From eb12960ecc5870be13079dda4021491cd9b14305 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Tue, 20 Feb 2024 15:26:27 +0100 Subject: [PATCH] - Moved to maven parent 1.2.0 - Equipped with the new Catalogue Publishing Widget [#26825] --- .classpath | 27 ++-- .../com.gwtplugins.gdt.eclipse.core.prefs | 2 +- .settings/org.eclipse.wst.common.component | 115 +++++++----------- CHANGELOG.md | 15 ++- pom.xml | 23 +++- .../user/workspace/WorkspacePortlet.gwt.xml | 7 +- 6 files changed, 89 insertions(+), 100 deletions(-) diff --git a/.classpath b/.classpath index 6992f7d..318fdbd 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,15 @@ - + + + + + + + + + @@ -11,29 +19,16 @@ - - - - - - + - - - - - - - - - + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index f534c2e..82d6b19 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.7-SNAPSHOT +lastWarOutDir=/home/francescomangiacrapa/git/workspace/target/workspace-6.29.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 ceec618..38a96db 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,5 +1,5 @@ - + @@ -58,8 +58,16 @@ - - + + + + + + + + + + @@ -119,7 +127,11 @@ - + + + + + @@ -179,7 +191,11 @@ - + + + + + @@ -239,7 +255,7 @@ - + @@ -264,77 +280,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + uses - - uses - - - uses - - + + + + + @@ -394,7 +353,11 @@ - + + + + + @@ -454,7 +417,11 @@ - + + + + + @@ -514,7 +481,11 @@ - + + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 818edb5..ef31d2a 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.29.1-SNAPSHOT] - 2024-02-20 + +- Moved to maven parent 1.2.0 +- Equipped with the new Catalogue Publishing Widget [#26825] + ## [v6.29.0] - 2023-04-04 - Just to release the patch #24929 in the 'storagehub-client-wrapper' @@ -79,31 +84,31 @@ Just to include new SHUB model [#19952] Fixed incident -## [v6.25.0] [r4.25.0] - 2020-08-25 +## [v6.25.0] - 2020-08-25 #### Enhancements [#19600] revisit the "Get Info" Dialog in a modern view -## [v6.24.1] [r4.24.0] - 2020-06-22 +## [v6.24.1] - 2020-06-22 [#19493] Just to include the ckan-util-library patched -## [v6.24.0] [r4.23.0] - 2020-05-18 +## [v6.24.0] - 2020-05-18 **New Features** [#19058] Restore operation: the user has to select the destination folder -## [v6.23.2] [r4.22.0] - 2020-04-21 +## [v6.23.2] - 2020-04-21 Just to include the new shub-client released -## [v6.23.1] [r4.21.0] - 2020-03-27 +## [v6.23.1] - 2020-03-27 Ported to git/jenkins diff --git a/pom.xml b/pom.xml index 2b92a10..6f6ee4c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ maven-parent org.gcube.tools - 1.1.0 + 1.2.0 org.gcube.portlets.user workspace war - 6.29.0 + 6.29.1-SNAPSHOT gCube Workspace Portlet 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. @@ -30,6 +30,8 @@ ${project.build.directory}/${project.build.finalName} -Xdoclint:none 2.8.11 + 3.8.0-SNAPSHOT + 2.7.0 UTF-8 UTF-8 @@ -46,7 +48,7 @@ org.gcube.distribution maven-portal-bom - 3.7.0 + ${gcube-portal-bom-version} pom import @@ -125,6 +127,20 @@ provided + + + org.gcube.data.analysis + data-miner-manager-cl + [1.0.0, 1.11.0-SNAPSHOT) + + + + org.projectlombok + lombok + 1.18.4 + provided + + com.sencha.gxt gxt2.2.5-gwt2.X @@ -138,6 +154,7 @@ ic-client provided + org.gcube.core common-scope-maps diff --git a/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml index ae84846..b871be1 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml +++ b/src/main/java/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml @@ -33,11 +33,12 @@ + + - - - +