You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2021/04/01 07:41:23 UTC
[apisix] branch release/2.5 created (now d37bf66)
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a change to branch release/2.5
in repository https://gitbox.apache.org/repos/asf/apisix.git.
at d37bf66 feat: release 2.5
This branch includes the following new commits:
new d37bf66 feat: release 2.5
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[apisix] 01/01: feat: release 2.5
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch release/2.5
in repository https://gitbox.apache.org/repos/asf/apisix.git
commit d37bf66a4de91dc8a33bd12020e405a55116b054
Author: spacewander <sp...@gmail.com>
AuthorDate: Thu Apr 1 15:40:48 2021 +0800
feat: release 2.5
Signed-off-by: spacewander <sp...@gmail.com>
---
CHANGELOG.md | 32 +++++++++++++++
README.md | 8 ++--
apisix/core/version.lua | 2 +-
docs/en/latest/config.json | 2 +-
docs/en/latest/how-to-build.md | 16 ++++----
docs/es/latest/README.md | 8 ++--
docs/es/latest/config.json | 2 +-
docs/zh/latest/CHANGELOG.md | 31 +++++++++++++++
docs/zh/latest/README.md | 8 ++--
docs/zh/latest/config.json | 2 +-
docs/zh/latest/how-to-build.md | 16 ++++----
rockspec/apisix-2.5-0.rockspec | 90 ++++++++++++++++++++++++++++++++++++++++++
12 files changed, 185 insertions(+), 32 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 979ad79..e4cb2fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ title: Changelog
## Table of Contents
+- [2.5.0](#250)
- [2.4.0](#240)
- [2.3.0](#230)
- [2.2.0](#220)
@@ -40,6 +41,37 @@ title: Changelog
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.5.0
+
+### Change
+
+- change(zipkin): rearrange the child span [#3877](https://github.com/apache/apisix/pull/3877)
+
+### Core
+
+- :sunrise: feat: support mTLS with etcd [#3905](https://github.com/apache/apisix/pull/3905)
+- :sunrise: feat: upgrade lua-resty-expr/radixtree to support logical expression [#3809](https://github.com/apache/apisix/pull/3809)
+- :sunrise: feat: load etcd configuration when apisix starts [#3799](https://github.com/apache/apisix/pull/3799)
+- :sunrise: feat: let balancer support priority [#3755](https://github.com/apache/apisix/pull/3755)
+- :sunrise: feat: add control api for discovery module [#3742](https://github.com/apache/apisix/pull/3742)
+
+### Plugin
+
+- :sunrise: feat(skywalking): allow destory and configure report interval for reporter [#3925](https://github.com/apache/apisix/pull/3925)
+- :sunrise: feat(traffic-split): the upstream pass_host needs to support IP mode [#3870](https://github.com/apache/apisix/pull/3870)
+- :sunrise: feat: Add filter on HTTP methods for consumer-restriction plugin [#3691](https://github.com/apache/apisix/pull/3691)
+- :sunrise: feat: add allow_origins_by_regex to cors plugin [#3839](https://github.com/apache/apisix/pull/3839)
+- :sunrise: feat: support conditional response rewrite [#3577](https://github.com/apache/apisix/pull/3577)
+
+### Bugfix
+
+- fix(error-log-logger): the logger should be run in each process [#3912](https://github.com/apache/apisix/pull/3912)
+- fix: use the builtin server by default [#3907](https://github.com/apache/apisix/pull/3907)
+- fix(traffic-split): binding upstream via upstream_id is invalid [#3842](https://github.com/apache/apisix/pull/3842)
+- fix: correct the validation for ssl_trusted_certificate [#3832](https://github.com/apache/apisix/pull/3832)
+- fix: don't override cache relative headers [#3789](https://github.com/apache/apisix/pull/3789)
+- fix: fail to run `make deps` on macOS [#3718](https://github.com/apache/apisix/pull/3718)
+
## 2.4.0
### Change
diff --git a/README.md b/README.md
index 73dbf8b..b999e61 100644
--- a/README.md
+++ b/README.md
@@ -153,9 +153,9 @@ There are several ways to install the Apache Release version of APISIX:
- Download the latest source code release package:
```shell
- $ mkdir apisix-2.4
- $ wget https://downloads.apache.org/apisix/2.4/apache-apisix-2.4-src.tgz
- $ tar zxvf apache-apisix-2.4-src.tgz -C apisix-2.4
+ $ mkdir apisix-2.5
+ $ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
+ $ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
```
- Install the dependencies:
@@ -192,7 +192,7 @@ There are several ways to install the Apache Release version of APISIX:
- install APISIX:
```shell
- $ sudo yum install -y https://github.com/apache/apisix/releases/download/2.4/apisix-2.4-0.x86_64.rpm
+ $ sudo yum install -y https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
```
- check the version of APISIX:
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index 8c93638..d7dd13b 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -15,5 +15,5 @@
-- limitations under the License.
--
return {
- VERSION = "2.4"
+ VERSION = "2.5"
}
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index f9eaad8..5f79442 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": 2.4,
+ "version": 2.5,
"sidebar": [
{
"type": "link",
diff --git a/docs/en/latest/how-to-build.md b/docs/en/latest/how-to-build.md
index 81fa6f8..ce7c784 100644
--- a/docs/en/latest/how-to-build.md
+++ b/docs/en/latest/how-to-build.md
@@ -36,22 +36,22 @@ You can install Apache APISIX in a variety of ways, including source code packag
You need to download the Apache source release first:
```shell
-$ mkdir apisix-2.4
-$ wget https://downloads.apache.org/apisix/2.4/apache-apisix-2.4-src.tgz
-$ tar zxvf apache-apisix-2.4-src.tgz -C apisix-2.4
+$ mkdir apisix-2.5
+$ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
+$ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
```
Install the Lua libraries that the runtime depends on:
```shell
-cd apisix-2.4
+cd apisix-2.5
make deps
```
### Installation via RPM package (CentOS 7)
```shell
-sudo yum install -y https://github.com/apache/apisix/releases/download/2.4/apisix-2.4-0.x86_64.rpm
+sudo yum install -y https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
```
### Installation via Luarocks (macOS not supported)
@@ -67,11 +67,11 @@ sudo sh -c "$(curl -fsSL https://raw.githubusercontent.com/apache/apisix/master/
> Install the specified version via Luarocks:
```shell
-# Install version 2.4
-sudo luarocks install --lua-dir=/path/openresty/luajit apisix 2.4
+# Install version 2.5
+sudo luarocks install --lua-dir=/path/openresty/luajit apisix 2.5
# old luarocks not support the `lua-dir` parameter, you can remove this option
-sudo luarocks install apisix 2.4
+sudo luarocks install apisix 2.5
```
## 3. Manage (start/stop) APISIX Server
diff --git a/docs/es/latest/README.md b/docs/es/latest/README.md
index bc8c78b..9b43460 100644
--- a/docs/es/latest/README.md
+++ b/docs/es/latest/README.md
@@ -155,9 +155,9 @@ Hay varias maneras de instalar la versión publicada Apache de APISIX:
- Bajar el paquete de publicación más reciente de código fuente:
```shell
- $ mkdir apisix-2.4
- $ wget https://downloads.apache.org/apisix/2.4/apache-apisix-2.4-src.tgz
- $ tar zxvf apache-apisix-2.4-src.tgz -C apisix-2.4
+ $ mkdir apisix-2.5
+ $ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
+ $ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
```
- Instalar las dependencias:
@@ -194,7 +194,7 @@ Hay varias maneras de instalar la versión publicada Apache de APISIX:
- Instalar APISIX:
```shell
- $ sudo yum install -y https://github.com/apache/apisix/releases/download/2.4/apisix-2.4-0.x86_64.rpm
+ $ sudo yum install -y https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
```
- Chequear versión de APISIX:
diff --git a/docs/es/latest/config.json b/docs/es/latest/config.json
index 76fd7d3..71755ac 100644
--- a/docs/es/latest/config.json
+++ b/docs/es/latest/config.json
@@ -1,4 +1,4 @@
{
- "version": 2.4,
+ "version": 2.5,
"sidebar": []
}
diff --git a/docs/zh/latest/CHANGELOG.md b/docs/zh/latest/CHANGELOG.md
index e6c626c..e5d97fc 100644
--- a/docs/zh/latest/CHANGELOG.md
+++ b/docs/zh/latest/CHANGELOG.md
@@ -23,6 +23,7 @@ title: CHANGELOG
## Table of Contents
+- [2.5.0](#250)
- [2.4.0](#240)
- [2.3.0](#230)
- [2.2.0](#220)
@@ -40,6 +41,36 @@ title: CHANGELOG
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.5.0
+
+### Change
+
+- 更改 zipkin 插件的 span 类型 [#3877](https://github.com/apache/apisix/pull/3877)
+
+### Core
+
+- :sunrise: 支持 etcd 客户端证书校验 [#3905](https://github.com/apache/apisix/pull/3905)
+- :sunrise: 支持表达式使用“或”和“非”的逻辑 [#3809](https://github.com/apache/apisix/pull/3809)
+- :sunrise: 默认启动时会同步etcd配置 [#3799](https://github.com/apache/apisix/pull/3799)
+- :sunrise: 负载均衡支持节点优先级 [#3755](https://github.com/apache/apisix/pull/3755)
+- :sunrise: 服务发现提供了一系列 control API [#3742](https://github.com/apache/apisix/pull/3742)
+
+### Plugin
+
+- :sunrise: 允许热更新 skywalking 插件配置,并允许配置上报间隔 [#3925](https://github.com/apache/apisix/pull/3925)
+- :sunrise: consumer-restriction 支持 HTTP method 级别的白名单配置 [#3691](https://github.com/apache/apisix/pull/3691)
+- :sunrise: cors 插件支持通过正则表达式匹配 Origin [#3839](https://github.com/apache/apisix/pull/3839)
+- :sunrise: response-rewrite 插件支持条件改写 [#3577](https://github.com/apache/apisix/pull/3577)
+
+### Bugfix
+
+- error-log-logger 插件需要在每个进程中上报日志 [#3912](https://github.com/apache/apisix/pull/3912)
+- 当使用 snippet 引入 Nginx server 段配置时,确保内置 server 是默认 server [#3907](https://github.com/apache/apisix/pull/3907)
+- 修复 traffic-split 插件通过 upstream_id 绑定上游的问题 [#3842](https://github.com/apache/apisix/pull/3842)
+- 修复 ssl_trusted_certificate 配置项的校验 [#3832](https://github.com/apache/apisix/pull/3832)
+- 启用 proxy-cache 时,避免覆盖到其他路由缓存相关的响应头 [#3789](https://github.com/apache/apisix/pull/3789)
+- 解决 macOS 下无法 `make deps` 的问题 [#3718](https://github.com/apache/apisix/pull/3718)
+
## 2.4.0
### Change
diff --git a/docs/zh/latest/README.md b/docs/zh/latest/README.md
index 4b98566..f9f028e 100644
--- a/docs/zh/latest/README.md
+++ b/docs/zh/latest/README.md
@@ -153,9 +153,9 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10, macOS, **ARM64** Ubun
- 下载最新的源码发布包:
```shell
- $ mkdir apisix-2.4
- $ wget https://downloads.apache.org/apisix/2.4/apache-apisix-2.4-src.tgz
- $ tar zxvf apache-apisix-2.4-src.tgz -C apisix-2.4
+ $ mkdir apisix-2.5
+ $ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
+ $ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
```
- 安装运行时依赖的 Lua 库:
@@ -192,7 +192,7 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10, macOS, **ARM64** Ubun
- 安装 APISIX:
```shell
- $ sudo yum install -y https://github.com/apache/apisix/releases/download/2.4/apisix-2.4-0.x86_64.rpm
+ $ sudo yum install -y https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
```
- 检查 APISIX 的版本号:
diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json
index ba5bb62..44e10d6 100644
--- a/docs/zh/latest/config.json
+++ b/docs/zh/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": 2.4,
+ "version": 2.5,
"sidebar": [
{
"type": "category",
diff --git a/docs/zh/latest/how-to-build.md b/docs/zh/latest/how-to-build.md
index 6735494..f73fe96 100644
--- a/docs/zh/latest/how-to-build.md
+++ b/docs/zh/latest/how-to-build.md
@@ -36,22 +36,22 @@ Apache APISIX 的运行环境需要 Nginx 和 etcd,
你需要先下载 Apache Release 源码包:
```shell
-$ mkdir apisix-2.4
-$ wget https://downloads.apache.org/apisix/2.4/apache-apisix-2.4-src.tgz
-$ tar zxvf apache-apisix-2.4-src.tgz -C apisix-2.4
+$ mkdir apisix-2.5
+$ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
+$ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
```
安装运行时依赖的 Lua 库:
```
-cd apisix-2.4
+cd apisix-2.5
make deps
```
### 通过 RPM 包安装(CentOS 7)
```shell
-sudo yum install -y https://github.com/apache/apisix/releases/download/2.4/apisix-2.4-0.x86_64.rpm
+sudo yum install -y https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
```
### 通过 Luarocks 安装 (不支持 macOS)
@@ -67,11 +67,11 @@ sudo sh -c "$(curl -fsSL https://raw.githubusercontent.com/apache/apisix/master/
> 通过 Luarocks 安装指定的版本:
```shell
-# 安装 apisix 的 2.4 版本
-sudo luarocks install --lua-dir=/path/openresty/luajit apisix 2.4
+# 安装 apisix 的 2.5 版本
+sudo luarocks install --lua-dir=/path/openresty/luajit apisix 2.5
# 老版本 luarocks 可能不支持 `lua-dir` 参数,可以删除该选项
-sudo luarocks install apisix 2.4
+sudo luarocks install apisix 2.5
```
## 3. 管理(启动、关闭等)APISIX 服务
diff --git a/rockspec/apisix-2.5-0.rockspec b/rockspec/apisix-2.5-0.rockspec
new file mode 100644
index 0000000..01ea781
--- /dev/null
+++ b/rockspec/apisix-2.5-0.rockspec
@@ -0,0 +1,90 @@
+--
+-- 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.5-0"
+supported_platforms = {"linux", "macosx"}
+
+source = {
+ url = "git://github.com/apache/apisix",
+ branch = "2.5",
+}
+
+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 = 5.2.0",
+ "lua-resty-template = 1.9",
+ "lua-resty-etcd = 1.5.0",
+ "lua-resty-balancer = 0.02rc5",
+ "lua-resty-ngxvar = 0.5.2",
+ "lua-resty-jit-uuid = 0.0.7",
+ "lua-resty-healthcheck-api7 = 2.2.0",
+ "lua-resty-jwt = 0.2.0",
+ "lua-resty-hmac-ffi = 0.05",
+ "lua-resty-cookie = 0.1.0",
+ "lua-resty-session = 2.24",
+ "opentracing-openresty = 0.1",
+ "lua-resty-radixtree = 2.7.0",
+ "lua-protobuf = 0.3.1",
+ "lua-resty-openidc = 1.7.2-1",
+ "luafilesystem = 1.7.0-2",
+ "lua-tinyyaml = 1.0",
+ "nginx-lua-prometheus = 0.20210206",
+ "jsonschema = 0.9.5",
+ "lua-resty-ipmatcher = 0.6",
+ "lua-resty-kafka = 0.07",
+ "lua-resty-logger-socket = 2.0-0",
+ "skywalking-nginx-lua = 0.4-1",
+ "base64 = 1.5-2",
+ "binaryheap = 0.4",
+ "dkjson = 2.5-2",
+ "resty-redis-cluster = 1.02-4",
+ "lua-resty-expr = 1.2.0",
+ "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",
+}
+
+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 = {
+ INST_PREFIX="$(PREFIX)",
+ INST_BINDIR="$(BINDIR)",
+ INST_LIBDIR="$(LIBDIR)",
+ INST_LUADIR="$(LUADIR)",
+ INST_CONFDIR="$(CONFDIR)",
+ },
+}