removed maven-resources plugin declaration from pom. Fix copyTest Junit

This commit is contained in:
Roberto Cirillo 2022-07-28 14:35:46 +02:00
parent 857fd1bdf8
commit 78ab0e203f
10 changed files with 31 additions and 166 deletions

View File

@ -1,16 +0,0 @@
v 2.2.0 (21-04-2015)
* change smp protocol
v 2.1.0 (01-04-2014)
* support MongoDB backend with authentication
v 2.0.1 (29-05-2013)
* bug fix incident: connection pending #606
v 2.0.0 (19-05-2013)
* added move, copy and link operations
*FWS integration
v 1.0.2 (15-01-2013)
* Integration with new gCube release 2.12.0 version system
v 1.0.1 (11-10-2012)
* added VOLATILE area
v. 1.0.0 (04-05-2012)
* First release

View File

@ -1,2 +0,0 @@
${gcube.license}

View File

@ -1 +0,0 @@
* Roberto Cirillo (roberto.cirillo@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo"

Binary file not shown.

View File

@ -1,55 +0,0 @@
<ReleaseNotes>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-5-1" date="2019-03-20">
<Change>Added HomeLibrary wrapper configuration for the new preproduction infrastructure</Change>
<Change>Added new Costants class for Junit package</Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-5-1" date="2018-10-11">
<Change>Constants definition moved on storage-manager-core Castants class</Change>
<Change>Added new Costants class for Junit package</Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-5-0" date="2017-10-15">
<Change>Added new JUnit Test classes</Change>
<Change>update JUnit Test Classes</Change>
<Change>delete old method for retrieving remote phrase used by old smp protocol classes</Change>
<Change></Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-3-1" date="2016-01-14">
<Change>dinamically load "write concern"" and ""read preference" options</Change>
<Change>add method for decrypt an id</Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-3-0" date="2016-01-14">
<Change>dinamically load smpConnection handler</Change>
<Change>add method for decrypt an id</Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-2-1" date="2015-07-01">
<Change>update JUnit test for smp uri without payload</Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-2-0" date="2015-04-21">
<Change>change smp protocol</Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-1-0" date="2014-04-01">
<Change>support MongoDB backend with authentication</Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.2-0-3" date="2014-02-12">
<Change>Integration with new gCube release 3.0.0 version system</Change>
<Change>Java7 refactoring</Change>
</Changeset>
<Changeset component="${build.finalName}" date="2013-05-29">
<Change>Integration with new gCube release 2.15.0 version system</Change>
<Change>bugfix on pending connections</Change>
</Changeset>
<Changeset component="${build.finalName}" date="2013-04-29">
<Change>Integration with new gCube release 2.14.0 version system</Change>
<Change>FWS integration</Change>
<Change>added move, copy and link operations</Change>
</Changeset>
<Changeset component="${build.finalName}" date="2013-01-15">
<Change>Integration with new gCube release 2.12.0 version system</Change>
</Changeset>
<Changeset component="org.gcube.content-management.storage-manager-wrapper.1-0-1" date="2012-10-11">
<Change>Added VOLATILE area</Change>
</Changeset>
<Changeset component="${build.finalName}" date="2012-05-04">
<Change>First Release</Change>
</Changeset>
</ReleaseNotes>

View File

@ -1,32 +0,0 @@
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
<id>servicearchive</id>
<formats>
<format>tar.gz</format>
</formats>
<baseDirectory>/</baseDirectory>
<fileSets>
<fileSet>
<directory>${distroDirectory}</directory>
<outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>README</include>
<include>LICENSE</include>
<include>changelog.xml</include>
<include>profile.xml</include>
</includes>
<fileMode>755</fileMode>
<filtered>true</filtered>
</fileSet>
</fileSets>
<files>
<file>
<source>target/${build.finalName}.${project.packaging}</source>
<outputDirectory>/${artifactId}</outputDirectory>
</file>
</files>
</assembly>

View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<ID />
<Type>Service</Type>
<Profile>
<Description>${description}</Description>
<Class>ContentManagement</Class>
<Name>${artifactId}</Name>
<Version>1.0.0</Version>
<Packages>
<Software>
<Name>${artifactId}</Name>
<Version>${version}</Version>
<MavenCoordinates>
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
</MavenCoordinates>
<Files>
<File>${build.finalName}.jar</File>
</Files>
</Software>
</Packages>
</Profile>
</Resource>

View File

@ -1 +0,0 @@
${scm.url}

64
pom.xml
View File

@ -68,10 +68,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
<dependency>
<groupId>org.slf4j</groupId>
@ -85,34 +81,34 @@
<version>1.8</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>copy-profile</id>
<phase>install</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>target</outputDirectory>
<resources>
<resource>
<directory>${distroDirectory}</directory>
<filtering>true</filtering>
<includes>
<include>profile.xml</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<!-- <build>-->
<!-- <plugins>-->
<!-- <plugin>-->
<!-- <groupId>org.apache.maven.plugins</groupId>-->
<!-- <artifactId>maven-resources-plugin</artifactId>-->
<!-- <version>2.5</version>-->
<!-- <executions>-->
<!-- <execution>-->
<!-- <id>copy-profile</id>-->
<!-- <phase>install</phase>-->
<!-- <goals>-->
<!-- <goal>copy-resources</goal>-->
<!-- </goals>-->
<!-- <configuration>-->
<!-- <outputDirectory>target</outputDirectory>-->
<!-- <resources>-->
<!-- <resource>-->
<!-- <directory>${distroDirectory}</directory>-->
<!-- <filtering>true</filtering>-->
<!-- <includes>-->
<!-- <include>profile.xml</include>-->
<!-- </includes>-->
<!-- </resource>-->
<!-- </resources>-->
<!-- </configuration>-->
<!-- </execution>-->
<!-- </executions>-->
<!-- </plugin>-->
<!-- </plugins>-->
<!-- </build>-->
</project>

View File

@ -148,6 +148,7 @@ public class CopyTest {
File f =new File(newFilePath2);
System.out.println("path new File downloaded: "+f.getAbsolutePath());
assertTrue(f.exists());
// check if the remote file is a dog
assertEquals(dogSize, f.length());
// removeCopiedFile(remoteCopyPath, "test/copyDir/");