From 8a10bbbd76c1deee30babcf18b2847aaf3103294 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 9 Oct 2015 09:00:03 +0000
Subject: [PATCH] <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
---
 distro/README        |  5 +++--
 distro/changelog.xml | 11 +++++++++--
 pom.xml              | 19 +++++++++----------
 3 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/distro/README b/distro/README
index 1d30ab0..fdc03c2 100644
--- a/distro/README
+++ b/distro/README
@@ -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
 -------
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 58340c6..f860ee3 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 868bc86..dc85d3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>