# HG changeset patch
# User Markus Kottlaender <markus@intevation.de>
# Date 1542866918 -3600
# Node ID a76a06dd2f1e41654e103fbd3937c304455ab3ea
# Parent  bc55ffaeb639265bac27c43320482952d87dc099# Parent  717c58fea5c18a2ce3436b957692e12965895fb0
merge

diff -r bc55ffaeb639 -r a76a06dd2f1e 3rdpartylibs.sh
--- a/3rdpartylibs.sh	Thu Nov 22 07:07:12 2018 +0100
+++ b/3rdpartylibs.sh	Thu Nov 22 07:08:38 2018 +0100
@@ -1,12 +1,46 @@
 #!/bin/sh
 go get -u -v github.com/jackc/pgx
+# MIT
+
 go get -u -v github.com/etcd-io/bbolt/...
+# MIT
+
 go get -u -v github.com/mitchellh/go-homedir
+# MIT
+
 go get -u -v github.com/spf13/cobra
+# Apache-2.0
+
 go get -u -v github.com/spf13/viper
+# MIT
+
 go get -u -v github.com/gorilla/mux
+# BSD-3-Clause
+
 go get -u -v gopkg.in/gomail.v2
+# MIT
+
 go get -u -v github.com/rs/cors
+# MIT
+
 go get -u -v golang.org/x/net/html/charset
+# Go License (aka BSD-3-Clause?)
+
 go get -u -v github.com/golang/snappy
+# BSD-3-Clause
+
 go get -u -v github.com/jonas-p/go-shp
+# MIT
+
+## list of additional licenses that get fetched and installed as dependencies
+# github.com/fsnotify/fsnotify/ BSD-3-Clause
+# github.com/hashicorp/hcl/ MPL-2.0
+# github.com/magiconair/properties/ BSD-2-Clause
+# github.com/mitchellh/go-homedir/ MIT
+# github.com/mitchellh/mapstructure MIT
+# github.com/pelletier/go-toml/ MIT
+# github.com/pkg/errors BSD-2-Clause
+# github.com/spf13/afero/ Apache 2.0
+# github.com/spf13/cast MIT
+# github.com/spf13/jwalterweatherman MIT
+# gopkg.in/yaml.v2/#
diff -r bc55ffaeb639 -r a76a06dd2f1e README.md
--- a/README.md	Thu Nov 22 07:07:12 2018 +0100
+++ b/README.md	Thu Nov 22 07:08:38 2018 +0100
@@ -21,7 +21,7 @@
 ```
 
 Additionally inspect `3rdpartylibs.sh` for go components used
-for the middleware.
+for the middleware and their licenses.
 
 
 # Credits
diff -r bc55ffaeb639 -r a76a06dd2f1e docker/Dockerfile.geoserv
--- a/docker/Dockerfile.geoserv	Thu Nov 22 07:07:12 2018 +0100
+++ b/docker/Dockerfile.geoserv	Thu Nov 22 07:08:38 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.14.0
+ENV GS_VERSION 2.14.1
 ENV GS_DATADIR /opt/geoserver/data
 
 ENV CATALINA_OPTS="-DGEOSERVER_DATA_DIR=$GS_DATADIR"