Skip to content

Commit 16b12e4

Browse files
tlvutlvu
authored
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. <!-- The test suite can be run using a different DACCS config with ``birdhouse_daccs_configs_branch: branch_name`` in the PR description. To globally skip the test suite regardless of the commit message use ``birdhouse_skip_ci: true`` in the PR description. --> birdhouse_daccs_configs_branch: master birdhouse_skip_ci: false
2 parents 225f3c3 + ba4d044 commit 16b12e4

File tree

14 files changed

+37
-23
lines changed

14 files changed

+37
-23
lines changed

‎.bumpversion.cfg

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 2.6.2
2+
current_version = 2.6.3
33
commit = True
44
tag = False
55
tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
3030
replace = {new_version}
3131

3232
[bumpversion:file:RELEASE.txt]
33-
search = {current_version} 2024-12-03T20:46:32Z
33+
search = {current_version} 2024-12-05T23:54:48Z
3434
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
3535

3636
[bumpversion:part:releaseTime]
37-
values = 2024-12-03T20:46:32Z
37+
values = 2024-12-05T23:54:48Z
3838

3939
[bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
4040
search = 'version': '{current_version}'

‎CHANGES.md

+10
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@
1717

1818
[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
1919

20+
[2.6.3](https://github.com/bird-house/birdhouse-deploy/tree/2.6.3) (2024-12-05)
21+
------------------------------------------------------------------------------------------------------------------
22+
23+
## Changes
24+
25+
- Update Thredds to supported version
26+
27+
Unidata has dropped support for TDS versions < 5.x. This updates Thredds to version 5.5.
28+
29+
2030
[2.6.2](https://github.com/bird-house/birdhouse-deploy/tree/2.6.2) (2024-12-03)
2131
------------------------------------------------------------------------------------------------------------------
2232

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generic variables
22
override SHELL := bash
33
override APP_NAME := birdhouse-deploy
4-
override APP_VERSION := 2.6.2
4+
override APP_VERSION := 2.6.3
55

66
# utility to remove comments after value of an option variable
77
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

‎README.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ for a full-fledged production platform.
1818
* - citation
1919
- | |citation|
2020

21-
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.2.svg
21+
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.6.3.svg
2222
:alt: Commits since latest release
23-
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.2...master
23+
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.6.3...master
2424

25-
.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.2-blue.svg?style=flat
25+
.. |latest-version| image:: https://img.shields.io/badge/tag-2.6.3-blue.svg?style=flat
2626
:alt: Latest Tag
27-
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.2
27+
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.6.3
2828

2929
.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
3030
:alt: ReadTheDocs Build Status (latest version)

‎RELEASE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.2 2024-12-03T20:46:32Z
1+
2.6.3 2024-12-05T23:54:48Z

‎birdhouse/components/canarie-api/docker_configuration.py.template

+4-4
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ SERVICES = {
108108
# NOTE:
109109
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
110110
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
111-
'version': '2.6.2',
112-
'releaseTime': '2024-12-03T20:46:32Z',
111+
'version': '2.6.3',
112+
'releaseTime': '2024-12-05T23:54:48Z',
113113
'institution': '${BIRDHOUSE_INSTITUTION}',
114114
'researchSubject': '${BIRDHOUSE_SUBJECT}',
115115
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',
@@ -141,8 +141,8 @@ PLATFORMS = {
141141
# NOTE:
142142
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
143143
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
144-
'version': '2.6.2',
145-
'releaseTime': '2024-12-03T20:46:32Z',
144+
'version': '2.6.3',
145+
'releaseTime': '2024-12-05T23:54:48Z',
146146
'institution': '${BIRDHOUSE_INSTITUTION}',
147147
'researchSubject': '${BIRDHOUSE_SUBJECT}',
148148
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

‎birdhouse/components/thredds/catalog.xml.template

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<service name="iso" serviceType="ISO" base="${TWITCHER_PROTECTED_PATH}/thredds/iso/"/>
1212
<service name="wcs" serviceType="WCS" base="${TWITCHER_PROTECTED_PATH}/thredds/wcs/" />
1313
<service name="wms" serviceType="WMS" base="${TWITCHER_PROTECTED_PATH}/thredds/wms/" />
14-
<service name="subsetServer" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/" />
14+
<service name="ncssGrid" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/grid/" />
15+
<service name="ncssPoint" serviceType="NetcdfSubset" base="${TWITCHER_PROTECTED_PATH}/thredds/ncss/point/" />
1516
</service>
1617

1718
<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}">

‎birdhouse/components/thredds/config/canarie-api/canarie_api_monitoring.py.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ SERVICES['Thredds'] = {
4040
'name': 'Thredds',
4141
'synopsis': 'Climate Data Catalog and Format Renderers',
4242
'version': "${THREDDS_VERSION}",
43-
'releaseTime': get_release_time_from_repo_tag("docker", "${THREDDS_DOCKER}", "${THREDDS_VERSION}"),
43+
'releaseTime': get_release_time_from_repo_tag("docker", "${THREDDS_DOCKER}", "${THREDDS_TAGGED}"),
4444
'institution': 'Ouranos',
4545
'researchSubject': 'Catalog',
4646
'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}',

‎birdhouse/components/thredds/default.env

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# All env in this default.env can be overridden by env.local.
22

33
# thredds-docker >= 4.6.18 or >= 5.2 strongly recommended to avoid Log4J CVE-2021-44228.
4-
export THREDDS_VERSION=4.6.18-unidata-2022-01
4+
export THREDDS_TAGGED="5.5-unidata-2024-11-19-with-tds-plugin-jar-with-dependencies.jar"
5+
export THREDDS_VERSION="5.5.0-unidata-2024-11-19"
56
export THREDDS_DOCKER=pavics/thredds-docker
6-
export THREDDS_IMAGE='${THREDDS_DOCKER}:${THREDDS_VERSION}'
7+
export THREDDS_IMAGE='${THREDDS_DOCKER}:${THREDDS_TAGGED}'
78
export THREDDS_IMAGE_URI='registry.hub.docker.com/${THREDDS_IMAGE}'
89
export THREDDS_ORGANIZATION="Birdhouse"
910
export THREDDS_ADDITIONAL_CATALOG=""
@@ -54,6 +55,7 @@ OPTIONAL_VARS="
5455
\$THREDDS_ORGANIZATION
5556
\$TWITCHER_PROTECTED_PATH
5657
\$THREDDS_DOCKER
58+
\$THREDDS_TAGGED
5759
\$THREDDS_VERSION
5860
\$THREDDS_IMAGE
5961
\$THREDDS_IMAGE_URI

‎birdhouse/components/thredds/threddsConfig.xml.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ https://www.unidata.ucar.edu/software/tds/current/reference/ThreddsConfigXMLFile
9292
</NCISO>
9393

9494
<!--
95-
https://www.unidata.ucar.edu/software/tds/current/reference/ThreddsConfigXMLFile.html#DiskCache
95+
https://docs.unidata.ucar.edu/tds/current/userguide/tds_config_ref.html#cdm-library-disk-cache
9696
9797
These elements control where the CDM/NetCDF-Java library writes temporary
9898
files, for example when it needs to unzip files, or write GRIB index files,

‎birdhouse/components/thredds/wmsConfig.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE wmsConfig SYSTEM "http://www.unidata.ucar.edu/schemas/thredds/dtd/ncwms/wmsConfig.dtd">
2+
<!DOCTYPE wmsConfig SYSTEM "https://schemas.unidata.ucar.edu/thredds/dtd/ncwms/wmsConfig.dtd">
33
<!--
44
Detailed configuration of the WMS service. This config file can be used to
55
set default styling parameters for each dataset/variable, and to enable or disable

‎birdhouse/optional-components/testthredds/catalog.xml.template

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<service name="iso" serviceType="ISO" base="/${TESTTHREDDS_CONTEXT_ROOT}/iso/"/>
1212
<service name="wcs" serviceType="WCS" base="/${TESTTHREDDS_CONTEXT_ROOT}/wcs/" />
1313
<service name="wms" serviceType="WMS" base="/${TESTTHREDDS_CONTEXT_ROOT}/wms/" />
14-
<service name="subsetServer" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/" />
14+
<service name="ncssGrid" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/grid/" />
15+
<service name="ncssPoint" serviceType="NetcdfSubset" base="/${TESTTHREDDS_CONTEXT_ROOT}/ncss/point/" />
1516
</service>
1617

1718
<datasetScan name="TestDatasets" ID="testdatasets" path="testdatasets" location="/birdhouse-testdata">

‎birdhouse/optional-components/testthredds/wmsConfig.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE wmsConfig SYSTEM "http://www.unidata.ucar.edu/schemas/thredds/dtd/ncwms/wmsConfig.dtd">
2+
<!DOCTYPE wmsConfig SYSTEM "https://schemas.unidata.ucar.edu/thredds/dtd/ncwms/wmsConfig.dtd">
33
<!--
44
Detailed configuration of the WMS service. This config file can be used to
55
set default styling parameters for each dataset/variable, and to enable or disable

‎docs/source/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
# built documents.
7070
#
7171
# The short X.Y version.
72-
version = '2.6.2'
72+
version = '2.6.3'
7373
# The full version, including alpha/beta/rc tags.
74-
release = '2.6.2'
74+
release = '2.6.3'
7575

7676
# The language for content autogenerated by Sphinx. Refer to documentation
7777
# for a list of supported languages.

0 commit comments

Comments
 (0)