CHANGELOG.md

@@ -4,15 +4,6 @@
 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).
 
-## [v2.5.1]
-
-- Added library to support Java 11 JDK
-
-## [v2.5.0] - [2022-04-20]
-
-- Deprecated AccessTokenProvider, AuthorizationProvider and SecurityTokenProvider [#22871]
-- Added roles to ExternalService Client info
-
 ## [v2.4.0] - [2021-05-21]
 
 JWTUmaTokenProvider changed to AccessTokenProvider

pom.xml

@@ -1,38 +1,28 @@
-<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">
+     <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>2.4.0</version>
+    	<name>authorization service common library</name>
+
     	<parent>
     		<artifactId>maven-parent</artifactId>
     		<groupId>org.gcube.tools</groupId>
     		<version>1.1.0</version>
     	</parent>
        
-	<groupId>org.gcube.common</groupId>
-	<artifactId>common-authorization</artifactId>
-	<version>2.5.1</version>
-	<name>authorization service common library</name>
-
       <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>	
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.gcube.distribution</groupId>
-				<artifactId>gcube-bom</artifactId>
-				<version>2.1.0</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
     	<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>
@@ -44,16 +34,8 @@
     		<dependency>
     			<groupId>org.slf4j</groupId>
     			<artifactId>slf4j-api</artifactId>
+    			<version>1.7.5</version>
     		</dependency>
-		
-		<!-- Added to support Java 11 JDK -->
-		<dependency>
-    		<groupId>javax.xml.ws</groupId>
-    		<artifactId>jaxws-api</artifactId>
-    		<scope>provided</scope>
-		</dependency>
-		<!-- END Added to support Java 11 JDK -->
-		
     	</dependencies>
 
     </project>

src/main/java/org/gcube/common/authorization/library/provider/AccessTokenProvider.java

@@ -1,6 +1,5 @@
 package org.gcube.common.authorization.library.provider;
 
-@Deprecated
 public class AccessTokenProvider {
 
     public static AccessTokenProvider instance = new AccessTokenProvider();

src/main/java/org/gcube/common/authorization/library/provider/AuthorizationProvider.java

@@ -2,7 +2,6 @@ package org.gcube.common.authorization.library.provider;
 
 import org.gcube.common.authorization.library.utils.Caller;
 
-@Deprecated
 public class AuthorizationProvider {
 
 	public static AuthorizationProvider instance = new AuthorizationProvider();

src/main/java/org/gcube/common/authorization/library/provider/ExternalServiceInfo.java

@@ -22,20 +22,10 @@ public class ExternalServiceInfo extends ClientInfo{
 	
 	private String generatedBy;
 	
-	private List<String> roles;
-	
 	public ExternalServiceInfo(String id, String generatedBy) {
 		super();
 		this.id = id;
 		this.generatedBy = generatedBy;
-		this.roles = Collections.emptyList();
-	}
-	
-	public ExternalServiceInfo(String id, String generatedBy, List<String> roles) {
-		super();
-		this.id = id;
-		this.generatedBy = generatedBy;
-		this.roles = roles;
 	}
 	
 	protected ExternalServiceInfo() {
@@ -53,7 +43,7 @@ public class ExternalServiceInfo extends ClientInfo{
 
 	@Override
 	public List<String> getRoles() {
-		return roles;
+		return Collections.emptyList();
 	}
 
 	@Override

src/main/java/org/gcube/common/authorization/library/provider/SecurityTokenProvider.java

@@ -1,6 +1,6 @@
 package org.gcube.common.authorization.library.provider;
 
-@Deprecated
+
 public class SecurityTokenProvider {
 
 	public static SecurityTokenProvider instance = new SecurityTokenProvider();