<Change>Passing smartgears-distribution version as argument when compiling</Change>

<Change>Used tomcat 7 range instead of fixed version</Change>

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution-bundle@119557 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2015-10-09 09:00:03 +00:00
parent 8c75b35891
commit 8a10bbbd76
3 changed files with 21 additions and 14 deletions

View File

@ -1,8 +1,9 @@
The gCube System - ${name}
----------------------
This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2), D4Science (FP7-INFRA-2007-1.2.2),
D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2), and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil).
This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),
D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2),
and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1).
Authors
-------

View File

@ -1,8 +1,15 @@
<ReleaseNotes>
<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-0" date="2015-03-11">
<Change>First Release</Change>
<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-3" date="2015-10-16">
<Change>Passing smartgears-distribution version as argument when compiling</Change>
<Change>Used tomcat 7 range instead of fixed version</Change>
</Changeset>
<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-2" date="2015-05-15">
<Change>Reorganized package creation</Change>
</Changeset>
<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-1" date="2015-04-15">
<Change>Adding Bundle Version on container.xml to be published on ghn profile</Change>
</Changeset>
<Changeset component="org.gcube.distribution.smartgears-distribution-bundle.1-0-0" date="2015-03-11">
<Change>First Release</Change>
</Changeset>
</ReleaseNotes>

19
pom.xml
View File

@ -13,14 +13,13 @@
<version>1.0.3-SNAPSHOT</version>
<packaging>pom</packaging>
<name>A distribution bundle for the SmartGears Framework</name>
<description>A distribution bundle for the SmartGears Framework containing Tomcat and ReadMe files to quickly installing smartgear</description>
<description>A distribution bundle for the SmartGears Framework containing Tomcat and ReadMe files to install quickly Smartgears</description>
<properties>
<distroDirectory>distro</distroDirectory>
<targetDirectory>target/bundle</targetDirectory>
<smartgearDirectory>SmartGears-Bundle</smartgearDirectory>
<tomcat.version>7.0.61</tomcat.version>
<smartgear.version>1.2.5-SNAPSHOT</smartgear.version>
<smartgearsDirectory>SmartGears-Bundle</smartgearsDirectory>
<!-- smartgears-distribution.version>1.2.5-SNAPSHOT</smartgears-distribution.version -->
<resourcesDirectory>src/resources</resourcesDirectory>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@ -47,14 +46,14 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>smartgears-distribution</artifactId>
<version>${smartgear.version}</version>
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat</artifactId>
<version>${tomcat.version}</version>
<version>[7.0.0,8.0.0-RC)</version>
<type>tar.gz</type>
</dependency>
</dependencies>
@ -73,7 +72,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/${targetDirectory}/${smartgearDirectory}</outputDirectory>
<outputDirectory>${basedir}/${targetDirectory}/${smartgearsDirectory}</outputDirectory>
<resources>
<resource>
<directory>${resourcesDirectory}</directory>
@ -89,7 +88,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/${targetDirectory}/${smartgearDirectory}/distro</outputDirectory>
<outputDirectory>${basedir}/${targetDirectory}/${smartgearsDirectory}/distro</outputDirectory>
<resources>
<resource>
<directory>${distroDirectory}</directory>
@ -112,7 +111,7 @@
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/${targetDirectory}/${smartgearDirectory}</outputDirectory>
<outputDirectory>${basedir}/${targetDirectory}/${smartgearsDirectory}</outputDirectory>
<excludeTypes>war</excludeTypes>
</configuration>
</execution>
@ -131,7 +130,7 @@
</execution>
</executions>
<configuration>
<file>${basedir}/${targetDirectory}/${smartgearDirectory}/smartgears-distribution-${smartgear.version}/container.xml</file>
<file>${basedir}/${targetDirectory}/${smartgearsDirectory}/smartgears-distribution-${smartgears-distribution.version}/container.xml</file>
<replacements>
<replacement>
<token>UnBundled</token>