diff --git a/CHANGELOG.md b/CHANGELOG.md index 9649ec5..049734d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [v1.7.3] - 2019-12-19 [#18356] Bug Fixed: Social networking ... error in parsing URLs ending with "\)" +[#26540] Removed social networking library dependency ## [v1.7.2] - 2019-12-19 diff --git a/pom.xml b/pom.xml index 03dbdbd..64955dd 100644 --- a/pom.xml +++ b/pom.xml @@ -43,9 +43,16 @@ + - org.gcube.portal - social-networking-library + org.gcube.social-networking + social-service-model + [1.2.0-SNAPSHOT, 2.0.0) + + + org.gcube.social-networking + social-service-client + [2.0.0-SNAPSHOT, 3.0.0) provided diff --git a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java index 0893a43..c1d147d 100644 --- a/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java +++ b/src/main/java/org/gcube/social_networking/socialutillibrary/Utils.java @@ -16,7 +16,7 @@ import org.gcube.common.portal.GCubePortalConstants; import org.gcube.common.portal.PortalContext; import org.gcube.common.scope.impl.ScopeBean; import org.gcube.common.scope.impl.ScopeBean.Type; -import org.gcube.portal.databook.client.GCubeSocialNetworking; +import org.gcube.social_networking.socialnetworking.model.client.GCubeSocialNetworking; import org.gcube.portlets.widgets.pickitem.shared.ItemBean; import org.gcube.vomanagement.usermanagement.GroupManager; import org.gcube.vomanagement.usermanagement.RoleManager; diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/HashTagToken.java b/src/main/java/org/gcube/socialnetworking/socialtoken/HashTagToken.java index 73caff1..4a57edd 100644 --- a/src/main/java/org/gcube/socialnetworking/socialtoken/HashTagToken.java +++ b/src/main/java/org/gcube/socialnetworking/socialtoken/HashTagToken.java @@ -1,6 +1,6 @@ package org.gcube.socialnetworking.socialtoken; -import org.gcube.portal.databook.client.GCubeSocialNetworking; +import org.gcube.social_networking.socialnetworking.model.client.GCubeSocialNetworking; import org.gcube.socialnetworking.tokenization.Token; /** diff --git a/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java b/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java index a089cc1..039ac82 100644 --- a/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java +++ b/src/main/java/org/gcube/socialnetworking/socialtoken/SocialMessageParser.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; import org.gcube.common.portal.GCubePortalConstants; -import org.gcube.portal.databook.client.GCubeSocialNetworking; +import org.gcube.social_networking.socialnetworking.model.client.GCubeSocialNetworking; import org.gcube.portlets.widgets.pickitem.shared.ItemBean; import org.gcube.socialnetworking.tokenization.GCubeStringTokenizer; import org.gcube.socialnetworking.tokenization.Token;