refactor: upgrade collective.taxonomy, remove eea.api.taxonomy - refs…

… #145360

README.md

@@ -5,28 +5,29 @@
 [![Release](https://img.shields.io/github/v/release/eea/eea.docker.plone)](https://github.com/eea/eea.docker.plone/releases)
 
 Plone 5 (Python 3) with built-in support for:
-* RelStorage
-* RestAPI
-* LDAP
-* Memcached
-* zc.async
-* Graylog
-* Sentry
-* Faceted Navigation
+
+- RelStorage
+- RestAPI
+- LDAP
+- Memcached
+- zc.async
+- Graylog
+- Sentry
+- Faceted Navigation
 
 This image is generic, thus you can obviously re-use it within your own projects.
 
 ## Releases
 
-* `github.com:` [eea/eea.docker.plone/releases](https://github.com/eea/eea.docker.plone/releases)
+- `github.com:` [eea/eea.docker.plone/releases](https://github.com/eea/eea.docker.plone/releases)
 
 ## Base docker image
 
-* `hub.docker.com:` [eeacms/plone](https://hub.docker.com/r/eeacms/plone/)
+- `hub.docker.com:` [eeacms/plone](https://hub.docker.com/r/eeacms/plone/)
 
 ## Source code
 
-* `github.com:` [eea/eea.docker.plone](http://github.com/eea/eea.docker.plone)
+- `github.com:` [eea/eea.docker.plone](http://github.com/eea/eea.docker.plone)
 
 ## Simple Usage
 
@@ -62,8 +63,8 @@ See [docker-compose.yml](https://github.com/eea/eea.docker.plone/blob/master/doc
 
 For this you'll have to provide the following custom files:
 
-* `site.cfg`
-* `Dockerfile`
+- `site.cfg`
+- `Dockerfile`
 
 Below is an example of `site.cfg` and `Dockerfile` to build a custom version of Plone with some add-ons based on this image:
 
@@ -81,8 +82,7 @@ Below is an example of `site.cfg` and `Dockerfile` to build a custom version of
     [versions]
     eea.facetednavigation = 11.7
     collective.elasticsearch = 3.0.2
-    collective.taxonomy = 1.5.1
-
+    collective.taxonomy = 3.1
 
 **Dockerfile**:
 
@@ -95,34 +95,33 @@ and then run
 
     $ docker build -t plone-rulez .
 
-
 ## Supported environment variables
 
 ### Zope
 
-* `ZOPE_MODE` Can be `standalone`, `zeo_client`, `zeo_async`,  `rel_client`, `rel_async`. Default `standalone`
-* `ZOPE_THREADS` Configure zserver-threads. Default `2` (e.g.: `ZOPE_THREADS=4`)
-* `ZOPE_FAST_LISTEN` Set to `off` to defer opening of the HTTP socket until the end of the Zope startup phase. Defaults to `off` (e.g.: `ZOPE_FAST_LISTEN=on`)
-* `ZOPE_FORCE_CONNECTION_CLOSE` Set to `on` to enforce Zope to set `Connection: close header`. Default `on` (e.g.: `ZOPE_FORCE_CONNECTION_CLOSE=off`)
+- `ZOPE_MODE` Can be `standalone`, `zeo_client`, `zeo_async`, `rel_client`, `rel_async`. Default `standalone`
+- `ZOPE_THREADS` Configure zserver-threads. Default `2` (e.g.: `ZOPE_THREADS=4`)
+- `ZOPE_FAST_LISTEN` Set to `off` to defer opening of the HTTP socket until the end of the Zope startup phase. Defaults to `off` (e.g.: `ZOPE_FAST_LISTEN=on`)
+- `ZOPE_FORCE_CONNECTION_CLOSE` Set to `on` to enforce Zope to set `Connection: close header`. Default `on` (e.g.: `ZOPE_FORCE_CONNECTION_CLOSE=off`)
 
 ### RelStorage
 
-* `RELSTORAGE_HOST` Custom PostgreSQL address, `postgres` by default (e.g.: `RELSTORAGE_HOST=1.2.3.4`)
-* `RELSTORAGE_USER` Custom PostgreSQL user, `zope` by default (e.g.: `RELSTORAGE_USER=plone`)
-* `RELSTORAGE_PASS` Custom PostgreSQL password, `zope` by default (e.g.: `RELSTORAGE_PASS=secret`)
-* `RELSTORAGE_KEEP_HISTORY` history-preserving database schema, `false` by default (e.g.: `RELSTORAGE_KEEP_HISTORY=true`)
+- `RELSTORAGE_HOST` Custom PostgreSQL address, `postgres` by default (e.g.: `RELSTORAGE_HOST=1.2.3.4`)
+- `RELSTORAGE_USER` Custom PostgreSQL user, `zope` by default (e.g.: `RELSTORAGE_USER=plone`)
+- `RELSTORAGE_PASS` Custom PostgreSQL password, `zope` by default (e.g.: `RELSTORAGE_PASS=secret`)
+- `RELSTORAGE_KEEP_HISTORY` history-preserving database schema, `false` by default (e.g.: `RELSTORAGE_KEEP_HISTORY=true`)
 
 ### Graylog
 
-* `GRAYLOG` Configure zope inside container to send logs to Graylog. Default `logcentral.eea.europa.eu:12201` (e.g.: `GRAYLOG=logs.example.com:12201`)
-* `GRAYLOG_FACILITY` Custom GrayLog facility. Default `eea.docker.plone` (e.g.: `GRAYLOG_FACILITY=staging.example.com`)
+- `GRAYLOG` Configure zope inside container to send logs to Graylog. Default `logcentral.eea.europa.eu:12201` (e.g.: `GRAYLOG=logs.example.com:12201`)
+- `GRAYLOG_FACILITY` Custom GrayLog facility. Default `eea.docker.plone` (e.g.: `GRAYLOG_FACILITY=staging.example.com`)
 
 ### Sentry
 
-* `SENTRY_DSN` Send python tracebacks to sentry.io or your custom Sentry installation (e.g.: SENTRY_DSN=https://<public_key>:<secret_key>@sentry.example.com)
-* `SENTRY_SITE`, `SERVER_NAME` Add site tag to Sentry logs (e.g.: `SENTRY_SITE=foo.example.com`)
-* `SENTRY_RELEASE` Add release tag to Sentry logs (e.g.: `SENTRY_RELEASE=5.1.5-34`)
-* `SENTRY_ENVIRONMENT` Add environment tag to Sentry logs. Leave empty to automatically get it from `rancher-metadata` (e.g.: `SENTRY_ENVIRONMENT=staging`)
+- `SENTRY_DSN` Send python tracebacks to sentry.io or your custom Sentry installation (e.g.: SENTRY_DSN=https://<public_key>:<secret_key>@sentry.example.com)
+- `SENTRY_SITE`, `SERVER_NAME` Add site tag to Sentry logs (e.g.: `SENTRY_SITE=foo.example.com`)
+- `SENTRY_RELEASE` Add release tag to Sentry logs (e.g.: `SENTRY_RELEASE=5.1.5-34`)
+- `SENTRY_ENVIRONMENT` Add environment tag to Sentry logs. Leave empty to automatically get it from `rancher-metadata` (e.g.: `SENTRY_ENVIRONMENT=staging`)
 
 See also **Plone** [Supported Environment Variables](https://github.com/plone/plone.docker#for-advanced-usage)
 

src/plone/versions.cfg

@@ -133,7 +133,7 @@ Products.ZLDAPMethods = 1.6
 Products.ZSPARQLMethod = 2.3
 Products.ZMIntrospection = 1.0
 XlsxWriter = 1.2.7
-collective.taxonomy = 2.2.1
+collective.taxonomy = 3.1
 collective.volto.subsites = 1.3.1
 eea.volto.policy = 2.2
 eea.dexterity.sparql = 1.0
@@ -226,7 +226,6 @@ XlsxWriter = 3.0.9
 
 # used by eprtr
 eea.api.layout = 3.2
-eea.api.taxonomy = 1.5
 
 # required by eea.restapi
 eea.volto.slate = 1.0