gCubeSystem
/
gcube-cms-suite
14
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed dependency tree

This commit is contained in:
Fabio Sinibaldi 2021-09-24 11:52:56 +02:00
parent d4702fdee0
commit 9707eb70d3
5 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cms-test-commons/pom.xml
View File

@ -62,7 +62,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
<dependency>

22
geoportal-common/pom.xml
View File

@ -20,17 +20,17 @@
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>2.0.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<!-- <dependencyManagement>-->
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>org.gcube.distribution</groupId>-->
<!-- <artifactId>gcube-bom</artifactId>-->
<!-- <version>2.0.1</version>-->
<!-- <type>pom</type>-->
<!-- <scope>import</scope>-->
<!-- </dependency>-->
<!-- </dependencies>-->
<!-- </dependencyManagement>-->
<scm>
<connection>scm:git:${gitBaseUrl}/${project.artifactId}.git</connection>

1
geoportal-service/pom.xml
View File

@ -196,7 +196,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>

22
geoportal-service/src/test/java/org/gcube/application/geoportal/service/ConcessioniOverMongoTest.java
View File

@ -40,7 +40,7 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{
TokenSetter.set(scope);
}
//Used for local test data
private static Concessione upload(StorageUtils storage, WebTarget target,String id, String path, String ...files) throws Exception {
FileSets.RequestBuilder builder = FileSets.build(path);
@ -52,6 +52,17 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{
MediaType.APPLICATION_JSON)),Concessione.class);
}
//generic
private static Concessione upload(StorageUtils storage, WebTarget target,String id, String path, File ...files) throws Exception {
FileSets.RequestBuilder builder = FileSets.build(path);
for(File file:files)
builder.add(storage.putOntoStorage(file,file.getName()));
return check(target.path(FILES_PATH).path(id).request(MediaType.APPLICATION_JSON).
post(Entity.entity(Serialization.write(builder.getTheRequest()),
MediaType.APPLICATION_JSON)),Concessione.class);
}
private static Concessione publish(WebTarget target, Concessione conc) throws Exception {
Response resp=target.path(PUBLISH_PATH).path(conc.getMongo_id()).request(MediaType.APPLICATION_JSON).
@ -298,12 +309,15 @@ public class ConcessioniOverMongoTest extends BasicServiceTestUnit{
upload(storage,target,c.getMongo_id(),Paths.ABSTRACT_RELAZIONE,"relazione.pdf");
upload(storage,target,c.getMongo_id(),Paths.POSIZIONAMENTO,
TestModel.getBaseFolder().list((file,name)->{return name.startsWith("pos");}));
// TestModel.getBaseFolder().list((file,name)->{return name.startsWith("pos");}));
new File("/Users/fabioisti/Documents/invio_08_05/Montalto di Castro (VT)_Vulci_Indagini non invasive_Doc. paragr._Va/CONSEGNA_WGS84")
.listFiles((file,name)->{return name.startsWith("Mag_area");}));
// Clash on workspaces
upload(storage,target,c.getMongo_id(),Paths.piantaByIndex(0),
TestModel.getBaseFolder().list((file,name)->{return name.startsWith("pianta");}));
// TestModel.getBaseFolder().list((file,name)->{return name.startsWith("pianta");}));
new File("/Users/fabioisti/Documents/invio_08_05/Montalto di Castro (VT)_Vulci_Indagini non invasive_Doc. paragr._Va/CONSEGNA_WGS84")
.listFiles((file,name)->{return name.startsWith("Mag_anomalies_WGS84");}));
upload(storage,target,c.getMongo_id(),Paths.imgByIndex(0),"immagine.png");
upload(storage,target,c.getMongo_id(),Paths.imgByIndex(1),"immagine2.png");

10
pom.xml
View File

@ -83,7 +83,17 @@
<version>1.14.8</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.14.8</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
</dependency>
</dependencies>
</dependencyManagement>