Merge branch 'master' of

code-repo.d4science.org:gCubeSystem/data-transfer-library

# Conflicts:
#	pom.xml
This commit is contained in:
Fabio Sinibaldi 2020-12-01 15:28:14 +01:00
commit c98e037890
1 changed files with 24 additions and 4 deletions

28
pom.xml
View File

@ -8,7 +8,7 @@
</parent>
<groupId>org.gcube.data.transfer</groupId>
<artifactId>data-transfer-library</artifactId>
<version>1.2.3-SNAPSHOT</version>
<version>1.2.2</version>
<name>DataTransfer-library</name>
<description>Data Transfer Service client library</description>
@ -53,19 +53,19 @@
<dependency>
<groupId>org.gcube.data.transfer</groupId>
<artifactId>data-transfer-model</artifactId>
<version>[1.0.0,2.0.0)</version>
<version>[1.2.5,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- STORAGE -->
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-core</artifactId>
<version>[2.0.0, 3.0.0)</version>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-wrapper</artifactId>
<version>[2.0.0, 3.0.0)</version>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency>
@ -94,6 +94,26 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- <dependency> -->
<!-- <groupId>com.fasterxml.jackson.core</groupId> -->
<!-- <artifactId>jackson-core</artifactId> -->
<!-- <version>2.8.4</version> -->
<!-- <scope>compile</scope> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>com.fasterxml.jackson.core</groupId> -->
<!-- <artifactId>jackson-annotations</artifactId> -->
<!-- <version>2.8.4</version> -->
<!-- <scope>compile</scope> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>com.fasterxml.jackson.core</groupId> -->
<!-- <artifactId>jackson-databind</artifactId> -->
<!-- <version>2.8.4</version> -->
<!-- <scope>compile</scope> -->
<!-- </dependency> -->
<!-- TEST -->
<dependency>