Adjust deprecation versions.

plugins/modules/cloud/google/gcdns_record.py

@@ -23,7 +23,7 @@ requirements:
     - "python >= 2.6"
     - "apache-libcloud >= 0.19.0"
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: Use M(gcp_dns_resource_record_set) instead.
 options:

plugins/modules/cloud/google/gcdns_zone.py

@@ -22,7 +22,7 @@ author: "William Albert (@walbert947)"
 requirements:
     - "apache-libcloud >= 0.19.0"
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: Use M(gcp_dns_managed_zone) instead.
 options:

plugins/modules/cloud/google/gce.py

@@ -16,7 +16,7 @@ description:
        Full install/configuration instructions for the gce* modules can
        be found in the comments of ansible/test/gce_tests.py.
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: Use M(gcp_compute_instance) instead.
 options:

plugins/modules/cloud/google/gcp_backend_service.py

@@ -22,7 +22,7 @@ notes:
   - Only global backend services are currently supported. Regional backends not currently supported.
   - Internal load balancing not currently supported.
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: Use M(gcp_compute_backend_service) instead.
 author:

plugins/modules/cloud/google/gcp_forwarding_rule.py

@@ -23,7 +23,7 @@ requirements:
   - "google-auth >= 0.9.0"
   - "google-auth-httplib2 >= 0.0.2"
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: Use M(gcp_compute_forwarding_rule) or M(gcp_compute_global_forwarding_rule) instead.
 notes:

plugins/modules/cloud/google/gcp_healthcheck.py

@@ -32,7 +32,7 @@ requirements:
 notes:
   - Only supports HTTP and HTTPS Healthchecks currently.
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: >
       Use M(gcp_compute_health_check), M(gcp_compute_http_health_check) or

plugins/modules/cloud/google/gcp_target_proxy.py

@@ -21,7 +21,7 @@ requirements:
   - "google-auth >= 0.9.0"
   - "google-auth-httplib2 >= 0.0.2"
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: Use M(gcp_compute_target_http_proxy) instead.
 notes:

plugins/modules/cloud/google/gcp_url_map.py

@@ -26,7 +26,7 @@ notes:
 author:
   - "Tom Melendez (@supertom) <tom@supertom.com>"
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: Use M(gcp_compute_url_map) instead.
 options:

plugins/modules/cloud/google/gcpubsub_info.py

@@ -104,7 +104,8 @@ def main():
         credentials_file=dict(),
         project_id=dict(), ),)
     if module._name in ('gcpubsub_facts', 'community.general.gcpubsub_facts'):
-        module.deprecate("The 'gcpubsub_facts' module has been renamed to 'gcpubsub_info'", version='2.13')
+        module.deprecate("The 'gcpubsub_facts' module has been renamed to 'gcpubsub_info'",
+                         version='3.0.0', collection_name='community.general')  # was Ansible 2.13
 
     if not HAS_PYTHON26:
         module.fail_json(

plugins/modules/cloud/google/gcspanner.py

@@ -21,7 +21,7 @@ requirements:
 notes:
   - Changing the configuration on an existing instance is not supported.
 deprecated:
-    removed_in: "2.12"
+    removed_in: 2.0.0  # was Ansible 2.12
     why: Updated modules released with increased functionality
     alternative: Use M(gcp_spanner_database) and/or M(gcp_spanner_instance) instead.
 author: