diff --git a/distro/changelog.xml b/distro/changelog.xml index fdf0c16..ac71c19 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,7 @@ + + porting to tabular-data-cl 2.0.0 + porting to smartgears 2.0 diff --git a/pom.xml b/pom.xml index 2fbd05d..41833ba 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.gcube.data.analysis r-connector - 2.1.1-SNAPSHOT + 2.1.2-SNAPSHOT RConnector makes R available in the infrastructure @@ -62,7 +62,7 @@ org.gcube.data.analysis.tabulardata tabulardata-client-library - [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) diff --git a/src/main/java/org/gcube/data/analysis/rconnector/InfoRetriever.java b/src/main/java/org/gcube/data/analysis/rconnector/InfoRetriever.java index 768cf9e..d5a610e 100644 --- a/src/main/java/org/gcube/data/analysis/rconnector/InfoRetriever.java +++ b/src/main/java/org/gcube/data/analysis/rconnector/InfoRetriever.java @@ -16,10 +16,7 @@ import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.database.DatabaseEndpointIdentifier; import org.gcube.common.database.DatabaseProvider; import org.gcube.common.database.endpoint.DatabaseEndpoint; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.data.analysis.rconnector.Info.DataBaseInfo; -import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationProvider; -import org.gcube.data.analysis.tabulardata.commons.utils.AuthorizationToken; import org.gcube.data.analysis.tabulardata.commons.webservice.types.TabularResource; import org.gcube.data.analysis.tabulardata.model.column.Column; import org.gcube.data.analysis.tabulardata.model.column.type.IdColumnType; @@ -39,7 +36,6 @@ public class InfoRetriever { @SuppressWarnings("unchecked") public Info retrieve(String userName, Long tabularResourceId){ try { - AuthorizationProvider.instance.set(new AuthorizationToken(userName, ScopeProvider.instance.get())); TabularResource tr = tabularResource().build().getTabularResource(tabularResourceId); Table table = history().build().getLastTable(tabularResourceId); if (table.contains(DatasetViewTableMetadata.class))