From 0361979f507f558aeae662f39a61a0095bca1c93 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Tue, 19 Mar 2024 16:20:44 -0400
Subject: [PATCH 1/8] weaver: bump version to 5.1.0

---
 CHANGES.md                              | 4 +++-
 birdhouse/components/weaver/default.env | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5e9e05a9e..a65633acc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,7 +15,9 @@
 [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
 ------------------------------------------------------------------------------------------------------------------
 
-[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+## Changes
+
+- Weaver: bump version to 5.1.0
 
 [2.1.1](https://github.com/bird-house/birdhouse-deploy/tree/2.1.1) (2024-03-06)
 ------------------------------------------------------------------------------------------------------------------
diff --git a/birdhouse/components/weaver/default.env b/birdhouse/components/weaver/default.env
index 6dccc8370..334bd7d48 100644
--- a/birdhouse/components/weaver/default.env
+++ b/birdhouse/components/weaver/default.env
@@ -47,7 +47,7 @@ OPTIONAL_VARS="
 export WEAVER_CONFIG=HYBRID
 
 # default release version that will be used to fetch docker images (API mananger & celery workers services)
-export WEAVER_VERSION=4.32.0
+export WEAVER_VERSION=5.1.0
 
 # default release of the MongoDB version employed by Weaver
 # NOTE:

From a1b735159eb64fd643d39909699131e47239001d Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Wed, 20 Mar 2024 08:45:03 -0400
Subject: [PATCH 2/8] bump weaver to 5.1.1

---
 CHANGES.md                              | 2 +-
 birdhouse/components/weaver/default.env | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a65633acc..27262fb91 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@
 
 ## Changes
 
-- Weaver: bump version to 5.1.0
+- Weaver: bump version to 5.1.1
 
 [2.1.1](https://github.com/bird-house/birdhouse-deploy/tree/2.1.1) (2024-03-06)
 ------------------------------------------------------------------------------------------------------------------
diff --git a/birdhouse/components/weaver/default.env b/birdhouse/components/weaver/default.env
index 334bd7d48..d93004a94 100644
--- a/birdhouse/components/weaver/default.env
+++ b/birdhouse/components/weaver/default.env
@@ -47,7 +47,7 @@ OPTIONAL_VARS="
 export WEAVER_CONFIG=HYBRID
 
 # default release version that will be used to fetch docker images (API mananger & celery workers services)
-export WEAVER_VERSION=5.1.0
+export WEAVER_VERSION=5.1.1
 
 # default release of the MongoDB version employed by Weaver
 # NOTE:

From fe00b80f0e220b1070c19259755df76f858e73fa Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:12:44 -0400
Subject: [PATCH 3/8] update Changes

---
 CHANGES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8c32e021f..a57496fe0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,9 @@
 
 - Weaver: bump version to 5.1.1
 
+  - See changes in the [Weaver changes 
+    file](https://github.com/crim-ca/weaver/blob/ec5f403958de21e1af27ff86da391d0d53ded5d9/CHANGES.rst?plain=1#L23-L249)
+
 [2.1.2](https://github.com/bird-house/birdhouse-deploy/tree/2.1.2) (2024-03-25)
 ------------------------------------------------------------------------------------------------------------------
 

From e6021c85d1d8cf8cd56c1df8d23b8ed50daa6e1b Mon Sep 17 00:00:00 2001
From: Francis Charette Migneault <francis.charette.migneault@gmail.com>
Date: Tue, 23 Apr 2024 10:41:10 -0400
Subject: [PATCH 4/8] fix weaver failing wps retry on unresolved network + fix
 weaver wps retry going +1 index

---
 CHANGES.md                                         | 8 ++++++++
 birdhouse/components/weaver/post-docker-compose-up | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 336640814..5a92ba777 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,14 @@
   - See changes in the [Weaver changes 
     file](https://github.com/crim-ca/weaver/blob/ec5f403958de21e1af27ff86da391d0d53ded5d9/CHANGES.rst?plain=1#L23-L249)
 
+## Fixes
+
+- Weaver: WPS retry logic on post-compose step.
+  - Apply `--network birdhouse_default` to the Docker `curl` image to allow HTTP requests to properly resolve
+    against the running services (WPS bird providers, Weave and Magpie). In some cases, this network would not
+    be automatically resolved.
+  - Fix the index used during HTTP request retry to avoid going one step over the intended retry attempts.
+
 [2.2.0](https://github.com/bird-house/birdhouse-deploy/tree/2.2.0) (2024-04-18)
 ------------------------------------------------------------------------------------------------------------------
 
diff --git a/birdhouse/components/weaver/post-docker-compose-up b/birdhouse/components/weaver/post-docker-compose-up
index 29e90c1d3..be366928b 100755
--- a/birdhouse/components/weaver/post-docker-compose-up
+++ b/birdhouse/components/weaver/post-docker-compose-up
@@ -120,7 +120,7 @@ RANDOM_NUMBER=${RANDOM:-$(tr -dc 0-9 < /dev/urandom 2>/dev/null | head -c 5)}
 # To know when a docker run was started in case it hangs.
 DOCKER_RUN_TAG="weaver_post_curl_$(date -Isecond | sed 's/:/_/g' | sed 's/+/p/g')_${RANDOM_NUMBER}"
 curl_cmd() {
-    docker run --rm --name "${DOCKER_RUN_TAG}" "${WEAVER_CURL_IMAGE}" "$@"
+    docker run --network birdhouse_default --rm --name "${DOCKER_RUN_TAG}" "${WEAVER_CURL_IMAGE}" "$@"
 }
 
 # pull image if missing to avoid mangling output messages on first call
@@ -317,7 +317,7 @@ for prov in ${WEAVER_WPS_PROVIDERS}; do
         if [ ${ret} -ne 0 ] || [ "${code}" -ne 201 ]; then
             printf "\n%s\n" "${WARN}Failed registration of remote WPS provider [${prov}] on [${prov_url}]${retry_msg}."
             printf "Error:\n%s\n" "${body}"
-            if [ ${retry} -gt ${total} ]; then
+            if [ ${retry} -ge ${total} ]; then
               echo "${ERROR}Maximum retry attempts ${total} reached for WPS provider [${prov}]. Aborting."
               reset_state
               exit 23

From d1e5e3bfc5bf95e87f0ee648c107871d35256c63 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Thu, 23 May 2024 10:45:18 -0400
Subject: [PATCH 5/8] fix CHANGES.md after merge

---
 CHANGES.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3079a7c01..5d5e2670c 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,12 @@
   - See changes in the [Weaver changes 
     file](https://github.com/crim-ca/weaver/blob/ec5f403958de21e1af27ff86da391d0d53ded5d9/CHANGES.rst?plain=1#L23-L249)
 
+- Weaver: WPS retry logic on post-compose step.
+  - Apply `--network birdhouse_default` to the Docker `curl` image to allow HTTP requests to properly resolve
+    against the running services (WPS bird providers, Weave and Magpie). In some cases, this network would not
+    be automatically resolved.
+  - Fix the index used during HTTP request retry to avoid going one step over the intended retry attempts.
+
 [2.3.1](https://github.com/bird-house/birdhouse-deploy/tree/2.3.1) (2024-05-21)
 ------------------------------------------------------------------------------------------------------------------
 
@@ -71,12 +77,6 @@
 
 ## Fixes
 
-- Weaver: WPS retry logic on post-compose step.
-  - Apply `--network birdhouse_default` to the Docker `curl` image to allow HTTP requests to properly resolve
-    against the running services (WPS bird providers, Weave and Magpie). In some cases, this network would not
-    be automatically resolved.
-  - Fix the index used during HTTP request retry to avoid going one step over the intended retry attempts.
-
 - docs: Fix version of `sphinx-mdinclude` to address incompatible `docutils` operation under ReadTheDocs Sphinx build.
 
   - See [docutils 0.21 changes](https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-21-2024-04-09).

From 16ae2132c92702472502367a51a1d63eb692793b Mon Sep 17 00:00:00 2001
From: Francis Charette Migneault <francis.charette.migneault@gmail.com>
Date: Tue, 11 Jun 2024 19:40:06 -0400
Subject: [PATCH 6/8] update weaver 5.6.0

---
 CHANGES.md                              | 12 ++++++++----
 birdhouse/components/weaver/default.env |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e584eade2..e7c0045c5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,10 +17,14 @@
 
 ## Changes
 
-- Weaver: bump version to 5.1.1
-
-  - See changes in the [Weaver changes 
-    file](https://github.com/crim-ca/weaver/blob/ec5f403958de21e1af27ff86da391d0d53ded5d9/CHANGES.rst?plain=1#L23-L249)
+- Weaver: bump version to [5.6.0](https://github.com/crim-ca/weaver/tree/5.6.0).
+
+  - See full changes details in 
+    [Weaver changes](https://pavics-weaver.readthedocs.io/en/latest/changes.html#changes-5-6-0)
+  - In summary:
+    - multiple control setting options to customize some behaviors
+    - improved *OGC API - Processes* standard conformance
+    - improved support of *Common Workflow Language (CWL)* features (secrets, sub-workflow, auth-propagation, etc.)
 
 - Weaver: WPS retry logic on post-compose step.
   - Apply `--network birdhouse_default` to the Docker `curl` image to allow HTTP requests to properly resolve
diff --git a/birdhouse/components/weaver/default.env b/birdhouse/components/weaver/default.env
index aa6a16a57..db56865d4 100644
--- a/birdhouse/components/weaver/default.env
+++ b/birdhouse/components/weaver/default.env
@@ -53,7 +53,7 @@ OPTIONAL_VARS="
 export WEAVER_CONFIG=HYBRID
 
 # default release version that will be used to fetch docker images (API mananger & celery workers services)
-export WEAVER_VERSION=5.1.1
+export WEAVER_VERSION=5.6.0
 export WEAVER_DOCKER=pavics/weaver
 export WEAVER_IMAGE='${WEAVER_DOCKER}:${WEAVER_VERSION}'
 export WEAVER_MANAGER_IMAGE='${WEAVER_IMAGE}-manager'

From bdf94236c1a7f0531d2ff3d23b52e8386373baa2 Mon Sep 17 00:00:00 2001
From: Francis Charette Migneault <francis.charette.migneault@gmail.com>
Date: Fri, 14 Jun 2024 10:12:26 -0400
Subject: [PATCH 7/8] update weaver 5.6.1 with fix
 https://github.com/crim-ca/weaver/pull/666

---
 CHANGES.md                              | 4 ++--
 birdhouse/components/weaver/default.env | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index e7c0045c5..bb06ae38a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,10 +17,10 @@
 
 ## Changes
 
-- Weaver: bump version to [5.6.0](https://github.com/crim-ca/weaver/tree/5.6.0).
+- Weaver: bump version to [5.6.1](https://github.com/crim-ca/weaver/tree/5.6.1).
 
   - See full changes details in 
-    [Weaver changes](https://pavics-weaver.readthedocs.io/en/latest/changes.html#changes-5-6-0)
+    [Weaver changes](https://pavics-weaver.readthedocs.io/en/latest/changes.html#changes-5-6-1)
   - In summary:
     - multiple control setting options to customize some behaviors
     - improved *OGC API - Processes* standard conformance
diff --git a/birdhouse/components/weaver/default.env b/birdhouse/components/weaver/default.env
index db56865d4..97ab1623e 100644
--- a/birdhouse/components/weaver/default.env
+++ b/birdhouse/components/weaver/default.env
@@ -53,7 +53,7 @@ OPTIONAL_VARS="
 export WEAVER_CONFIG=HYBRID
 
 # default release version that will be used to fetch docker images (API mananger & celery workers services)
-export WEAVER_VERSION=5.6.0
+export WEAVER_VERSION=5.6.1
 export WEAVER_DOCKER=pavics/weaver
 export WEAVER_IMAGE='${WEAVER_DOCKER}:${WEAVER_VERSION}'
 export WEAVER_MANAGER_IMAGE='${WEAVER_IMAGE}-manager'

From 8a545f1d841966a544fa618e0be8ab51417ecf17 Mon Sep 17 00:00:00 2001
From: Francis Charette Migneault <francis.charette.migneault@gmail.com>
Date: Wed, 19 Jun 2024 21:10:13 -0400
Subject: [PATCH 8/8] =?UTF-8?q?Bump=20version:=202.4.2=20=E2=86=92=202.5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .bumpversion.cfg    | 7 ++++---
 CHANGES.md          | 5 +++++
 Makefile            | 2 +-
 README.rst          | 8 ++++----
 RELEASE.txt         | 2 +-
 docs/source/conf.py | 4 ++--
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 8a6dd58d6..d5f68052f 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.4.2
+current_version = 2.5.0
 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-06-12T20:14:03Z
+search = {current_version} 2024-06-20T01:10:13Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2024-06-12T20:14:03Z
+values = 2024-06-20T01:10:13Z
 
 [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'
@@ -48,3 +48,4 @@ replace = {utcnow:%Y-%m-%dT%H:%M:%SZ}
 [bumpversion:file:docs/source/conf.py]
 search = '{current_version}'
 replace = '{new_version}'
+
diff --git a/CHANGES.md b/CHANGES.md
index 423e3156d..d10799f68 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -15,6 +15,11 @@
 [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest)
 ------------------------------------------------------------------------------------------------------------------
 
+[//]: # (list changes here, using '-' for each new entry, remove this when items are added)
+
+[2.5.0](https://github.com/bird-house/birdhouse-deploy/tree/2.5.0) (2024-06-20)
+------------------------------------------------------------------------------------------------------------------
+
 ## Changes
 
 - Weaver: bump version to [5.6.1](https://github.com/crim-ca/weaver/tree/5.6.1).
diff --git a/Makefile b/Makefile
index ce881de09..93bac927e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 2.4.2
+override APP_VERSION := 2.5.0
 
 # 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
index 391853a67..18df360e1 100644
--- 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.4.2.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.5.0.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.4.2...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/2.5.0...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-2.4.2-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-2.5.0-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.4.2
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/2.5.0
 
 .. |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
index 79233af4f..650c344bb 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1 +1 @@
-2.4.2 2024-06-12T20:14:03Z
+2.5.0 2024-06-20T01:10:13Z
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 9c3024af6..329cffdfd 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.4.2'
+version = '2.5.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.2'
+release = '2.5.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.