From 7e710f743d9eeb3e2e1ccbc352363829bcf315c7 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Fri, 20 May 2022 14:45:52 +0200
Subject: [PATCH] Bump deprecations we forgot to remove in 2.0.0. (#362)

---
 changelogs/fragments/362-deprecations.yml | 3 +++
 plugins/module_utils/common.py            | 4 ++--
 plugins/modules/docker_stack.py           | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/fragments/362-deprecations.yml

diff --git a/changelogs/fragments/362-deprecations.yml b/changelogs/fragments/362-deprecations.yml
new file mode 100644
index 000000000..75189408e
--- /dev/null
+++ b/changelogs/fragments/362-deprecations.yml
@@ -0,0 +1,3 @@
+deprecated_features:
+  - "docker_stack - the return values ``out`` and ``err`` that were supposed to be removed in community.docker 2.0.0 will now be removed in version 3.0.0 (https://github.com/ansible-collections/community.docker/pull/362)."
+  - "Various modules - the default of ``tls_hostname`` that was supposed to be removed in community.docker 2.0.0 will now be removed in version 3.0.0 (https://github.com/ansible-collections/community.docker/pull/362)."
diff --git a/plugins/module_utils/common.py b/plugins/module_utils/common.py
index f4295066b..82e3cee4a 100644
--- a/plugins/module_utils/common.py
+++ b/plugins/module_utils/common.py
@@ -187,10 +187,10 @@ def update_tls_hostname(result, old_behavior=False, deprecate_function=None, use
             result['tls_hostname'] = DEFAULT_TLS_HOSTNAME
             if uses_tls and deprecate_function is not None:
                 deprecate_function(
-                    'The default value "localhost" for tls_hostname is deprecated and will be removed in community.docker 2.0.0.'
+                    'The default value "localhost" for tls_hostname is deprecated and will be removed in community.docker 3.0.0.'
                     ' From then on, docker_host will be used to compute tls_hostname. If you want to keep using "localhost",'
                     ' please set that value explicitly.',
-                    version='2.0.0', collection_name='community.docker')
+                    version='3.0.0', collection_name='community.docker')
             return
 
         # get default machine name from the url
diff --git a/plugins/modules/docker_stack.py b/plugins/modules/docker_stack.py
index e37abdf21..7a900dd77 100644
--- a/plugins/modules/docker_stack.py
+++ b/plugins/modules/docker_stack.py
@@ -78,7 +78,7 @@
   - pyyaml
 
 notes:
-  - Return values I(out) and I(err) have been deprecated and will be removed in community.docker 2.0.0. Use I(stdout) and I(stderr) instead.
+  - Return values I(out) and I(err) have been deprecated and will be removed in community.docker 3.0.0. Use I(stdout) and I(stderr) instead.
 '''
 
 RETURN = '''