diff --git a/CHANGELOG.md b/CHANGELOG.md
index abff7b1..b72658e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@
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.4.0-SNAPSHOT] - [2021-05-21]
+
+JWTUmaTokenProvider changed to AccessTokenProvider
## [v2.3.1] - [2021-03-30]
diff --git a/pom.xml b/pom.xml
index 1f6d94d..1b0a6db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
org.gcube.common
common-authorization
- 2.3.1-SNAPSHOT
+ 2.4.0
authorization service common library
@@ -38,40 +38,4 @@
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- org.apache.maven.plugins
- maven-resources-plugin
- 2.5
-
-
- copy-profile
- install
-
- copy-resources
-
-
- target
-
-
- .
- true
-
- profile.xml
-
-
-
-
-
-
-
-
-
-
-
diff --git a/profile.xml b/profile.xml
deleted file mode 100644
index 91c49e4..0000000
--- a/profile.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- Service
-
- ${description}
- Common
- ${artifactId}
- 1.0.0
-
-
- ${artifactId}
- ${version}
-
- ${groupId}
- ${artifactId}
- ${version}
-
-
- ${build.finalName}.jar
-
-
-
-
-
-
diff --git a/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java b/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java
index ad6f1bf..ed7e133 100644
--- a/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java
+++ b/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java
@@ -2,9 +2,9 @@ package org.gcube.common.authorization.library;
import java.util.concurrent.Callable;
+import org.gcube.common.authorization.library.provider.AccessTokenProvider;
import org.gcube.common.authorization.library.provider.AuthorizationProvider;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.authorization.library.provider.UmaJWTProvider;
import org.gcube.common.authorization.library.utils.Caller;
import org.gcube.common.scope.api.ScopeProvider;
import org.slf4j.Logger;
@@ -29,7 +29,7 @@ public class AuthorizedTasks {
final String scope = ScopeProvider.instance.get();
- final String umaToken = UmaJWTProvider.instance.get();
+ final String accessToken = AccessTokenProvider.instance.get();
return new Callable() {
@Override
@@ -39,7 +39,7 @@ public class AuthorizedTasks {
AuthorizationProvider.instance.set(userCall);
SecurityTokenProvider.instance.set(token);
ScopeProvider.instance.set(scope);
- UmaJWTProvider.instance.set(umaToken);
+ AccessTokenProvider.instance.set(accessToken);
try {
logger.info("setting on authorized task scope {} and token {}", scope, token);
@@ -69,7 +69,7 @@ public class AuthorizedTasks {
final String scope = ScopeProvider.instance.get();
- final String umaToken = UmaJWTProvider.instance.get();
+ final String accessToken = AccessTokenProvider.instance.get();
return new Runnable() {
@Override
@@ -77,7 +77,7 @@ public class AuthorizedTasks {
AuthorizationProvider.instance.set(userCall);
SecurityTokenProvider.instance.set(token);
ScopeProvider.instance.set(scope);
- UmaJWTProvider.instance.set(umaToken);
+ AccessTokenProvider.instance.set(accessToken);
try {
logger.info("setting on authorized task scope {} and token {}", scope, token);
diff --git a/src/main/java/org/gcube/common/authorization/library/provider/UmaJWTProvider.java b/src/main/java/org/gcube/common/authorization/library/provider/AccessTokenProvider.java
similarity index 76%
rename from src/main/java/org/gcube/common/authorization/library/provider/UmaJWTProvider.java
rename to src/main/java/org/gcube/common/authorization/library/provider/AccessTokenProvider.java
index e68c822..de49cd1 100644
--- a/src/main/java/org/gcube/common/authorization/library/provider/UmaJWTProvider.java
+++ b/src/main/java/org/gcube/common/authorization/library/provider/AccessTokenProvider.java
@@ -1,8 +1,8 @@
package org.gcube.common.authorization.library.provider;
-public class UmaJWTProvider {
+public class AccessTokenProvider {
- public static UmaJWTProvider instance = new UmaJWTProvider();
+ public static AccessTokenProvider instance = new AccessTokenProvider();
private static final InheritableThreadLocal threadToken = new InheritableThreadLocal() {
@@ -13,7 +13,7 @@ public class UmaJWTProvider {
};
- private UmaJWTProvider() {
+ private AccessTokenProvider() {
}
public String get() {