changeset 1273:a76a06dd2f1e

merge
author Markus Kottlaender <markus@intevation.de>
date Thu, 22 Nov 2018 07:08:38 +0100
parents bc55ffaeb639 (current diff) 717c58fea5c1 (diff)
children dc3fb8ad8f86
files
diffstat 3 files changed, 36 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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/#
--- 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
--- 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"