diff --git a/.classpath b/.classpath index 7ab3f22..f5abf1a 100644 --- a/.classpath +++ b/.classpath @@ -1,20 +1,7 @@ - + - - - - - - - - - - - - - @@ -35,5 +22,18 @@ - + + + + + + + + + + + + + + diff --git a/.settings/com.gwtplugins.gdt.eclipse.core.prefs b/.settings/com.gwtplugins.gdt.eclipse.core.prefs index a4b015a..1d3611e 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.26.0-SNAPSHOT +lastWarOutDir=/home/francesco-mangiacrapa/git/workspace/target/workspace-6.27.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 36b616f..df9b365 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,16 +1,14 @@ - + - - - + diff --git a/CHANGELOG.md b/CHANGELOG.md index 83cdf82..e0574de 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.0-SNAPSHOT] - 2021-05-10 + +[#21387] Harmonized version of jackson libs to 2.8.11 to resolve conflict + ## [v6.26.0] - 2021-04-12 #### Enhancements diff --git a/pom.xml b/pom.xml index 4fb63b3..15e9f28 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.gcube.portlets.user workspace war - 6.26.0 + 6.27.0-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. @@ -29,6 +29,7 @@ 1.8 ${project.build.directory}/${project.build.finalName} -Xdoclint:none + 2.8.11 UTF-8 UTF-8 @@ -46,7 +47,7 @@ org.gcube.distribution maven-portal-bom - 3.6.1 + 3.6.1-SNAPSHOT pom import @@ -141,10 +142,6 @@ compile - org.gcube.resources.discovery @@ -158,6 +155,22 @@ + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + org.gcube.portlets.widgets session-checker @@ -207,12 +220,6 @@ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) - - - com.fasterxml.jackson.core - jackson-annotations - 2.7.0 - javax.portlet