# HG changeset patch
# User Markus Kottlaender <markus@intevation.de>
# Date 1540895818 -3600
# Node ID 4489e96fb2b494ad23d414081f66d7de2e49f176
# Parent  dbf0221b1cf14e21fba3b6206075f7f240df4c85# Parent  1ce42139ea0ac98aebf44f97efae81a11ad7daec
merge

diff -r dbf0221b1cf1 -r 4489e96fb2b4 client/src/layers/layers.js
--- a/client/src/layers/layers.js	Tue Oct 30 11:35:36 2018 +0100
+++ b/client/src/layers/layers.js	Tue Oct 30 11:36:58 2018 +0100
@@ -1,16 +1,17 @@
 /*
  * This is Free Software under GNU Affero General Public License v >= 3.0
  * without warranty, see README.md and license for details.
- * 
+ *
  * SPDX-License-Identifier: AGPL-3.0-or-later
  * License-Filename: LICENSES/AGPL-3.0.txt
- * 
+ *
  * Copyright (C) 2018 by via donau 
  *   – Österreichische Wasserstraßen-Gesellschaft mbH
  * Software engineering by Intevation GmbH
- * 
+ *
  * Author(s):
- * Thomas Junk <thomas.junk@intevation.de>
+ *   Thomas Junk <thomas.junk@intevation.de>
+ *   Bernhard E. Reiter <bernhard.reiter@intevation.de>
  */
 
 import TileWMS from "ol/source/TileWMS.js";
diff -r dbf0221b1cf1 -r 4489e96fb2b4 docker/Dockerfile.geoserv
--- a/docker/Dockerfile.geoserv	Tue Oct 30 11:35:36 2018 +0100
+++ b/docker/Dockerfile.geoserv	Tue Oct 30 11:36:58 2018 +0100
@@ -12,7 +12,7 @@
 ENV CATALINA_TMPDIR /tmp/tomcat8-tmp
 
 ENV GS_URL https://downloads.sourceforge.net/project/geoserver/GeoServer
-ENV GS_VERSION 2.13.2
+ENV GS_VERSION 2.14.0
 ENV GS_DATADIR /opt/geoserver/data
 
 ENV CATALINA_OPTS="-DGEOSERVER_DATA_DIR=$GS_DATADIR"