Merge branch 'devel_11.1.x-clean' into devel_12.0.x

CHANGELOG

@@ -3,9 +3,9 @@ minerva (12.0.1) stable; urgency=medium
   * Bug fix: opened submap had different background then current selection
   * Bug fix: clicking on comments was difficult in OpenLayers
   * Bug fix: general map comment didn't display coordinates properly
-  * Bug fix: opening could crash when CellDesigner file contained duplicate 
+  * Bug fix: opening could crash when CellDesigner file contained duplicate
     reaction id
-  
+
  -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 21 Jul 2018 18:00:00 +0200
 
 minerva (12.0.0) stable; urgency=medium
@@ -77,6 +77,14 @@ minerva (12.0.0) stable; urgency=medium
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 16 Jul 2018 12:00:00 +0200
 
+minerva (11.1.3) stable; urgency=medium
+  * Bug fix RPM: remove directory with contents of unpacked war file
+    when uninstalling
+  * Bug fix: don't append Google API key to Google maps javascript URL
+    when it is not set
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 23 Jul 2018 12:00:00 +0200
+
 minerva (11.1.2) stable; urgency=medium
   * Bug fix: Searching for chemicals with invalid mesh ID crashed
   * Bug fix: opening map that was removed and re-uploaded could crash

frontend-js/src/main/js/minerva.js

@@ -308,7 +308,11 @@ function create(params) {
     params.setProject(project);
     var promise = Promise.resolve();
     if (params.getProject().getMapCanvasType() === "GOOGLE_MAPS_API") {
-      promise = functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing&key=" + params.getConfiguration().getOption(ConfigurationType.GOOGLE_MAPS_API_KEY).getValue());
+      var apiKeySuffixString = '';
+      if (params.getConfiguration().getOption(ConfigurationType.GOOGLE_MAPS_API_KEY).getValue()) {
+        apiKeySuffixString = '&key=' + params.getConfiguration().getOption(ConfigurationType.GOOGLE_MAPS_API_KEY).getValue();
+      }
+      promise = functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing" + apiKeySuffixString);
     }
     return promise;
   }).then(function () {

persist/src/db/11.1.3/fix_db_20180723.sql

+-- empty file to force directory to be commited to git repo

rpm/minerva.spec.in

@@ -41,10 +41,12 @@ if ! su - postgres -c "psql --dbname map_viewer -q -c '\q'" 2> /dev/null; then
 fi
 
 %preun -p /bin/bash
-# save version information of the old package to make sure we run the correct DB-update script after installation
 if [ $1 == 1 ]; then
+    # save version information of the old package to make sure we run the correct DB-update script after installation
     mkdir -p %{_sharedstatedir}/rpm-state/%{name}
     echo -n %{version} > %{_sharedstatedir}/rpm-state/%{name}/OLD_VERSION
+    # remove old unpacked ("exploded") directory of war file
+    rm -rf %{_sharedstatedir}/tomcat/webapps/%{name}
 fi
 
 %posttrans -p /bin/bash