Poms coherence

This commit is contained in:
Fabio Sinibaldi 2022-03-16 12:11:05 +01:00
parent d68b45bd64
commit 7851d09cfb
8 changed files with 84 additions and 123 deletions

View File

@ -16,7 +16,6 @@
<properties> <properties>
<gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl> <gitBaseUrl>https://code-repo.d4science.org/gCubeSystem</gitBaseUrl>
<sis.version>1.0</sis.version> <sis.version>1.0</sis.version>
</properties> </properties>

View File

@ -27,6 +27,7 @@ public class PluginsReflections {
reflections.getSubTypesOf(Plugin.class).iterator().forEachRemaining(pluginClass->{ reflections.getSubTypesOf(Plugin.class).iterator().forEachRemaining(pluginClass->{
if(!pluginClass.isInterface() && !Modifier.isAbstract(pluginClass.getModifiers())){ if(!pluginClass.isInterface() && !Modifier.isAbstract(pluginClass.getModifiers())){
log.trace("Evaluating class ");
try { try {
Plugin plugin = pluginClass.newInstance(); Plugin plugin = pluginClass.newInstance();
log.debug("Loading {} description : {}", plugin, plugin.getDescriptor()); log.debug("Loading {} description : {}", plugin, plugin.getDescriptor());

View File

@ -33,14 +33,14 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <artifactId>gcube-bom</artifactId>
<version>2.0.1</version> <version>2.0.2</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId> <artifactId>gcube-smartgears-bom</artifactId>
<version>2.1.0</version> <version>2.1.1</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>

View File

@ -34,6 +34,7 @@
<dependency> <dependency>
<groupId>org.gcube.application.cms</groupId> <groupId>org.gcube.application.cms</groupId>
<artifactId>geoportal-common</artifactId> <artifactId>geoportal-common</artifactId>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -2,7 +2,7 @@ package org.gcube.application.geoportal.clients;
import lombok.Data; import lombok.Data;
import org.bson.Document; import org.bson.Document;
import org.gcube.application.cms.serialization.Serialization; import org.gcube.application.geoportal.client.utils.Serialization;
import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration; import org.gcube.application.geoportal.common.model.useCaseDescriptor.HandlerDeclaration;
import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor; import org.gcube.application.geoportal.common.model.useCaseDescriptor.UseCaseDescriptor;

View File

@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId> <artifactId>gcube-smartgears-bom</artifactId>
<version>2.1.0</version> <version>2.1.1</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -44,15 +44,64 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-smartgears</artifactId> <artifactId>common-smartgears</artifactId>
</dependency> </dependency>
<!-- INTERNAL LOGIC -->
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>geoportal-common</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>cms-plugin-framework</artifactId>
<scope>compile</scope>
</dependency>
<!-- MONGO -->
<!-- https://mvnrepository.com/artifact/org.mongodb/mongo-java-driver -->
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>3.6.0</version>
</dependency>
<!-- Common - basic -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
<!-- STORAGE -->
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-core</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-wrapper</artifactId>
</dependency>
<!-- Storage HUB -->
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-library</artifactId>
</dependency>
<!-- JERSEY --> <!-- JERSEY -->
@ -80,18 +129,7 @@
</dependency> </dependency>
<!-- DEPRECATED LEGACY LOGIC SUPPORT -->
<!-- INTERNAL LOGIC -->
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>geoportal-common</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>cms-plugin-framework</artifactId>
</dependency>
<!-- POSTGRES DRIVERS --> <!-- POSTGRES DRIVERS -->
<dependency> <dependency>
@ -108,13 +146,6 @@
</dependency> </dependency>
<!-- GS communication -->
<!-- <dependency>-->
<!-- <groupId>org.gcube.spatial.data</groupId>-->
<!-- <artifactId>gcube-geoserver-client</artifactId>-->
<!-- <version>[1.0.0-SNAPSHOT,)</version>-->
<!-- </dependency>-->
<!-- DT --> <!-- DT -->
<dependency> <dependency>
<groupId>org.gcube.data.transfer</groupId> <groupId>org.gcube.data.transfer</groupId>
@ -122,89 +153,6 @@
<version>[1.2.1,2.0.0]</version> <version>[1.2.1,2.0.0]</version>
</dependency> </dependency>
<!-- Storage HUB -->
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>storagehub-client-library</artifactId>
</dependency>
<!-- MONGO -->
<!-- https://mvnrepository.com/artifact/org.mongodb/mongo-java-driver -->
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
<version>3.6.0</version>
</dependency>
<!-- GPKG -->
<!-- Read Geopackage -->
<!-- <dependency> <groupId>mil.nga.geopackage</groupId> <artifactId>geopackage</artifactId>
<version>3.5.0</version> </dependency> -->
<!-- gCube SW -->
<!-- <dependency> <groupId>org.gcube.spatial.data</groupId> <artifactId>sdi-library</artifactId>
<version>[1.0.0,2.0.0)</version> </dependency> <dependency> <groupId>org.gcube.data.transfer</groupId>
<artifactId>data-transfer-library</artifactId> <version>[1.2.1,2.0.0]</version>
</dependency> <dependency> <groupId>org.gcube.spatial.data</groupId> <artifactId>gis-interface</artifactId>
<version>[2.4.0,3.0.0)</version> </dependency> <dependency> <groupId>org.gcube.spatial.data</groupId>
<artifactId>geonetwork</artifactId> <version>[3.4.3,4.0.0)</version> </dependency>
<dependency> <groupId>org.gcube.common</groupId> <artifactId>storagehub-client-library</artifactId>
<version>[1.0.0,2.0.0)</version> </dependency> -->
<!-- HIBERNATE -->
<!-- <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId>
<version>5.3.1.Final</version> </dependency> -->
<!-- SIS -->
<!-- <dependency> <groupId>org.apache.sis.core</groupId> <artifactId>sis-referencing</artifactId>
<version>${sis.version}</version> </dependency> -->
<!-- Common - basic -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
</dependency>
<!-- STORAGE -->
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-core</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-wrapper</artifactId>
</dependency>
<!-- TEST --> <!-- TEST -->

36
pom.xml
View File

@ -71,7 +71,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <artifactId>gcube-bom</artifactId>
<version>2.0.1</version> <version>2.0.2</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -79,7 +79,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId> <artifactId>gcube-smartgears-bom</artifactId>
<version>2.1.0</version> <version>2.1.1</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -96,6 +96,7 @@
<groupId>org.gcube.application.cms</groupId> <groupId>org.gcube.application.cms</groupId>
<artifactId>cms-plugin-framework</artifactId> <artifactId>cms-plugin-framework</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0)</version> <version>[1.0.0-SNAPSHOT,2.0.0)</version>
<scope>provided</scope>
</dependency> </dependency>
@ -127,6 +128,8 @@
</dependency> </dependency>
<!-- CLIENT -->
<dependency> <dependency>
<groupId>org.gcube.application</groupId> <groupId>org.gcube.application</groupId>
<artifactId>geoportal-client</artifactId> <artifactId>geoportal-client</artifactId>
@ -136,17 +139,11 @@
<groupId>org.gcube.application.cms</groupId> <groupId>org.gcube.application.cms</groupId>
<artifactId>geoportal-common</artifactId> <artifactId>geoportal-common</artifactId>
<version>[1.0.7-SNAPSHOT,2.0.0)</version> <version>[1.0.7-SNAPSHOT,2.0.0)</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>cms-test-commons</artifactId> <!-- CUSTOM : CONCESSIONI-->
<version>[1.0.0-SNAPSHOT,2.0.0)</version>
</dependency>
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>use-cases</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0)</version>
</dependency>
<dependency> <dependency>
<groupId>org.gcube.application.cms</groupId> <groupId>org.gcube.application.cms</groupId>
@ -160,6 +157,21 @@
<version>[1.0.0-SNAPSHOT,2.0.0)</version> <version>[1.0.0-SNAPSHOT,2.0.0)</version>
</dependency> </dependency>
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>cms-test-commons</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0)</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.gcube.application.cms</groupId>
<artifactId>use-cases</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0)</version>
</dependency>
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>

View File

@ -30,14 +30,14 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <artifactId>gcube-bom</artifactId>
<version>2.0.1</version> <version>2.0.2</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-smartgears-bom</artifactId> <artifactId>gcube-smartgears-bom</artifactId>
<version>2.1.0</version> <version>2.1.1</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>