This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 64a5e47a5 chore: prepare the 2.14.1 release (#7133)
64a5e47a5 is described below
commit 64a5e47a5389904c2ebbe9eb817c3c0529bc98ce
Author: 罗泽轩 <[email protected]>
AuthorDate: Thu May 26 14:28:40 2022 +0800
chore: prepare the 2.14.1 release (#7133)
---
CHANGELOG.md | 7 +++
apisix/cli/ops.lua | 6 ++-
apisix/core/version.lua | 2 +-
docs/en/latest/config.json | 2 +-
docs/zh/latest/CHANGELOG.md | 5 ++
docs/zh/latest/config.json | 2 +-
rockspec/apisix-2.14.1-0.rockspec | 102 ++++++++++++++++++++++++++++++++++++++
t/cli/test_validate_config.sh | 2 +-
8 files changed, 122 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59169e695..3f1a8ab34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ title: Changelog
## Table of Contents
+- [2.14.1](#2141)
- [2.14.0](#2140)
- [2.13.1](#2131)
- [2.13.0](#2130)
@@ -57,6 +58,12 @@ title: Changelog
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.14.1
+
+**This is an LTS maintenance release and you can see the CHANGELOG in
`release/2.14` branch.**
+
+[https://github.com/apache/apisix/blob/release/2.14/CHANGELOG.md#2141](https://github.com/apache/apisix/blob/release/2.14/CHANGELOG.md#2141)
+
## 2.14.0
### Change
diff --git a/apisix/cli/ops.lua b/apisix/cli/ops.lua
index 4a384c037..384f2aa1c 100644
--- a/apisix/cli/ops.lua
+++ b/apisix/cli/ops.lua
@@ -284,8 +284,10 @@ Please modify "admin_key" in conf/config.yaml .
if real_ip_from then
for _, ip in ipairs(real_ip_from) do
local _ip = cli_ip:new(ip)
- if _ip and _ip:is_loopback() or _ip:is_unspecified() then
- pass_real_client_ip = true
+ if _ip then
+ if _ip:is_loopback() or _ip:is_unspecified() then
+ pass_real_client_ip = true
+ end
end
end
end
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index 675282615..3b0e34726 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -20,5 +20,5 @@
-- @module core.version
return {
- VERSION = "2.14.0"
+ VERSION = "2.14.1"
}
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index d0ac6f0fe..b9ad7bc68 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": "2.14.0",
+ "version": "2.14.1",
"sidebar": [
{
"type": "category",
diff --git a/docs/zh/latest/CHANGELOG.md b/docs/zh/latest/CHANGELOG.md
index 16b4b2516..620262f07 100644
--- a/docs/zh/latest/CHANGELOG.md
+++ b/docs/zh/latest/CHANGELOG.md
@@ -23,6 +23,7 @@ title: CHANGELOG
## Table of Contents
+- [2.14.1](#2141)
- [2.14.0](#2140)
- [2.13.1](#2131)
- [2.13.0](#2130)
@@ -57,6 +58,10 @@ title: CHANGELOG
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.14.1
+
+**这是一个 LTS 维护版本，您可以在 `release/2.14` 分支中看到 CHANGELOG。**
+
## 2.14.0
### Change
diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json
index b37d3e565..d39c9b5fd 100644
--- a/docs/zh/latest/config.json
+++ b/docs/zh/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": "2.14.0",
+ "version": "2.14.1",
"sidebar": [
{
"type": "category",
diff --git a/rockspec/apisix-2.14.1-0.rockspec
b/rockspec/apisix-2.14.1-0.rockspec
new file mode 100644
index 000000000..3465f93c9
--- /dev/null
+++ b/rockspec/apisix-2.14.1-0.rockspec
@@ -0,0 +1,102 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one or more
+-- contributor license agreements. See the NOTICE file distributed with
+-- this work for additional information regarding copyright ownership.
+-- The ASF licenses this file to You under the Apache License, Version 2.0
+-- (the "License"); you may not use this file except in compliance with
+-- the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+package = "apisix"
+version = "2.14.1-0"
+supported_platforms = {"linux", "macosx"}
+
+source = {
+ url = "git://github.com/apache/apisix",
+ branch = "2.14.1",
+}
+
+description = {
+ summary = "Apache APISIX is a cloud-native microservices API gateway,
delivering the ultimate performance, security, open source and scalable
platform for all your APIs and microservices.",
+ homepage = "https://github.com/apache/apisix";,
+ license = "Apache License 2.0",
+}
+
+dependencies = {
+ "lua-resty-ctxdump = 0.1-0",
+ "lua-resty-dns-client = 6.0.2",
+ "lua-resty-template = 2.0",
+ "lua-resty-etcd = 1.6.2",
+ "api7-lua-resty-http = 0.2.0",
+ "lua-resty-balancer = 0.04",
+ "lua-resty-ngxvar = 0.5.2",
+ "lua-resty-jit-uuid = 0.0.7",
+ "lua-resty-healthcheck-api7 = 2.2.0",
+ "api7-lua-resty-jwt = 0.2.4",
+ "lua-resty-hmac-ffi = 0.05",
+ "lua-resty-cookie = 0.1.0",
+ "lua-resty-session = 3.10",
+ "opentracing-openresty = 0.1",
+ "lua-resty-radixtree = 2.8.2",
+ "lua-protobuf = 0.3.4",
+ "lua-resty-openidc = 1.7.2-1",
+ "luafilesystem = 1.7.0-2",
+ "api7-lua-tinyyaml = 0.4.2",
+ "nginx-lua-prometheus = 0.20220127",
+ "jsonschema = 0.9.8",
+ "lua-resty-ipmatcher = 0.6.1",
+ "lua-resty-kafka = 0.20-0",
+ "lua-resty-logger-socket = 2.0.1-0",
+ "skywalking-nginx-lua = 0.6.0",
+ "base64 = 1.5-2",
+ "binaryheap = 0.4",
+ "api7-dkjson = 0.1.1",
+ "resty-redis-cluster = 1.02-4",
+ "lua-resty-expr = 1.3.1",
+ "graphql = 0.0.2",
+ "argparse = 0.7.1-1",
+ "luasocket = 3.0rc1-2",
+ "luasec = 0.9-1",
+ "lua-resty-consul = 0.3-2",
+ "penlight = 1.9.2-1",
+ "ext-plugin-proto = 0.5.0",
+ "casbin = 1.26.0",
+ "api7-snowflake = 2.0-1",
+ "inspect == 3.1.1",
+ "lualdap = 1.2.6-1",
+ "lua-resty-rocketmq = 0.3.0-0",
+ "opentelemetry-lua = 0.1-3",
+ "net-url = 0.9-1",
+ "xml2lua = 1.5-2",
+ "nanoid = 0.1-1",
+ "lua-resty-mediador = 0.1.2-1"
+}
+
+build = {
+ type = "make",
+ build_variables = {
+ CFLAGS="$(CFLAGS)",
+ LIBFLAG="$(LIBFLAG)",
+ LUA_LIBDIR="$(LUA_LIBDIR)",
+ LUA_BINDIR="$(LUA_BINDIR)",
+ LUA_INCDIR="$(LUA_INCDIR)",
+ LUA="$(LUA)",
+ OPENSSL_INCDIR="$(OPENSSL_INCDIR)",
+ OPENSSL_LIBDIR="$(OPENSSL_LIBDIR)",
+ },
+ install_variables = {
+ ENV_INST_PREFIX="$(PREFIX)",
+ ENV_INST_BINDIR="$(BINDIR)",
+ ENV_INST_LIBDIR="$(LIBDIR)",
+ ENV_INST_LUADIR="$(LUADIR)",
+ ENV_INST_CONFDIR="$(CONFDIR)",
+ },
+}
diff --git a/t/cli/test_validate_config.sh b/t/cli/test_validate_config.sh
index 2d7ba1555..164d530fe 100755
--- a/t/cli/test_validate_config.sh
+++ b/t/cli/test_validate_config.sh
@@ -195,7 +195,7 @@ nginx_config:
- "unix:"
' > conf/config.yaml
-out=$(make init 2>&1 || true)
+out=$(make init 2>&1)
if echo "$out" | grep "missing loopback or unspecified in the
nginx_config.http.real_ip_from for plugin batch-requests"; then
echo "failed: should check the realip configuration for batch-requests"
exit 1
