Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ac0ea89
docs(apollo): announce staged plugin-store migration
yangjj-iso Oct 14, 2026
06125d3
refactor(apollo): prepare the later plugin-store cutover
yangjj-iso Oct 14, 2026
ba16935
Merge upstream master and retain staged Apollo cutover
yangjj-iso Oct 16, 2026
cf88b9e
test(e2e): use local HTTP fixture for wait helper checks
yangjj-iso Oct 16, 2026
15459b6
test(e2e): use a local upstream for storage and cluster routing
yangjj-iso Oct 16, 2026
e8ba9a9
test(e2e): retain RocketMQ logs produced before queue assignment
yangjj-iso Oct 16, 2026
1933e9e
test(e2e): await discovered Spring Cloud route readiness
yangjj-iso Oct 16, 2026
4474dd2
test(e2e): match the Spring Cloud controller response
yangjj-iso Oct 16, 2026
4812c2b
test(e2e): explicitly assign RocketMQ log queues after topic creation
yangjj-iso Oct 16, 2026
d2e5f8d
ci: retry transient Maven Central dependency download
yangjj-iso Oct 16, 2026
7a70971
chore: sync Apollo cutover while preserving module removal
yangjj-iso Oct 19, 2026
3afea97
Merge current master into the gated Apollo removal draft
yangjj-iso Oct 21, 2026
18fd0b0
test(ci): align cryptor failures and wait for usable SDK routes
yangjj-iso Oct 22, 2026
c3058a6
Merge remote-tracking branch 'origin/master' into feat/ready-7628-nov02
yangjj-iso Nov 1, 2026
c34d578
Merge latest master into phased Apollo externalization PR
yangjj-iso Nov 5, 2026
fc40dda
test: synchronize asynchronous cleanup and HTTP sync fixture startup
yangjj-iso Nov 6, 2026
b0dc929
Merge master and preserve upstream Admin test synchronization
yangjj-iso Nov 7, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/scripts/check-registry-dependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import sys
from pathlib import Path

PROVIDERS = ("zookeeper", "etcd", "nacos", "apollo", "eureka", "kubernetes")
COMPATIBILITY_PROVIDERS = set(PROVIDERS) - {"apollo"}
PROVIDERS = ("zookeeper", "etcd", "nacos", "eureka", "kubernetes")
COMPATIBILITY_PROVIDERS = set(PROVIDERS)
LEAN_MODULES = (
"shenyu-registry/shenyu-registry-api",
"shenyu-registry/shenyu-registry-core",
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Apache ShenYu is a Java-based gateway for service proxying, protocol conversion,
| Registration and discovery | Client SDKs register service addresses and API metadata with Admin. Registry integrations support discovery; an optional Kubernetes controller reconciles Ingress and Endpoints resources. |
| Security and traffic control | WAF, signing, authentication plugins, load balancing, rate limiting, and fault tolerance through Resilience4j and Sentinel; deprecated Hystrix remains available as an external plugin (see [plugin-store-hystrix](docs/plugin-store-hystrix.md)). |
| Caching and transformation | In-memory or Redis-backed response caching, URL rewriting, redirection, and request/response transformation. |
| Dynamic configuration | Admin persists plugins, selectors, rules, metadata, and authentication data. WebSocket sync is the default; HTTP long polling, ZooKeeper, Nacos, and etcd are available. Apollo remains available during its deprecation release and is planned to move to an external extension (see [Apollo migration](docs/plugin-store-apollo.md)). Consul sync is available as an external extension (see [plugin-store-consul](docs/plugin-store-consul.md)). Gateway replicas apply updates to their local caches. |
| Dynamic configuration | Admin persists plugins, selectors, rules, metadata, and authentication data. WebSocket sync is the default; HTTP long polling, ZooKeeper, Nacos, and etcd are available. Apollo sync and registry are available as an external extension (see [Apollo migration](docs/plugin-store-apollo.md)). Consul sync is available as an external extension (see [plugin-store-consul](docs/plugin-store-consul.md)). Gateway replicas apply updates to their local caches. |
| Observability | Metrics and logging plugins, including Kafka and Elasticsearch destinations; email and DingTalk alerts from Admin. |
| AI and MCP | AI proxy, prompt processing, token limits, sensitive-word filtering, AI request/response transformation, and an MCP server plugin with SSE and Streamable HTTP. |

Expand Down
5 changes: 5 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

### API Changes

- The planned later Apollo cutover retains the `apollo` type, stored keys and
`ApolloPathConstants` compatibility shim (#7599). It must not merge in the
deprecation release; the preceding released cycle and external publication
remain required. See [the migration guide](docs/plugin-store-apollo.md).

- WASM loaders support opt-in startup execution deadlines and per-instance linear-memory
ceilings. Defaults remain disabled. Timed execution owns bounded workers, propagates
interruption and replaces interrupted instances after physical exit. See
Expand Down
9 changes: 5 additions & 4 deletions docs/plugin-store-apollo.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ limitations under the License.

## Status and deprecation cycle

Apollo is currently an optional, supported in-tree integration. Issue [#7599](https://github.com/apache/shenyu/issues/7599)
This source branch prepares the later removal of Apollo from the core reactor.
The published deprecation release must retain its in-tree integration. Issue [#7599](https://github.com/apache/shenyu/issues/7599)
proposes transferring its registry, data-sync, Admin listener and gateway starter to
[plugin-store](https://github.com/apache/shenyu-plugin-store), extending [#7306](https://github.com/apache/shenyu/issues/7306).
This guide is the advance deprecation notice: the in-tree modules remain available
for the release carrying this notice. No removal release has been selected.
The separate removal PR is a draft and must not be merged in that deprecation release.
The separate deprecation PR publishes the advance notice and this guide while
retaining all four modules for that release. No removal release has been selected.
The separate removal PR can be reviewed in advance and must not be merged in that deprecation release.

| Stage | Required action |
| --- | --- |
Expand Down
13 changes: 0 additions & 13 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@
<caffeine.version>2.9.3</caffeine.version>
<httpasyncclient.version>4.1.5</httpasyncclient.version>
<asm.version>9.2</asm.version>
<apollo.version>2.1.0</apollo.version>
<resilience.version>1.7.1</resilience.version>
<sentinel.version>1.8.3</sentinel.version>
<lettuce.version>6.1.2.RELEASE</lettuce.version>
Expand Down Expand Up @@ -429,18 +428,6 @@
<version>${zookeeper.version}</version>
</dependency>

<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-client</artifactId>
<version>${apollo.version}</version>
</dependency>

<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-openapi</artifactId>
<version>${apollo.version}</version>
</dependency>

<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
Expand Down
1 change: 0 additions & 1 deletion shenyu-admin-listener/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

<modules>
<module>shenyu-admin-listener-api</module>
<module>shenyu-admin-listener-apollo</module>
<module>shenyu-admin-listener-etcd</module>
<module>shenyu-admin-listener-nacos</module>
<module>shenyu-admin-listener-zookeeper</module>
Expand Down
73 changes: 0 additions & 73 deletions shenyu-admin-listener/shenyu-admin-listener-apollo/pom.xml

This file was deleted.

This file was deleted.

Loading
Loading