porting from svn to git

This commit is contained in:
lucio 2019-09-19 18:38:09 +02:00
parent f38d402f23
commit ccaefd9ac4
6 changed files with 11 additions and 8 deletions

View File

@ -4,7 +4,7 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="storagehub-model-1.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/storagehub-model_TRUNK/storagehub-model_TRUNK"> <dependent-module archiveName="storagehub-model-1.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/storagehub-model/storagehub-model">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<property name="context-root" value="storagehub"/> <property name="context-root" value="storagehub"/>

View File

@ -9,12 +9,12 @@
<baseDirectory>/</baseDirectory> <baseDirectory>/</baseDirectory>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${distroDirectory}</directory> <directory>.</directory>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
<useDefaultExcludes>true</useDefaultExcludes> <useDefaultExcludes>true</useDefaultExcludes>
<includes> <includes>
<include>README</include> <include>README.md</include>
<include>LICENSE</include> <include>LICENSE.md</include>
<include>changelog.xml</include> <include>changelog.xml</include>
<include>profile.xml</include> <include>profile.xml</include>
</includes> </includes>

11
pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>maven-parent</artifactId> <artifactId>maven-parent</artifactId>
<groupId>org.gcube.tools</groupId> <groupId>org.gcube.tools</groupId>
<version>1.0.0</version> <version>1.1.0-SNAPSHOT</version>
<relativePath /> <relativePath />
</parent> </parent>
@ -15,11 +15,14 @@
<version>1.0.7-SNAPSHOT</version> <version>1.0.7-SNAPSHOT</version>
<name>storagehub</name> <name>storagehub</name>
<scm>
<url>https://code-repo.d4science.org/gCubeSystem/storagehub</url>
</scm>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory> <webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
<distroDirectory>${project.basedir}/distro</distroDirectory>
<jackrabbit.version>2.16.0</jackrabbit.version> <jackrabbit.version>2.16.0</jackrabbit.version>
<tomcat.version>7.0.40</tomcat.version> <tomcat.version>7.0.40</tomcat.version>
<jetty.version>6.1.26</jetty.version> <jetty.version>6.1.26</jetty.version>
@ -447,7 +450,7 @@
<outputDirectory>${webappDirectory}</outputDirectory> <outputDirectory>${webappDirectory}</outputDirectory>
<resources> <resources>
<resource> <resource>
<directory>${distroDirectory}</directory> <directory>.</directory>
<filtering>true</filtering> <filtering>true</filtering>
</resource> </resource>
</resources> </resources>
@ -460,7 +463,7 @@
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>${distroDirectory}/descriptor.xml</descriptor> <descriptor>descriptor.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
<executions> <executions>