davsclaus commented on code in PR #25525:
URL: https://github.com/apache/camel/pull/25525#discussion_r3846144041
##########
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json:
##########
@@ -441,11 +441,16 @@
{ "name": "camel.server.jwtKeystoreType", "required": false,
"description": "Type of the keystore used for JWT tokens validation (jks,
pkcs12, etc.).", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "secret": false },
{ "name": "camel.server.maxBodySize", "required": false, "description":
"Maximum HTTP body size the embedded HTTP server can accept.", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "integer",
"javaType": "java.lang.Long", "secret": false },
{ "name": "camel.server.mcpEnabled", "required": false, "description":
"Whether to expose ai-tool routes as MCP tools over streamable HTTP. Requires
camel-mcp-server on the classpath. By default, the MCP server is not enabled.",
"sourceType": "org.apache.camel.main.HttpServerConfigurationProperties",
"type": "boolean", "javaType": "boolean", "defaultValue": false, "secret":
false },
+ { "name": "camel.server.mcpInstructions", "required": false,
"description": "Top-level MCP instructions returned to clients on initialize.",
"sourceType": "org.apache.camel.main.HttpServerConfigurationProperties",
"type": "string", "javaType": "java.lang.String", "secret": false },
{ "name": "camel.server.mcpPath", "required": false, "description": "HTTP
path where the MCP endpoint is served.", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "defaultValue": "\/mcp", "secret": false },
+ { "name": "camel.server.mcpServerDescription", "required": false,
"description": "MCP server description advertised to clients in
serverInfo.description .", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "secret": false },
+ { "name": "camel.server.mcpServerIcons", "required": false, "description":
"JSON array of MCP server icons advertised to clients in serverInfo.icons .
Each entry must include a src URL and may include mimeType , sizes and theme
.", "sourceType": "org.apache.camel.main.HttpServerConfigurationProperties",
"type": "string", "javaType": "java.lang.String", "secret": false },
{ "name": "camel.server.mcpServerName", "required": false, "description":
"MCP server name advertised to clients. Defaults to the CamelContext name.",
"sourceType": "org.apache.camel.main.HttpServerConfigurationProperties",
"type": "string", "javaType": "java.lang.String", "secret": false },
+ { "name": "camel.server.mcpServerTitle", "required": false, "description":
"MCP server display title advertised to clients in serverInfo.title .",
"sourceType": "org.apache.camel.main.HttpServerConfigurationProperties",
"type": "string", "javaType": "java.lang.String", "secret": false },
+ { "name": "camel.server.mcpServerWebsiteUrl", "required": false,
"description": "MCP server website URL advertised to clients in
serverInfo.websiteUrl .", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "secret": false },
{ "name": "camel.server.mcpSessionIdleTtl", "required": false,
"description": "Idle TTL in milliseconds for MCP sessions on the Vert.x
streamable transport. Sessions with no activity for longer than this interval
are evicted. 0 disables idle eviction.", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "integer",
"javaType": "long", "defaultValue": 300000, "secret": false },
{ "name": "camel.server.mcpSessionKeepAliveInterval", "required": false,
"description": "Keep-alive ping interval in milliseconds for MCP sessions on
the Vert.x streamable transport. Dead sessions are evicted after consecutive
ping failures. 0 disables keep-alive pings.", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "integer",
"javaType": "long", "defaultValue": 30000, "secret": false },
- { "name": "camel.server.mcpTags", "required": false, "description":
"Comma-separated list of ai-tool tag patterns to expose as MCP tools. Matching
is case-insensitive and supports exact match, wildcard prefix ( {code foo} ),
and {code } to match all tags. Only tools registered under a matching tag are
exposed; the untagged default pool is never exposed. When not set, no tools are
exposed.", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "secret": false },
+ { "name": "camel.server.mcpTags", "required": false, "description":
"Comma-separated list of ai-tool tags to expose as MCP tools. Only tools
registered under one of these tags are exposed; the untagged default pool is
never exposed. When not set, no tools are exposed.", "sourceType":
"org.apache.camel.main.HttpServerConfigurationProperties", "type": "string",
"javaType": "java.lang.String", "secret": false },
Review Comment:
This description reverted from the CAMEL-24390 wording ("tag *patterns*...
wildcard prefix... case-insensitive matching") back to the pre-CAMEL-24390
wording, because the branch used to regenerate this file forked before that
change landed on `main`. The mirrored copy at
`core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json`
still has the correct wildcard wording, so the two generated mirrors now
disagree.
This is the actual, live cause of the current CI failure on both `build (17,
false)` and `build (25, false)` — the "Fail if there are uncommitted changes"
step regenerates this file against current `main` and gets the wildcard wording
back, which no longer matches what's committed here:
```
- "...tags to expose as MCP tools. Only tools registered..."
+ "...tag patterns... wildcard prefix ({code foo})...
case-insensitive..."
##[error]Process completed with exit code 1.
```
Rebasing onto current `main` and rerunning the regeneration should fix this
in one step — I checked and it's the only line affected across all four
generated files touched by this PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
