Update Thredds to supported version (#413)

## Overview Unidata has dropped support for TDS versions < 5.x. This updates Thredds to version 5.5. Requires matching update: * Ouranosinc/pavics-sdi#341 * Ouranosinc/pavics-sdi#342 * Ouranosinc/PAVICS-landing#101 ## Changes **Non-breaking changes** - Adds... - New component version pavics/thredds-docker:5.5-unidata-2024-11-19-with-tds-plugin-jar-with-dependencies.jar **Breaking changes** - None ## Related Issue / Discussion - Resolves #168 ## Additional Information Links to other issues or sources.  birdhouse_daccs_configs_branch: master birdhouse_skip_ci: false
bird-house · Dec 5, 2024 · 16b12e4 · 16b12e4
2 parents 225f3c3 + ba4d044
commit 16b12e4
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 23 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.6.2
+current_version = 2.6.3
 commit = True
 tag = False
 tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
 replace = {new_version}
 
 [bumpversion:file:RELEASE.txt]
-search = {current_version} 2024-12-03T20:46:32Z
+search = {current_version} 2024-12-05T23:54:48Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2024-12-03T20:46:32Z
+values = 2024-12-05T23:54:48Z
 
 [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

diff --git a/CHANGES.md b/CHANGES.md
@@ -17,6 +17,16 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[2.6.3](https://github.com/bird-house/birdhouse-deploy/tree/2.6.3) (2024-12-05)
+------------------------------------------------------------------------------------------------------------------
+
+## Changes
+
+- Update Thredds to supported version
+
+  Unidata has dropped support for TDS versions < 5.x. This updates Thredds to version 5.5.
+
+
 [2.6.2](https://github.com/bird-house/birdhouse-deploy/tree/2.6.2) (2024-12-03)
 ------------------------------------------------------------------------------------------------------------------
 

diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 2.6.2
+override APP_VERSION := 2.6.3
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

diff --git a/README.rst b/README.rst
@@ -18,13 +18,13 @@ for a full-fledged production platform.
     * - citation
       - | |citation|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.3.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.3...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.3-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.3
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

diff --git a/RELEASE.txt b/RELEASE.txt
@@ -1 +1 @@
-2.6.2 2024-12-03T20:46:32Z
+2.6.3 2024-12-05T23:54:48Z
diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template
@@ -108,8 +108,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.6.2',
-            'releaseTime': '2024-12-03T20:46:32Z',
+            'version': '2.6.3',
+            'releaseTime': '2024-12-05T23:54:48Z',
             'institution': '${BIRDHOUSE_INSTITUTION}',
             'researchSubject': '${BIRDHOUSE_SUBJECT}',
             'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '2.6.2',
-            'releaseTime': '2024-12-03T20:46:32Z',
+            'version': '2.6.3',
+            'releaseTime': '2024-12-05T23:54:48Z',
             'institution': '${BIRDHOUSE_INSTITUTION}',
             'researchSubject': '${BIRDHOUSE_SUBJECT}',
             'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

diff --git a/birdhouse/components/thredds/catalog.xml.template b/birdhouse/components/thredds/catalog.xml.template
@@ -11,7 +11,8 @@
         <service name="iso" serviceType="ISO" base="${TWITCHER_PROTECTED_PATH}/thredds/iso/"/>
         <service name="wcs" serviceType="WCS" base="${TWITCHER_PROTECTED_PATH}/thredds/wcs/" />
         <service name="wms" serviceType="WMS" base="${TWITCHER_PROTECTED_PATH}/thredds/wms/" />
-        <service name="subsetServer" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/" />
+        <service name="ncssGrid" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/grid/" />
+        <service name="ncssPoint" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/point/" />
     </service>
 
     <datasetScan name="${THREDDS_SERVICE_DATA_LOCATION_NAME}" ID="${THREDDS_SERVICE_DATA_URL_PATH}" path="${THREDDS_SERVICE_DATA_URL_PATH}" location="${THREDDS_SERVICE_DATA_LOCATION_ON_CONTAINER}">

diff --git a/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template b/birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template
@@ -40,7 +40,7 @@ SERVICES['Thredds'] = {
         'name': 'Thredds',
         'synopsis': 'Climate Data Catalog and Format Renderers',
         'version': "${THREDDS_VERSION}",
-        'releaseTime': get_release_time_from_repo_tag("docker", "${THREDDS_DOCKER}", "${THREDDS_VERSION}"),
+        'releaseTime': get_release_time_from_repo_tag("docker", "${THREDDS_DOCKER}", "${THREDDS_TAGGED}"),
         'institution': 'Ouranos',
         'researchSubject': 'Catalog',
         'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

diff --git a/birdhouse/components/thredds/default.env b/birdhouse/components/thredds/default.env
@@ -1,9 +1,10 @@
 # All env in this default.env can be overridden by env.local.
 
 # thredds-docker >= 4.6.18 or >= 5.2 strongly recommended to avoid Log4J CVE-2021-44228.
-export THREDDS_VERSION=4.6.18-unidata-2022-01
+export THREDDS_TAGGED="5.5-unidata-2024-11-19-with-tds-plugin-jar-with-dependencies.jar"
+export THREDDS_VERSION="5.5.0-unidata-2024-11-19"
 export THREDDS_DOCKER=pavics/thredds-docker
-export THREDDS_IMAGE='${THREDDS_DOCKER}:${THREDDS_VERSION}'
+export THREDDS_IMAGE='${THREDDS_DOCKER}:${THREDDS_TAGGED}'
 export THREDDS_IMAGE_URI='registry.hub.docker.com/${THREDDS_IMAGE}'
 export THREDDS_ORGANIZATION="Birdhouse"
 export THREDDS_ADDITIONAL_CATALOG=""
@@ -54,6 +55,7 @@ OPTIONAL_VARS="
   \$THREDDS_ORGANIZATION
   \$TWITCHER_PROTECTED_PATH
   \$THREDDS_DOCKER
+  \$THREDDS_TAGGED
   \$THREDDS_VERSION
   \$THREDDS_IMAGE
   \$THREDDS_IMAGE_URI

diff --git a/birdhouse/components/thredds/threddsConfig.xml.template b/birdhouse/components/thredds/threddsConfig.xml.template
@@ -92,7 +92,7 @@ https://www.unidata.ucar.edu/software/tds/current/reference/ThreddsConfigXMLFile
   </NCISO>
 
   <!--
-  https://www.unidata.ucar.edu/software/tds/current/reference/ThreddsConfigXMLFile.html#DiskCache
+  https://docs.unidata.ucar.edu/tds/current/userguide/tds_config_ref.html#cdm-library-disk-cache
 
   These elements control where the CDM/NetCDF-Java library writes temporary
   files, for example when it needs to unzip files, or write GRIB index files,

diff --git a/birdhouse/components/thredds/wmsConfig.xml b/birdhouse/components/thredds/wmsConfig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wmsConfig SYSTEM "http://www.unidata.ucar.edu/schemas/thredds/dtd/ncwms/wmsConfig.dtd">
+<!DOCTYPE wmsConfig SYSTEM "https://schemas.unidata.ucar.edu/thredds/dtd/ncwms/wmsConfig.dtd">
 <!--
 Detailed configuration of the WMS service.  This config file can be used to
 set default styling parameters for each dataset/variable, and to enable or disable

diff --git a/birdhouse/optional-components/testthredds/catalog.xml.template b/birdhouse/optional-components/testthredds/catalog.xml.template
@@ -11,7 +11,8 @@
         <service name="iso" serviceType="ISO" base="/${TESTTHREDDS_CONTEXT_ROOT}/iso/"/>
         <service name="wcs" serviceType="WCS" base="/${TESTTHREDDS_CONTEXT_ROOT}/wcs/" />
         <service name="wms" serviceType="WMS" base="/${TESTTHREDDS_CONTEXT_ROOT}/wms/" />
-        <service name="subsetServer" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/" />
+        <service name="ncssGrid" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/grid/" />
+        <service name="ncssPoint" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/point/" />
     </service>
 
     <datasetScan name="TestDatasets" ID="testdatasets" path="testdatasets" location="/birdhouse-testdata">

diff --git a/birdhouse/optional-components/testthredds/wmsConfig.xml b/birdhouse/optional-components/testthredds/wmsConfig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wmsConfig SYSTEM "http://www.unidata.ucar.edu/schemas/thredds/dtd/ncwms/wmsConfig.dtd">
+<!DOCTYPE wmsConfig SYSTEM "https://schemas.unidata.ucar.edu/thredds/dtd/ncwms/wmsConfig.dtd">
 <!--
 Detailed configuration of the WMS service.  This config file can be used to
 set default styling parameters for each dataset/variable, and to enable or disable

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.6.2'
+version = '2.6.3'
 # The full version, including alpha/beta/rc tags.
-release = '2.6.2'
+release = '2.6.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2.6.2 2024-12-03T20:46:32Z
		2.6.3 2024-12-05T23:54:48Z