From 7834f8bf663d5bf0352071e0c94a3af1957b7a03 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Thu, 30 Jun 2016 18:00:00 +0200
Subject: [PATCH] library/roles/smartgears: Fix some dataminer defaults.

---
 smartgears/dataminer_app/defaults/main.yml              | 5 ++---
 smartgears/dataminer_app/templates/dataminer-pom.xml.j2 | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/smartgears/dataminer_app/defaults/main.yml b/smartgears/dataminer_app/defaults/main.yml
index 4c12e336..af4da244 100644
--- a/smartgears/dataminer_app/defaults/main.yml
+++ b/smartgears/dataminer_app/defaults/main.yml
@@ -9,11 +9,10 @@ dataminer_52north_webapp_file: 52n-wps-webapp-3.3.2-20150523.010021-9.war
 #dataminer_52north_webapp_url: 'http://build.dev.52north.org/jenkins/view/Processing/job/52n-wps_GIT-DEV_nightly_builds/lastSuccessfulBuild/org.n52.wps$52n-wps-webapp/artifact/org.n52.wps/52n-wps-webapp/3.3.2-20150523.010021-9/{{ dataminer_52north_webapp_file }}'
 dataminer_52north_webapp_url: 'http://data.d4science.org/uri-resolver/id?fileName=wps-3.3.2.war&smp-id=565d67b7e4b0eacf4a0fc5ad&contentType=application%2Fx-tika-java-web-archive'
 dataminer_maven_enable_gcube_snapshots: False
-#dataminer_dataminer_jar_version: 1.0.1-3.10.0
-#dataminer_dataminer_jar_version: 1.0.2-3.10.1
 dataminer_dataminer_jar_version: 1.2.0-SNAPSHOT
 
-dataminer_dataminer_jar_version_range: "[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)"
+#dataminer_dataminer_jar_version_range: "[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)"
+dataminer_dataminer_jar_version_range: '{{ dataminer_dataminer_jar_version }}'
 
 dataminer_gcube_web_xml: "http://data.d4science.org/id?fileName=web.xml&smp-id=56615ae0e4b0158fcb561817&contentType=application%2Fxml"
 dataminer_gcube_app_xml: "http://data.d4science.org/id?fileName=gcube-app.xml&smp-id=56615ae0e4b0158fcb561815&contentType=application%2Fxml"
diff --git a/smartgears/dataminer_app/templates/dataminer-pom.xml.j2 b/smartgears/dataminer_app/templates/dataminer-pom.xml.j2
index f7d409d0..ce1c4fdd 100644
--- a/smartgears/dataminer_app/templates/dataminer-pom.xml.j2
+++ b/smartgears/dataminer_app/templates/dataminer-pom.xml.j2
@@ -4,12 +4,12 @@
   <groupId>org.gcube</groupId>
   <artifactId>dataminer</artifactId>
   <packaging>jar</packaging>
-  <version>{{ dataminer_dataminer_jar_version }}</version>
+  <version>{{ dataminer_dataminer_jar_version_range }}</version>
   <dependencies>
     <dependency>
       <groupId>org.gcube.dataanalysis</groupId>
       <artifactId>dataminer</artifactId>
-      <version>{{ dataminer_dataminer_jar_version }}</version>
+      <version>{{ dataminer_dataminer_jar_version_range }}</version>
     </dependency>
   </dependencies>
 </project>