diff --git a/CHANGELOG.md b/CHANGELOG.md index 28f2725..bf17e52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v2.4.0] - 2020-12-14 - Removed the import from linked in button + - Removed social networking library dependency [#26537] ## [v2.2.0] - 2018-06-08 diff --git a/pom.xml b/pom.xml index 6de8768..86d68d2 100644 --- a/pom.xml +++ b/pom.xml @@ -93,10 +93,11 @@ 1.2.0 compile + - org.gcube.portal - social-networking-library - provided + org.gcube.social-networking + social-service-model + [1.2.0-SNAPSHOT, 2.0.0) com.google diff --git a/src/main/java/org/gcube/portlets/user/socialprofile/client/SocialProfile.java b/src/main/java/org/gcube/portlets/user/socialprofile/client/SocialProfile.java index c03357d..b593ca1 100644 --- a/src/main/java/org/gcube/portlets/user/socialprofile/client/SocialProfile.java +++ b/src/main/java/org/gcube/portlets/user/socialprofile/client/SocialProfile.java @@ -5,8 +5,8 @@ import net.eliasbalasis.tibcopagebus4gwt.client.PageBusAdapterException; import net.eliasbalasis.tibcopagebus4gwt.testsubscriber.client.Person; import net.eliasbalasis.tibcopagebus4gwt.testsubscriber.client.PersonJsonizer; -import org.gcube.portal.databook.client.GCubeSocialNetworking; -import org.gcube.portal.databook.client.util.Encoder; +import org.gcube.social_networking.socialnetworking.model.client.GCubeSocialNetworking; +import org.gcube.social_networking.socialnetworking.model.client.util.Encoder; import org.gcube.portlets.user.socialprofile.client.ui.DisplayProfile; import org.gcube.portlets.user.socialprofile.client.ui.DisplaySummary; import org.gcube.portlets.user.socialprofile.client.ui.ErrorAlert; diff --git a/src/main/java/org/gcube/portlets/user/socialprofile/client/ui/DisplayProfile.java b/src/main/java/org/gcube/portlets/user/socialprofile/client/ui/DisplayProfile.java index 5420e39..4f3b20d 100644 --- a/src/main/java/org/gcube/portlets/user/socialprofile/client/ui/DisplayProfile.java +++ b/src/main/java/org/gcube/portlets/user/socialprofile/client/ui/DisplayProfile.java @@ -1,8 +1,8 @@ package org.gcube.portlets.user.socialprofile.client.ui; -import org.gcube.portal.databook.client.GCubeSocialNetworking; -import org.gcube.portal.databook.client.util.Encoder; -import org.gcube.portal.databook.shared.UserInfo; +import org.gcube.social_networking.socialnetworking.model.client.GCubeSocialNetworking; +import org.gcube.social_networking.socialnetworking.model.client.util.Encoder; +import org.gcube.social_networking.socialnetworking.model.shared.UserInfo; import org.gcube.portlets.user.socialprofile.client.SocialProfile; import org.gcube.portlets.user.socialprofile.client.SocialService; import org.gcube.portlets.user.socialprofile.client.SocialServiceAsync; diff --git a/src/main/java/org/gcube/portlets/user/socialprofile/server/SocialServiceImpl.java b/src/main/java/org/gcube/portlets/user/socialprofile/server/SocialServiceImpl.java index 08f9b00..14f0b8b 100644 --- a/src/main/java/org/gcube/portlets/user/socialprofile/server/SocialServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/socialprofile/server/SocialServiceImpl.java @@ -32,7 +32,7 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.Property; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; -import org.gcube.portal.databook.shared.UserInfo; +import org.gcube.social_networking.socialnetworking.model.shared.UserInfo; import org.gcube.portlets.user.socialprofile.client.SocialService; import org.gcube.portlets.user.socialprofile.shared.UserContext; import org.gcube.resources.discovery.client.api.DiscoveryClient; diff --git a/src/main/java/org/gcube/portlets/user/socialprofile/shared/UserContext.java b/src/main/java/org/gcube/portlets/user/socialprofile/shared/UserContext.java index 9d93978..6dfa5da 100644 --- a/src/main/java/org/gcube/portlets/user/socialprofile/shared/UserContext.java +++ b/src/main/java/org/gcube/portlets/user/socialprofile/shared/UserContext.java @@ -2,7 +2,7 @@ package org.gcube.portlets.user.socialprofile.shared; import java.io.Serializable; -import org.gcube.portal.databook.shared.UserInfo; +import org.gcube.social_networking.socialnetworking.model.shared.UserInfo; @SuppressWarnings("serial") public class UserContext implements Serializable { diff --git a/src/main/resources/org/gcube/portlets/user/socialprofile/SocialProfile.gwt.xml b/src/main/resources/org/gcube/portlets/user/socialprofile/SocialProfile.gwt.xml index dec15f7..79e4071 100644 --- a/src/main/resources/org/gcube/portlets/user/socialprofile/SocialProfile.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/socialprofile/SocialProfile.gwt.xml @@ -7,7 +7,7 @@ - +