diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94d18e7..cde6a23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for gFeed
+## [v1.0.6-SNAPSHOT]
+- Pom updates
+
## [v1.0.5]
- Pom updates
diff --git a/DataMinerAlgorithmsCrawler/CHANGELOG.md b/DataMinerAlgorithmsCrawler/CHANGELOG.md
index fd8eceb..7f84c5f 100644
--- a/DataMinerAlgorithmsCrawler/CHANGELOG.md
+++ b/DataMinerAlgorithmsCrawler/CHANGELOG.md
@@ -2,6 +2,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data-publishing.gFeed.DataMinerAlgorithmsCrawler
+## [v1.0.7-SNAPSHOT]
+- Lombok version
## [v1.0.6]
- Pom updates
diff --git a/DataMinerAlgorithmsCrawler/pom.xml b/DataMinerAlgorithmsCrawler/pom.xml
index 3237339..08363dd 100644
--- a/DataMinerAlgorithmsCrawler/pom.xml
+++ b/DataMinerAlgorithmsCrawler/pom.xml
@@ -4,11 +4,11 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
DataMinerAlgorithmsCrawler
DataMinerAlgorithmsCrawler
- 1.0.6
+ 1.0.7-SNAPSHOT
Plugin for gCat-Feeder for DataMiner Algorithms publishing
@@ -45,7 +45,7 @@
org.gcube.data.analysis
data-miner-manager-cl
- [1.8.0,2.0.0)
+ [1.9.0,1.10.0-SNAPSHOT)
@@ -57,7 +57,7 @@
org.gcube.data-catalogue
gcat-client
- [2.0.0,3.0.0)
+ [2.0.0,3.0.0-SNAPSHOT)
@@ -69,7 +69,6 @@
org.projectlombok
lombok
- 1.18.20
provided
@@ -116,5 +115,29 @@
-
+
+
+
+ n52-releases
+ 52n Releases
+ https://52north.org/maven/repo/releases/
+
+ true
+
+
+ false
+
+
+
+ geotools
+ Geotools
+ https://repo.osgeo.org/repository/release/
+
+ true
+
+
+ false
+
+
+
\ No newline at end of file
diff --git a/catalogue-plugin-framework/CHANGELOG.md b/catalogue-plugin-framework/CHANGELOG.md
index cb17644..c1836f1 100644
--- a/catalogue-plugin-framework/CHANGELOG.md
+++ b/catalogue-plugin-framework/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data-publishing.gFeed.catalogue-plugin-framework
+## [v1.0.6-SNAPSHOT]
+- Lombok dependency upgrade
+
## [v1.0.5]
- Pom updates
diff --git a/catalogue-plugin-framework/pom.xml b/catalogue-plugin-framework/pom.xml
index 3312e5d..ef2e52f 100644
--- a/catalogue-plugin-framework/pom.xml
+++ b/catalogue-plugin-framework/pom.xml
@@ -5,10 +5,10 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
catalogue-plugin-framework
- 1.0.5
+ 1.0.6-SNAPSHOT
@@ -20,7 +20,6 @@
org.projectlombok
lombok
- 1.14.8
diff --git a/collectors-plugin-framework/CHANGELOG.md b/collectors-plugin-framework/CHANGELOG.md
index 03c9ea0..5765134 100644
--- a/collectors-plugin-framework/CHANGELOG.md
+++ b/collectors-plugin-framework/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data-publishing.gFeed.collectors-plugin-framework
+## [v1.0.6-SNAPSHOT]
+- Pom updates
+
## [v1.0.5]
- Pom updates
diff --git a/collectors-plugin-framework/pom.xml b/collectors-plugin-framework/pom.xml
index ce3cdcc..205c9f5 100644
--- a/collectors-plugin-framework/pom.xml
+++ b/collectors-plugin-framework/pom.xml
@@ -5,12 +5,12 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
collectors-plugin-framework
collectors-plugin-framework
Framework for collectors implementations
- 1.0.5
+ 1.0.6-SNAPSHOT
@@ -26,7 +26,6 @@
org.projectlombok
lombok
- 1.14.8
diff --git a/commons/CHANGELOG.md b/commons/CHANGELOG.md
index 878f453..a68cef7 100644
--- a/commons/CHANGELOG.md
+++ b/commons/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data-publishing.gFeed.test-commons
+## [v1.0.6-SNAPSHOT]
+- Pom updates
+
## [v1.0.5]
- Pom updates
diff --git a/commons/pom.xml b/commons/pom.xml
index d3e3c1a..7e808ad 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -5,11 +5,11 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
commons
commons
- 1.0.5
+ 1.0.6-SNAPSHOT
Common utilities for gCatFeeder logic
diff --git a/gCat-Controller/CHANGELOG.md b/gCat-Controller/CHANGELOG.md
index a58f53f..d10845d 100644
--- a/gCat-Controller/CHANGELOG.md
+++ b/gCat-Controller/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data-publishing.gFeed.gCat-controller
+## [v1.0.8-SNAPSHOT]
+- Pom updates
+
## [v1.0.7]
- Pom updates
diff --git a/gCat-Controller/pom.xml b/gCat-Controller/pom.xml
index b66459f..3a8ea8c 100644
--- a/gCat-Controller/pom.xml
+++ b/gCat-Controller/pom.xml
@@ -3,11 +3,11 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
gCat-Controller
gCat-Controller
- 1.0.7
+ 1.0.8-SNAPSHOT
Controller implementation for GCat Service
diff --git a/gCat-Feeder/CHANGELOG.md b/gCat-Feeder/CHANGELOG.md
index e3b1cbf..3a45df4 100644
--- a/gCat-Feeder/CHANGELOG.md
+++ b/gCat-Feeder/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data-publishing.gFeed.gFeed-service
+## [v1.0.6-SNAPSHOT]
+- Pom updates
+
## [v1.0.5]
- Pom updates
diff --git a/gCat-Feeder/pom.xml b/gCat-Feeder/pom.xml
index 7a8b338..b814333 100644
--- a/gCat-Feeder/pom.xml
+++ b/gCat-Feeder/pom.xml
@@ -4,11 +4,11 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
gCat-Feeder
gFeed Service
- 1.0.5
+ 1.0.6-SNAPSHOT
Service implementation
diff --git a/oai-harvester/CHANGELOG.md b/oai-harvester/CHANGELOG.md
index c0605c0..06d1bf5 100644
--- a/oai-harvester/CHANGELOG.md
+++ b/oai-harvester/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data-publishing.gFeed.oai-pmh
+## [v1.0.7-SNAPSHOT]
+- Pom updates
+
## [v1.0.6]
- Pom updates
diff --git a/oai-harvester/pom.xml b/oai-harvester/pom.xml
index 0f2d93b..bfd5444 100644
--- a/oai-harvester/pom.xml
+++ b/oai-harvester/pom.xml
@@ -5,11 +5,11 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
oai-harvester
oai-harvester
- 1.0.6
+ 1.0.7-SNAPSHOT
scm:git:${gitBaseUrl}/gFeed
diff --git a/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAIClient.java b/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAIClient.java
index f42ba6b..6751060 100644
--- a/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAIClient.java
+++ b/oai-harvester/src/main/java/org/gcube/data/publishing/gFeed/collectors/oai/OAIClient.java
@@ -83,7 +83,7 @@ public class OAIClient {
for(String set : specifiedSets) {
log.info("Loading "+metadataPrefix+" SET : "+set+" from "+baseUrl);
target.queryParam("set", set);
- toReturn.addAll(call(target,metadataPrefix));
+ toReturn.addAll(call(target.queryParam("set", set),metadataPrefix));
}
else {
log.info("Loading "+metadataPrefix+" from "+baseUrl);
diff --git a/oai-harvester/src/test/java/org/gcube/application/gfeed/oai/TranslationTest.java b/oai-harvester/src/test/java/org/gcube/application/gfeed/oai/TranslationTest.java
index 55c739a..960f073 100644
--- a/oai-harvester/src/test/java/org/gcube/application/gfeed/oai/TranslationTest.java
+++ b/oai-harvester/src/test/java/org/gcube/application/gfeed/oai/TranslationTest.java
@@ -5,6 +5,7 @@ import java.util.Collection;
import java.util.Set;
import org.gcube.data.publishing.gCatFeeder.model.CatalogueFormatData;
+import org.gcube.data.publishing.gCatFeeder.model.EnvironmentConfiguration;
import org.gcube.data.publishing.gCatFeeder.model.InternalConversionException;
import org.gcube.data.publishing.gCatFeeder.tests.BaseCollectorTest;
import org.gcube.data.publishing.gCatfeeder.collectors.CollectorPlugin;
@@ -31,18 +32,20 @@ public class TranslationTest extends BaseCollectorTest{
ObjectMapper mapper = new ObjectMapper();
CollectorPlugin plugin=new OAIHarvester();
- plugin.setEnvironmentConfiguration(getEnvironmentConfiguration());
+ EnvironmentConfiguration env = getEnvironmentConfiguration();
+ System.out.println("Setting ENV : "+env);
+ plugin.setEnvironmentConfiguration(env);
DataCollector collector=plugin.getCollector();
Collection collected=collector.collect();
System.out.println("Found "+collected.size()+" elements");
for(Object obj:collected)
System.out.println(mapper.writeValueAsString(obj)+"\n");
- for(String destinationcatalogue : (Set)plugin.getSupportedCatalogueTypes()) {
- DataTransformer extends CatalogueFormatData, OAIRecord> transformer=plugin.getTransformerByCatalogueType(destinationcatalogue);
- for(Object data:transformer.transform(collected))
- System.out.println(((CatalogueFormatData)data).toCatalogueFormat());
- }
+// for(String destinationcatalogue : (Set)plugin.getSupportedCatalogueTypes()) {
+// DataTransformer extends CatalogueFormatData, OAIRecord> transformer=plugin.getTransformerByCatalogueType(destinationcatalogue);
+// for(Object data:transformer.transform(collected))
+// System.out.println(((CatalogueFormatData)data).toCatalogueFormat());
+// }
}
diff --git a/pom.xml b/pom.xml
index 182c7d8..f8c22be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
pom
gFeed Suite
gCat-Feeder Suite of components : service, plugin framework, plugins
@@ -18,6 +18,14 @@
distro
https://code-repo.d4science.org/gCubeSystem
+
+
+
+
+
+ 2.2.0-SNAPSHOT
+ 2.1.0-SNAPSHOT
+
@@ -43,19 +51,21 @@
oai-harvester
+
+
org.gcube.distribution
gcube-smartgears-bom
- 2.1.1
+ ${smartgears-bom}
pom
import
org.gcube.distribution
gcube-bom
- 2.0.2
+ ${gcube-bom}
pom
import
diff --git a/test-commons/CHANGELOG.md b/test-commons/CHANGELOG.md
index 878f453..d70f8cc 100644
--- a/test-commons/CHANGELOG.md
+++ b/test-commons/CHANGELOG.md
@@ -2,6 +2,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for org.gcube.data-publishing.gFeed.test-commons
+## [v1.0.6-SNAPSHOT]
+- Test support to jwt token
+
## [v1.0.5]
- Pom updates
diff --git a/test-commons/pom.xml b/test-commons/pom.xml
index 25d2ec3..aee1156 100644
--- a/test-commons/pom.xml
+++ b/test-commons/pom.xml
@@ -3,11 +3,11 @@
org.gcube.data-publishing.gFeed
gFeed-Suite
- 1.0.5
+ 1.0.6-SNAPSHOT
test-commons
test commons
- 1.0.5
+ 1.0.6-SNAPSHOT
Utility classes for test purposes
@@ -26,7 +26,12 @@
org.gcube.data-publishing.gFeed
commons
-
+
+
+ org.gcube.common
+ authorization-utils
+ [2.0.0, 3.0.0-SNAPSHOT)
+
diff --git a/test-commons/src/main/java/org/gcube/data/publishing/gCatFeeder/tests/InfrastructureTests.java b/test-commons/src/main/java/org/gcube/data/publishing/gCatFeeder/tests/InfrastructureTests.java
index 7ca3ca9..59fae0e 100644
--- a/test-commons/src/main/java/org/gcube/data/publishing/gCatFeeder/tests/InfrastructureTests.java
+++ b/test-commons/src/main/java/org/gcube/data/publishing/gCatFeeder/tests/InfrastructureTests.java
@@ -6,6 +6,11 @@ import java.util.Map;
import java.util.Properties;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.gcube.common.authorization.utils.manager.SecretManager;
+import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
+import org.gcube.common.authorization.utils.secret.GCubeSecret;
+import org.gcube.common.authorization.utils.secret.JWTSecret;
+import org.gcube.common.authorization.utils.secret.Secret;
import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.data.publishing.gCatFeeder.model.EnvironmentConfiguration;
import org.gcube.data.publishing.gCatFeeder.utils.ISUtils;
@@ -28,13 +33,27 @@ public class InfrastructureTests {
public static void setTestContext() {
if(isTestInfrastructureEnabled()) {
+ SecretManagerProvider.instance.set(new SecretManager());
Properties props=new Properties();
try{
props.load(BaseCollectorTest.class.getResourceAsStream("/tokens.properties"));
}catch(IOException e) {throw new RuntimeException(e);}
if(!props.containsKey(testContext)) throw new RuntimeException("No token found for scope : "+testContext);
- SecurityTokenProvider.instance.set(props.getProperty(testContext));
- ScopeProvider.instance.set(testContext);
+
+ String toSet = props.getProperty(testContext);
+
+ Secret secret = null;
+ if(toSet.length()>50)
+ secret = new JWTSecret(toSet); // se nuovo token
+ else
+ secret = new GCubeSecret(toSet); // se vecchio token
+
+
+ SecretManagerProvider.instance.get().addSecret(secret);
+ try{
+ SecretManagerProvider.instance.get().set();
+ }catch(Exception e ){throw new RuntimeException("Unable to set secret for context "+testContext,e);}
+
}
}