Skip to content

Commit d17c6d0

Browse files
committed
Merge branch 'main' into elicitation/expect-server-flag
2 parents 5f4404d + d2b1364 commit d17c6d0

File tree

8 files changed

+31
-23
lines changed

8 files changed

+31
-23
lines changed

blog/content/posts/2025-09-08-mcp-registry-preview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Today, we're launching the Model Context Protocol (MCP) Registry—an open catal
99

1010
The MCP Registry is now available in preview. To get started:
1111

12-
- **Add your server** by following our guide on [Adding Servers to the MCP Registry](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/publishing/publish-server.md) (for server maintainers)
13-
- **Access server data** by following our guide on [Accessing MCP Registry Data](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/consuming/use-rest-api.md) (for client maintainers)
12+
- **Add your server** by following our guide on [Adding Servers to the MCP Registry](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/quickstart.mdx) (for server maintainers)
13+
- **Access server data** by following our guide on [Accessing MCP Registry Data](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/registry-aggregators.mdx) (for client maintainers)
1414

1515
# Single source of truth for MCP servers
1616

@@ -20,7 +20,7 @@ Our goal is to standardize how servers are distributed and discovered, providing
2020

2121
## Public and private sub-registries
2222

23-
In building a central registry, it was important to us not to take away from existing registries that the community and companies have built. The MCP Registry serves as a primary source of truth for publicly available MCP servers, and organizations can choose to [create sub-registries](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/consuming/use-rest-api.md#building-a-subregistry) based on custom criteria. For example:
23+
In building a central registry, it was important to us not to take away from existing registries that the community and companies have built. The MCP Registry serves as a primary source of truth for publicly available MCP servers, and organizations can choose to [create sub-registries](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/registry-aggregators.mdx) based on custom criteria. For example:
2424

2525
**Public subregistries** like opinionated “MCP marketplaces” associated with each MCP client are free to augment and enhance data they ingest from the upstream MCP Registry. Every MCP end-user persona will have different needs, and it is up to the MCP client marketplaces to properly serve their end-users in opinionated ways.
2626

@@ -30,14 +30,14 @@ In both cases, the MCP Registry is the starting point – it’s the centralized
3030

3131
## Community-driven mechanism for moderation
3232

33-
The MCP Registry is an official MCP project maintained by the registry working group and permissively licensed. Community members can submit issues to flag servers that violate the MCP [moderation guidelines](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/administration/moderation-guidelines.md)—such as those containing spam, malicious code, or impersonating legitimate services. Registry maintainers can then denylist these entries and retroactively remove them from public access.
33+
The MCP Registry is an official MCP project maintained by the registry working group and permissively licensed. Community members can submit issues to flag servers that violate the MCP [moderation guidelines](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/moderation-policy.mdx)—such as those containing spam, malicious code, or impersonating legitimate services. Registry maintainers can then denylist these entries and retroactively remove them from public access.
3434

3535
# Getting started
3636

3737
To get started:
3838

39-
- **Add your server** by following our guide on [Adding Servers to the MCP Registry](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/publishing/publish-server.md) (for server maintainers)
40-
- **Access server data** by following our guide on [Accessing MCP Registry Data](https://github.com/modelcontextprotocol/registry/blob/main/docs/guides/consuming/use-rest-api.md) (for client maintainers)
39+
- **Add your server** by following our guide on [Adding Servers to the MCP Registry](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/quickstart.mdx) (for server maintainers)
40+
- **Access server data** by following our guide on [Accessing MCP Registry Data](https://github.com/modelcontextprotocol/registry/blob/main/docs/modelcontextprotocol-io/registry-aggregators.mdx) (for client maintainers)
4141

4242
This preview of the MCP Registry is meant to help us improve the user experience before general availability and does not provide data durability guarantees or other warranties. We advise MCP adopters to watch development closely as breaking changes may occur before the registry is made generally available.
4343

docs/docs/develop/build-server.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ Finally, let's build the server:
988988
./mvnw clean install
989989
```
990990

991-
This will generate a `mcp-weather-stdio-server-0.0.1-SNAPSHOT.jar` file within the `target` folder.
991+
This will generate an `mcp-weather-stdio-server-0.0.1-SNAPSHOT.jar` file within the `target` folder.
992992

993993
Let's now test your server from an existing MCP host, Claude for Desktop.
994994

docs/sdk/java/mcp-server.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The SDK includes several built-in transport provider implementations:
134134
</Tab>
135135
<Tab title="WebFlux">
136136
<p>WebFlux-based SSE and Streamable-HTTP server transport. [Requires the `mcp-spring-webflux` dependency](/sdk/java/mcp-overview#dependencies).</p>
137-
<Tabs>
137+
<Tabs>
138138
<Tab title="Streamable-HTTP (WebFlux)">
139139
```java
140140
@Configuration
@@ -361,8 +361,8 @@ The SDK includes several built-in transport provider implementations:
361361
</Tab>
362362
<Tab title="Servlet">
363363
<p>
364-
Creates a Servlet-based `SSE`, `Streamable-HTTP`, and `Stateless` server transport.
365-
It can be used with any Servlet container.
364+
Creates a Servlet-based `SSE`, `Streamable-HTTP`, and `Stateless` server transport.
365+
It can be used with any Servlet container.
366366
</p>
367367
368368
<Tabs>
@@ -648,7 +648,7 @@ The resource specification comprised of resource definitions and resource read h
648648
The resource definition including `name`, `description`, and `MIME type`.
649649
The first argument of the function that handles resource read requests is an `McpAsyncServerExchange` upon which the server can
650650
interact with the connected client.
651-
The second arguments is a `McpSchema.ReadResourceRequest`.
651+
The second arguments is an `McpSchema.ReadResourceRequest`.
652652

653653
### Prompt Specification
654654

docs/specification/draft/basic/transports.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ protocol version 2024-11-05) as follows:
291291
defined above:
292292
- If it succeeds, the client can assume this is a server supporting the new Streamable
293293
HTTP transport.
294-
- If it fails with an HTTP 4xx status code (e.g., 405 Method Not Allowed or 404 Not
295-
Found):
294+
- If it fails with the following HTTP status codes "400 Bad Request", "404 Not
295+
Found" or "405 Method Not Allowed":
296296
- Issue a GET request to the server URL, expecting that this will open an SSE stream
297297
and return an `endpoint` event as the first event.
298298
- When the `endpoint` event arrives, the client can assume this is a server running

docs/specification/draft/changelog.mdx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,21 @@ the previous revision, [2025-06-18](/specification/2025-06-18).
2626
3. Updated the [Security Best Practices guidance](https://modelcontextprotocol.io/specification/draft/basic/security_best_practices).
2727
4. Clarify that input validation errors should be returned as Tool Execution Errors rather than Protocol Errors to enable model self-correction ([SEP-1303](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1303)).
2828
5. Support polling SSE streams by allowing servers to disconnect at will ([SEP-1699](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1699)).
29+
6. Align OAuth 2.0 Protected Resource Metadata discovery with RFC 9728, making `WWW-Authenticate` header optional with fallback to `.well-known` endpoint ([SEP-985](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/985)).
30+
7. Add support for default values in all primitive types (string, number, enum) for elicitation schemas ([SEP-1034](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1034)).
31+
8. Establish JSON Schema 2020-12 as the default dialect for MCP schema definitions ([SEP-1613](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1613)).
2932

3033
## Other schema changes
3134

3235
1. Decouple request payloads from RPC method definitions into standalone parameter schemas. ([SEP-1319](https://github.com/modelcontextprotocol/specification/issues/1319), PR [#1284](https://github.com/modelcontextprotocol/specification/pull/1284))
3336

37+
## Governance and process updates
38+
39+
1. Formalize Model Context Protocol governance structure ([SEP-932](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/932)).
40+
2. Establish shared communication practices and guidelines for the MCP community ([SEP-994](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/994)).
41+
3. Formalize Working Groups and Interest Groups in MCP governance ([SEP-1302](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1302)).
42+
4. Establish SDK tiering system with clear requirements for feature support and maintenance commitments ([SEP-1730](https://github.com/modelcontextprotocol/modelcontextprotocol/issues/1730)).
43+
3444
## Full changelog
3545

3646
For a complete list of all changes that have been made since the last protocol revision,

0 commit comments

Comments
 (0)