From c5bcb3d4e6e8c9d8cee4ac5662b4a99ba3d62348 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Fri, 9 Oct 2015 14:54:23 +0000
Subject: [PATCH] Fixing bundle

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/distributions/smartgears-distribution-bundle@119584 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                | 4 +++-
 src/resources/setup.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73ef55e..2a29d64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
 		<distroDirectory>distro</distroDirectory>
 		<targetDirectory>target/bundle</targetDirectory>
 		<smartgearsDirectory>SmartGears-Bundle</smartgearsDirectory>
+		<tomcat.version>7.0.64</tomcat.version>
 		<!-- This property MUST be passed as argument from command line
 		i.e.  mvn compile -Dsmartgears-distribution.version=1.2.5-SNAPSHOT
 		<smartgears-distribution.version>1.2.5-SNAPSHOT</smartgears-distribution.version>
@@ -56,7 +57,8 @@
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat</artifactId>
-			<version>[7.0.0,8.0.0-RC)</version>
+			<version>${tomcat.version}</version>
+			<!-- version>[7.0.0,8.0.0-RC)</version -->
 			<type>tar.gz</type>
 		</dependency>
 	</dependencies>
diff --git a/src/resources/setup.sh b/src/resources/setup.sh
index 9b6d4bb..95371a3 100644
--- a/src/resources/setup.sh
+++ b/src/resources/setup.sh
@@ -2,7 +2,7 @@ PS1='$ '
 TOMCAT_DST_FOLDER="tomcat"
 TOMCAT_VERSION="${tomcat.version}"
 TOMCAT_PID_FILENAME="tomcat.pid"
-SMARTGEAR_DISTRIBUTION_DIRECTORY="smartgears-distribution-${smartgear.version}"
+SMARTGEAR_DISTRIBUTION_DIRECTORY="smartgears-distribution-${smartgears-distribution.version}"
 SMARTGEAR_ROOT=${PWD}
 
 BUNDLE_HOME=${SMARTGEAR_ROOT}