From 2a0f1d25825b4df00f8ebab292e82a5b8304fdb2 Mon Sep 17 00:00:00 2001
From: lucio <lucio.lelii@isti.cnr.it>
Date: Mon, 6 Jun 2022 15:37:32 +0200
Subject: [PATCH] removed common-scope dependency

---
 CHANGELOG.md                                  |  5 ++
 pom.xml                                       | 77 ++++++++++---------
 .../library/AuthorizationEntry.java           | 14 +---
 3 files changed, 45 insertions(+), 51 deletions(-)

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 @@
-     <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    	<modelVersion>4.0.0</modelVersion>
-    	<groupId>org.gcube.common</groupId>
-    	<artifactId>common-authorization</artifactId>
-    	<version>3.0.0-SNAPSHOT</version>
-    	<name>authorization service common library</name>
 
-    	<parent>
-    		<artifactId>maven-parent</artifactId>
-    		<groupId>org.gcube.tools</groupId>
-    		<version>1.1.0</version>
-    	</parent>
-       
-      <scm>
-          <connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</connection>
-          <developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</developerConnection>
-          <url>https://code-repo.d4science.org/gCubeSystem/common-authorization</url>
-      </scm>	
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.gcube.common</groupId>
+	<artifactId>common-authorization</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<name>authorization service common library</name>
 
-    	<dependencies>
-    		<dependency>
-    			<groupId>org.gcube.core</groupId>
-    			<artifactId>common-scope</artifactId>
-    			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
-    		</dependency>
-    		<dependency>
-    			<groupId>junit</groupId>
-    			<artifactId>junit</artifactId>
-    			<version>4.11</version>
-    			<scope>test</scope>
-    		</dependency>
-    		
-    		<dependency>
-    			<groupId>org.slf4j</groupId>
-    			<artifactId>slf4j-api</artifactId>
-    			<version>1.7.5</version>
-    		</dependency>
-    	</dependencies>
+	<parent>
+		<artifactId>maven-parent</artifactId>
+		<groupId>org.gcube.tools</groupId>
+		<version>1.1.0</version>
+	</parent>
 
-    </project>
+	<scm>
+		<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</connection>
+		<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/common-authorization.git</developerConnection>
+		<url>https://code-repo.d4science.org/gCubeSystem/common-authorization</url>
+	</scm>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-configuration-scanner</artifactId>
+			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.5</version>
+		</dependency>
+	</dependencies>
+
+</project>
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<Policy> 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 + "]";
 	}