diff --git a/sdi-plugins/CHANGELOG.md b/sdi-plugins/CHANGELOG.md index c401260..9e89d81 100644 --- a/sdi-plugins/CHANGELOG.md +++ b/sdi-plugins/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog for org.gcube.application.cms.sdi-plugins +## [v1.0.4-SNAPSHOT] - 2023-03-02 +- Fixed the import from joda-time to java.time +- [#24702] Fixed the default-lc-managers dependency + ## [v1.0.3] - 2023-01-24 - Fixes [#24476](https://support.d4science.org/issues/24476) diff --git a/sdi-plugins/pom.xml b/sdi-plugins/pom.xml index 24d34e6..97794d1 100644 --- a/sdi-plugins/pom.xml +++ b/sdi-plugins/pom.xml @@ -1,116 +1,117 @@ - 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"> + 4.0.0 - sdi-plugins - 1.0.3 - gCube CMS - SDI Plugins + sdi-plugins + 1.0.4-SNAPSHOT + gCube CMS - SDI Plugins - - org.gcube.application.cms - gcube-cms-suite - 1.0.4 - + + org.gcube.application.cms + gcube-cms-suite + 1.0.4 + - - https://code-repo.d4science.org/gCubeSystem - + + https://code-repo.d4science.org/gCubeSystem + - - - - org.gcube.application.cms - cms-plugin-framework - ${plugin-framework-version} - pom - import - - - + + + + org.gcube.application.cms + cms-plugin-framework + ${plugin-framework-version} + pom + import + + + - - scm:git:${gitBaseUrl}/gcube-cms-suite - scm:git:${gitBaseUrl}/gcube-cms-suite - ${gitBaseUrl}/gcube-cms-suite - + + scm:git:${gitBaseUrl}/gcube-cms-suite + scm:git:${gitBaseUrl}/gcube-cms-suite + ${gitBaseUrl}/gcube-cms-suite + - - - org.gcube.application.cms - cms-plugin-framework - + + + org.gcube.application.cms + cms-plugin-framework + - - org.gcube.application.cms - default-lc-managers - + + org.gcube.application.cms + default-lc-managers + provided + - - - org.gcube.spatial.data - gis-interface - [2.4.6,3.0.0-SNAPSHOT) - + + + org.gcube.spatial.data + gis-interface + [2.4.6,3.0.0-SNAPSHOT) + - - - org.gcube.data.transfer - data-transfer-library - [1.2.1,2.0.0-SNAPSHOT) - + + + org.gcube.data.transfer + data-transfer-library + [1.2.1,2.0.0-SNAPSHOT) + - - - net.postgis - postgis-jdbc - 2.5.0 - + + + net.postgis + postgis-jdbc + 2.5.0 + - + - - de.grundid.opendatalab - geojson-jackson - 1.14 - + + de.grundid.opendatalab + geojson-jackson + 1.14 + - - org.gcube.application.cms - cms-test-commons - test - + + org.gcube.application.cms + cms-test-commons + test + - + - - + + - - org.apache.maven.plugins - maven-assembly-plugin - - - make-uberjar - package - - - make-servicearchive - package - - - + + org.apache.maven.plugins + maven-assembly-plugin + + + make-uberjar + package + + + make-servicearchive + package + + + - - + + diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/LayerCreationTest.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/LayerCreationTest.java index ed76f92..e07ddb8 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/LayerCreationTest.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/LayerCreationTest.java @@ -1,5 +1,11 @@ package org.gcube.application.cms.sdi; +import static org.junit.Assume.assumeTrue; + +import java.sql.SQLException; +import java.time.Instant; +import java.util.List; + import org.gcube.application.cms.implementations.ISInterface; import org.gcube.application.cms.implementations.ImplementationProvider; import org.gcube.application.cms.plugins.faults.InvalidProfileException; @@ -8,24 +14,14 @@ import org.gcube.application.cms.sdi.engine.PostgisTable; import org.gcube.application.cms.sdi.engine.SDIManagerWrapper; import org.gcube.application.cms.sdi.faults.SDIInteractionException; import org.gcube.application.cms.sdi.model.MappingObject; -import org.gcube.application.cms.sdi.plugins.SDIIndexerPlugin; import org.gcube.application.cms.tests.TestProfiles; import org.gcube.application.cms.tests.model.BasicTests; -import org.gcube.application.cms.tests.plugins.BasicPluginTest; import org.gcube.application.geoportal.common.model.rest.ConfigurationException; import org.gcube.application.geoportal.common.model.rest.DatabaseConnection; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; -import org.joda.time.Instant; -import org.joda.time.format.DateTimeFormatter; import org.junit.Test; -import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.List; - -import static org.junit.Assume.assumeTrue; - public class LayerCreationTest extends BasicTests { diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java index 9df7895..650be7d 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/GeoJSONTests.java @@ -1,5 +1,7 @@ package org.gcube.application.cms.sdi.plugins; +import java.io.IOException; + import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.common.model.document.filesets.sdi.GCubeSDILayer; import org.gcube.application.geoportal.common.model.document.identification.SpatialReference; @@ -9,8 +11,6 @@ import org.geojson.LngLatAlt; import org.geojson.Point; import org.junit.Test; -import java.io.IOException; - public class GeoJSONTests { @Test diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java index c4b9d41..7b98a57 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/IndexerTest.java @@ -1,6 +1,12 @@ package org.gcube.application.cms.sdi.plugins; -import com.fasterxml.jackson.core.JsonProcessingException; +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertNotNull; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assume.assumeTrue; + +import java.util.Arrays; + import org.bson.Document; import org.gcube.application.cms.plugins.IndexerPluginInterface; import org.gcube.application.cms.plugins.faults.PluginExecutionException; @@ -25,10 +31,7 @@ import org.gcube.application.geoportal.common.utils.Files; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; -import java.util.Arrays; - -import static junit.framework.TestCase.*; -import static org.junit.Assume.assumeTrue; +import com.fasterxml.jackson.core.JsonProcessingException; public class IndexerTest extends BasicPluginTest { diff --git a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java index cef51f2..4e91dd6 100644 --- a/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java +++ b/sdi-plugins/src/test/java/org/gcube/application/cms/sdi/plugins/MaterializerTests.java @@ -1,6 +1,11 @@ package org.gcube.application.cms.sdi.plugins; -import com.fasterxml.jackson.core.JsonProcessingException; +import static junit.framework.TestCase.assertTrue; +import static org.junit.Assume.assumeTrue; + +import java.io.File; +import java.io.IOException; + import org.bson.Document; import org.gcube.application.cms.plugins.faults.PluginExecutionException; import org.gcube.application.cms.plugins.reports.MaterializationReport; @@ -20,11 +25,7 @@ import org.gcube.application.geoportal.common.utils.Files; import org.gcube.application.geoportal.common.utils.tests.GCubeTest; import org.junit.Test; -import java.io.File; -import java.io.IOException; - -import static junit.framework.TestCase.assertTrue; -import static org.junit.Assume.assumeTrue; +import com.fasterxml.jackson.core.JsonProcessingException; public class MaterializerTests extends BasicPluginTest {