From 4ddbcd6c1aea1de4a20e46642889a3cc6f5ff755 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Thu, 1 Jul 2021 16:48:44 +0200 Subject: [PATCH 1/3] gCat-Controller 1.0.6 --- DataMinerAlgorithmsCrawler/pom.xml | 14 +++++++++-- gCat-Controller/CHANGELOG.md | 3 +++ .../catalogues/gCat/InfrastructureTest.java | 24 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 gCat-Controller/src/test/java/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/InfrastructureTest.java diff --git a/DataMinerAlgorithmsCrawler/pom.xml b/DataMinerAlgorithmsCrawler/pom.xml index c3098a2..c6784ed 100644 --- a/DataMinerAlgorithmsCrawler/pom.xml +++ b/DataMinerAlgorithmsCrawler/pom.xml @@ -47,7 +47,7 @@ org.gcube.data.analysis data-miner-manager-cl - [1.6.0,2.0.0) + [1.8.0,2.0.0) @@ -56,7 +56,12 @@ jersey-media-json-jackson - + + org.projectlombok + lombok + 1.18.20 + provided + org.slf4j @@ -69,6 +74,11 @@ test + + org.gcube.common + authorization-client + compile + diff --git a/gCat-Controller/CHANGELOG.md b/gCat-Controller/CHANGELOG.md index 14aa89a..c4098f0 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.6-SNAPSHOT] - 2021-07-01 +- gCat client coordinates + ## [v1.0.5] - 2020-12-15 - gCat Client upgrade diff --git a/gCat-Controller/src/test/java/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/InfrastructureTest.java b/gCat-Controller/src/test/java/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/InfrastructureTest.java new file mode 100644 index 0000000..c86e525 --- /dev/null +++ b/gCat-Controller/src/test/java/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/InfrastructureTest.java @@ -0,0 +1,24 @@ +package org.gcube.data.publishing.gCatFeeder.catalogues.gCat; + +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.databind.JsonMappingException; +import org.gcube.data.publishing.gCatFeeder.model.InternalConversionException; +import org.gcube.data.publishing.gCatFeeder.tests.InfrastructureTests; +import org.gcube.gcat.client.Profile; +import org.junit.Assume; +import org.junit.Test; + +import java.io.IOException; +import java.net.MalformedURLException; + +public class InfrastructureTest extends InfrastructureTests { + + @Test + public void testIsServicePresent() throws MalformedURLException { + Assume.assumeTrue(isTestInfrastructureEnabled()); + System.out.println("START HERE"); + new Profile(); + + } + +} From 5347aeac1f8aeac7c5f3c6781ac6ebb8b8a97f29 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 13 Jul 2021 17:17:04 +0200 Subject: [PATCH 2/3] Fixes #21740 --- gCat-Controller/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gCat-Controller/pom.xml b/gCat-Controller/pom.xml index c9d52d2..13e2a5b 100644 --- a/gCat-Controller/pom.xml +++ b/gCat-Controller/pom.xml @@ -7,7 +7,7 @@ gCat-Controller gCat-Controller - 1.0.5 + 1.0.6-SNAPSHOT Controller implementation for GCat Service @@ -47,9 +47,9 @@ - org.gcube.data-publishing - gcat-client - [1.0.0,2.0.0) + org.gcube.data-catalogue + gcat-client + [2.0.0,3.0.0) From 6f338b4cafeeaf975b64aa68552f11755f184ce9 Mon Sep 17 00:00:00 2001 From: Fabio Sinibaldi Date: Tue, 13 Jul 2021 17:50:49 +0200 Subject: [PATCH 3/3] releasing gCat-Controller 1.0.6 --- gCat-Controller/CHANGELOG.md | 2 +- gCat-Controller/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gCat-Controller/CHANGELOG.md b/gCat-Controller/CHANGELOG.md index c4098f0..23e4dbf 100644 --- a/gCat-Controller/CHANGELOG.md +++ b/gCat-Controller/CHANGELOG.md @@ -2,7 +2,7 @@ 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.6-SNAPSHOT] - 2021-07-01 +## [v1.0.6] - 2021-07-01 - gCat client coordinates ## [v1.0.5] - 2020-12-15 diff --git a/gCat-Controller/pom.xml b/gCat-Controller/pom.xml index 13e2a5b..3b7929d 100644 --- a/gCat-Controller/pom.xml +++ b/gCat-Controller/pom.xml @@ -7,7 +7,7 @@ gCat-Controller gCat-Controller - 1.0.6-SNAPSHOT + 1.0.6 Controller implementation for GCat Service