gCubeSystem
/
storage-manager-trigger
16
0
Fork 0
Code Issues Releases Wiki Activity

add CHANGELOG.md 

upgrade to 1.11.0-SNAPSHOT version
upgrade mongo-java-driver to 3.12.0
switched from couchbase lib to accounting-service lib
fix JUnitTest case
This commit is contained in:
Roberto Cirillo 2021-04-19 13:00:20 +02:00
parent 84bb53dcff
commit 40bd1211ea
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md Normal file
View File

@ -0,0 +1,8 @@
# Changelog for storage-manager-trigger
## [v1.11.0-SNAPSHOT]
* add CHANGELOG.md
* upgrade mongo-java-driver to 3.12.0 version
* switch from document-store-lib-couchbase to document-sore-lib-accounting-service
* upgrade accounting libraries to 2.0.0 versions
* update JUnit to 4.12

18
pom.xml
View File

@ -8,7 +8,7 @@
</parent> </parent>
<groupId>org.gcube.contentmanagement</groupId> <groupId>org.gcube.contentmanagement</groupId>
<artifactId>storage-manager-trigger</artifactId> <artifactId>storage-manager-trigger</artifactId>
<version>1.10.0-SNAPSHOT</version> <version>1.11.0-SNAPSHOT</version>
<scm> <scm>
<url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url> <url>https://code-repo.d4science.org/gCubeSystem/${project.artifactId}</url>
</scm> </scm>
@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>org.gcube.distribution</groupId> <groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId> <artifactId>gcube-bom</artifactId>
<version>LATEST</version> <version>2.0.1</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>org.mongodb</groupId> <groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId> <artifactId>mongo-java-driver</artifactId>
<version>[3.0.0, 3.6.0)</version> <version>3.12.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -37,43 +37,37 @@
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.11</version> <version>4.12</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-scope</artifactId> <artifactId>common-scope</artifactId>
<!-- <version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.resources</groupId> <groupId>org.gcube.resources</groupId>
<artifactId>common-gcore-resources</artifactId> <artifactId>common-gcore-resources</artifactId>
<!-- <version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.resources.discovery</groupId> <groupId>org.gcube.resources.discovery</groupId>
<artifactId>ic-client</artifactId> <artifactId>ic-client</artifactId>
<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-encryption</artifactId> <artifactId>common-encryption</artifactId>
<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.core</groupId> <groupId>org.gcube.core</groupId>
<artifactId>common-scope-maps</artifactId> <artifactId>common-scope-maps</artifactId>
<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.data.publishing</groupId> <groupId>org.gcube.data.publishing</groupId>
<artifactId>document-store-lib</artifactId> <artifactId>document-store-lib</artifactId>
<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.data.publishing</groupId> <groupId>org.gcube.data.publishing</groupId>
<artifactId>document-store-lib-couchbase</artifactId> <artifactId>document-store-lib-accounting-service</artifactId>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> <version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.gcube.accounting</groupId> <groupId>org.gcube.accounting</groupId>

13
src/test/java/org/gcube/contentmanager/storageserver/accounting/ProviderUriTest.java
View File

@ -1,18 +1,19 @@
package org.gcube.contentmanager.storageserver.accounting; package org.gcube.contentmanager.storageserver.accounting;
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
import org.junit.Before; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
public class ProviderUriTest { public class ProviderUriTest {
ReportAccountingImpl report; static ReportAccountingImpl report;
private static final String scope="/d4science.research-infrastructures.eu"; private static final String scope="/gcube";
@Before @BeforeClass
public void init(){ public static void init(){
report = new ReportAccountingImpl(); report = new ReportAccountingImpl();
ScopeProvider.instance.set(scope); ScopeProvider.instance.set(scope);