diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a8d785..29dc2c9 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).
+
+## [v3.0.0-SNAPSHOT] - [2022-06-06]
+
+- removed common-scope from the dependencies
+
## [v2.5.0] - [2022-04-20]
- Deprecated AccessTokenProvider, AuthorizationProvider and SecurityTokenProvider [#22871]
diff --git a/pom.xml b/pom.xml
index 2e73c4c..0aabd7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,41 +1,42 @@
-
- 4.0.0
- org.gcube.common
- common-authorization
- 3.0.0-SNAPSHOT
- authorization service common library
-
- maven-parent
- org.gcube.tools
- 1.1.0
-
-
-
- scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git
- scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git
- https://code-repo.d4science.org/gCubeSystem/common-authorization
-
+
+ 4.0.0
+ org.gcube.common
+ common-authorization
+ 3.0.0-SNAPSHOT
+ authorization service common library
-
-
- org.gcube.core
- common-scope
- [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
-
-
- junit
- junit
- 4.11
- test
-
-
-
- org.slf4j
- slf4j-api
- 1.7.5
-
-
+
+ maven-parent
+ org.gcube.tools
+ 1.1.0
+
-
+
+ scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git
+ scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git
+ https://code-repo.d4science.org/gCubeSystem/common-authorization
+
+
+
+
+ junit
+ junit
+ 4.11
+ test
+
+
+ org.gcube.core
+ common-configuration-scanner
+ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
+ org.slf4j
+ slf4j-api
+ 1.7.5
+
+
+
+
diff --git a/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java b/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java
index c69245c..7d4e6ca 100644
--- a/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java
+++ b/src/main/java/org/gcube/common/authorization/library/AuthorizationEntry.java
@@ -18,8 +18,6 @@ import org.gcube.common.authorization.library.provider.ContainerInfo;
import org.gcube.common.authorization.library.provider.ExternalServiceInfo;
import org.gcube.common.authorization.library.provider.ServiceInfo;
import org.gcube.common.authorization.library.provider.UserInfo;
-import org.gcube.common.scope.api.ServiceMap;
-import org.gcube.common.scope.impl.DefaultServiceMap;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@@ -35,9 +33,6 @@ public class AuthorizationEntry {
private String context;
- @XmlElementRef(type = DefaultServiceMap.class)
- private ServiceMap map;
-
@XmlElementRefs({
@XmlElementRef(type = Service2ServicePolicy.class),
@XmlElementRef(type = User2ServicePolicy.class),
@@ -68,18 +63,11 @@ public class AuthorizationEntry {
return context;
}
- public ServiceMap getMap() {
- return map;
- }
public String getQualifier() {
return qualifier;
}
- public void setMap(ServiceMap map) {
- this.map = map;
- }
-
public List getPolicies() {
return policies;
}
@@ -128,7 +116,7 @@ public class AuthorizationEntry {
@Override
public String toString() {
return "AuthorizationEntry [clientInfo=" + clientInfo + ", context="
- + context + ", map=" + map + ", qualifier=" + qualifier
+ + context + ", qualifier=" + qualifier
+ ", policies=" + policies + "]";
}