From 878e99ffd7508db9a9461e1348a88f8ab62cfadf Mon Sep 17 00:00:00 2001
From: Abhishek Choudhary <shreemaan.abhishek@gmail.com>
Date: Tue, 8 Oct 2024 14:11:06 +0545
Subject: [PATCH] chore: release 3.11.0

---
 .asf.yaml                         |  4 ++++
 CHANGELOG.md                      | 28 ++++++++++++++++++++++++++++
 Makefile                          |  1 -
 apisix/core/version.lua           |  2 +-
 docs/en/latest/building-apisix.md |  2 +-
 docs/en/latest/config.json        |  2 +-
 docs/zh/latest/building-apisix.md |  2 +-
 docs/zh/latest/config.json        |  2 +-
 8 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 5d657124b314..8e13b5afb2f7 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -53,6 +53,10 @@ github:
           dismiss_stale_reviews: true
           require_code_owner_reviews: true
           required_approving_review_count: 3
+      release/3.11:
+        required_pull_request_reviews:
+          require_code_owner_reviews: true
+          required_approving_review_count: 3
       release/3.10:
         required_pull_request_reviews:
           require_code_owner_reviews: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b173ca6ef300..e99167258ed4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ title: Changelog
 
 ## Table of Contents
 
+- [3.11.0](#3110)
 - [3.10.0](#3100)
 - [3.9.0](#390)
 - [3.8.0](#380)
@@ -77,6 +78,33 @@ title: Changelog
 - [0.7.0](#070)
 - [0.6.0](#060)
 
+## 3.11.0
+
+### Change
+
+- jwt-auth plugin no longer requires a private_key to be uploaded. [#11597](https://github.com/apache/apisix/pull/11597)
+- rewrite hmac-auth plugin for usability [#11581](https://github.com/apache/apisix/pull/11581)
+
+### Plugins
+
+- allow configuring keepalive_timeout in splunk-logger [#11611](https://github.com/apache/apisix/pull/11611)
+- add plugin attach-consmer-label [#11604](https://github.com/apache/apisix/pull/11604)
+- ai-proxy plugin [#11499](https://github.com/apache/apisix/pull/11499)
+- ai-prompt-decorator plugin [#11515](https://github.com/apache/apisix/pull/11515)
+- ai-prompt-template plugin [#11517](https://github.com/apache/apisix/pull/11517)
+
+### Bugfixes
+
+- Fix: adjust the position of enums in pb_option_def [#11448](https://github.com/apache/apisix/pull/11448)
+- Fix: encryption/decryption for non-auth plugins in consumer [#11600](https://github.com/apache/apisix/pull/11600)
+- Fix: confusion when substituting ENV in config file [#11545](https://github.com/apache/apisix/pull/11545)
+
+### Core
+
+- support gcp secret manager [#11436](https://github.com/apache/apisix/pull/11436)
+- support aws secret manager [#11417](https://github.com/apache/apisix/pull/11417)
+- implement consumer credential [#11601](https://github.com/apache/apisix/pull/11601)
+
 ## 3.10.0
 
 ### Change
diff --git a/Makefile b/Makefile
index 545a21e4f29f..585d5bcaee78 100644
--- a/Makefile
+++ b/Makefile
@@ -432,7 +432,6 @@ compress-tar:
 	./apisix \
 	./bin \
 	./conf \
-	./apisix-$(VERSION)*.rockspec \
 	./apisix-master-0.rockspec \
 	LICENSE \
 	Makefile \
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index 91fe77c523ed..9aa349d66611 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -20,5 +20,5 @@
 -- @module core.version
 
 return {
-    VERSION = "3.10.0"
+    VERSION = "3.11.0"
 }
diff --git a/docs/en/latest/building-apisix.md b/docs/en/latest/building-apisix.md
index 5ab13227a4ab..a88cfa883b9f 100644
--- a/docs/en/latest/building-apisix.md
+++ b/docs/en/latest/building-apisix.md
@@ -48,7 +48,7 @@ To build and package APISIX for a specific platform, see [apisix-build-tools](ht
 First of all, we need to specify the version `APISIX_VERSION` to be installed:
 
 ```shell
-APISIX_VERSION='3.10.0'
+APISIX_VERSION='3.11.0'
 ```
 
 Then, you can run the following command to clone the APISIX source code from Github:
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index 0db360eacbb9..ac2403cfd7bc 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.10.0",
+  "version": "3.11.0",
   "sidebar": [
     {
       "type": "category",
diff --git a/docs/zh/latest/building-apisix.md b/docs/zh/latest/building-apisix.md
index 3460b93796ae..d6908e02c86a 100644
--- a/docs/zh/latest/building-apisix.md
+++ b/docs/zh/latest/building-apisix.md
@@ -47,7 +47,7 @@ import TabItem from '@theme/TabItem';
 首先，我们需要指定需要安装的版本`APISIX_VERSION`:
 
 ```shell
-APISIX_VERSION='3.10.0'
+APISIX_VERSION='3.11.0'
 ```
 
 然后，你可以运行以下命令，从 Github 克隆 APISIX 源码：
diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json
index 6694dc80d027..d3a8c71232ce 100644
--- a/docs/zh/latest/config.json
+++ b/docs/zh/latest/config.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.10.0",
+  "version": "3.11.0",
   "sidebar": [
     {
       "type": "category",