This is an automated email from the ASF dual-hosted git repository.
Croway pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new ad7e59a6dda Regen: fix protobuf catalog, add mcp-server-starter to
BOMs, update dependencies (#1879)
ad7e59a6dda is described below
commit ad7e59a6ddaabd47f947519f58942e3c363fe1a5
Author: Federico Mariani <[email protected]>
AuthorDate: Wed Aug 5 18:15:38 2026 +0200
Regen: fix protobuf catalog, add mcp-server-starter to BOMs, update
dependencies (#1879)
* regen
* Revert incorrect jacksonXml catalog change to jackson3xml
The jacksonXml data format in Camel core still uses camel-jacksonxml,
not camel-jackson3xml. The regen incorrectly changed this catalog entry.
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
---------
Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
---
.../springboot/catalog/dataformats/protobufJackson.json | 12 ++++++------
.../springboot/catalog/transformers/protobuf-binary.json | 4 ++--
.../catalog/transformers/protobuf-x-java-object.json | 4 ++--
.../springboot/catalog/transformers/protobuf-x-struct.json | 4 ++--
tooling/camel-spring-boot-bom/pom.xml | 5 +++++
tooling/camel-spring-boot-dependencies/pom.xml | 12 ++++++------
6 files changed, 23 insertions(+), 18 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/protobufJackson.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/protobufJackson.json
index 2e7620d52ec..ec64fb8f8c4 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/protobufJackson.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/protobufJackson.json
@@ -5,12 +5,12 @@
"title": "Protobuf Jackson",
"description": "Marshal POJOs to Protobuf and back using Jackson.",
"deprecated": false,
- "firstVersion": "4.19.0",
+ "firstVersion": "3.10.0",
"label": "dataformat,transformation",
- "javaType":
"org.apache.camel.component.jackson3.protobuf.JacksonProtobufDataFormat",
+ "javaType":
"org.apache.camel.component.jackson.protobuf.JacksonProtobufDataFormat",
"supportLevel": "Stable",
"groupId": "org.apache.camel.springboot",
- "artifactId": "camel-jackson3-protobuf-starter",
+ "artifactId": "camel-jackson-protobuf-starter",
"version": "4.22.0-SNAPSHOT",
"modelName": "protobuf",
"modelJavaType": "org.apache.camel.model.dataformat.ProtobufDataFormat"
@@ -26,10 +26,10 @@
"allowJmsType": { "index": 7, "kind": "attribute", "displayName": "Allow
Jms Type", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Used for JMS
users to allow the JMSType header from the JMS spec to specify a FQN classname
to use to unmarshal to." },
"collectionType": { "index": 8, "kind": "attribute", "displayName":
"Collection Type", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Refers to a custom
collection type to lookup in the registry to use. This option should rarely be
used, but allows using different collection types than java.util.Collection
based as default." },
"useList": { "index": 9, "kind": "attribute", "displayName": "Use List",
"group": "common", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "To unmarshal to a List of Map or a List
of Pojo." },
- "moduleClassNames": { "index": 10, "kind": "attribute", "displayName":
"Module Class Names", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To use custom Jackson
modules tools.jackson.databind.JacksonModule specified as a String with FQN
class names. Multiple classes can be separated by comma." },
+ "moduleClassNames": { "index": 10, "kind": "attribute", "displayName":
"Module Class Names", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "To use custom Jackson
modules com.fasterxml.jackson.databind.Module specified as a String with FQN
class names. Multiple classes can be separated by comma." },
"moduleRefs": { "index": 11, "kind": "attribute", "displayName": "Module
Refs", "group": "advanced", "label": "advanced", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "To use custom Jackson modules referred
from the Camel registry. Multiple modules can be separated by comma." },
- "enableFeatures": { "index": 12, "kind": "attribute", "displayName":
"Enable Features", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Set of features to enable on the Jackson
tools.jackson.databind.ObjectMapper. The features should be a name that matches
a enum from tools.jackson.databind.SerializationFeature,
tools.jackson.databind.DeserializationFeature, or tools.jack [...]
- "disableFeatures": { "index": 13, "kind": "attribute", "displayName":
"Disable Features", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Set of features to disable on the Jackson
tools.jackson.databind.ObjectMapper. The features should be a name that matches
a enum from tools.jackson.databind.SerializationFeature,
tools.jackson.databind.DeserializationFeature, or tools.j [...]
+ "enableFeatures": { "index": 12, "kind": "attribute", "displayName":
"Enable Features", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Set of features to enable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma." },
+ "disableFeatures": { "index": 13, "kind": "attribute", "displayName":
"Disable Features", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Set of features to disable on the Jackson
com.fasterxml.jackson.databind.ObjectMapper. Multiple features can be separated
by comma." },
"allowUnmarshallType": { "index": 14, "kind": "attribute", "displayName":
"Allow Unmarshall Type", "group": "common", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "If enabled then
Jackson is allowed to attempt to use the CamelJacksonUnmarshalType header
during the unmarshalling." },
"timezone": { "index": 15, "kind": "attribute", "displayName": "Timezone",
"group": "advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "If set then Jackson will use the Timezone when
marshalling\/unmarshalling." },
"schemaResolver": { "index": 16, "kind": "attribute", "displayName":
"Schema Resolver", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Optional schema resolver
used to lookup schemas for the data in transit." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-binary.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-binary.json
index fb2a1efb967..5f3a7c1bf1e 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-binary.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-binary.json
@@ -5,9 +5,9 @@
"title": "Protobuf Binary",
"description": "Transforms from JSon to binary (byte array) using Jackson
Protobuf (supports Protobuf schema)",
"deprecated": false,
- "javaType":
"org.apache.camel.component.jackson3.protobuf.transform.ProtobufBinaryDataTypeTransformer",
+ "javaType":
"org.apache.camel.component.jackson.protobuf.transform.ProtobufBinaryDataTypeTransformer",
"groupId": "org.apache.camel.springboot",
- "artifactId": "camel-jackson3-protobuf-starter",
+ "artifactId": "camel-jackson-protobuf-starter",
"version": "4.22.0-SNAPSHOT"
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-x-java-object.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-x-java-object.json
index 765fe1d1c0b..1f76c1a066b 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-x-java-object.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-x-java-object.json
@@ -5,9 +5,9 @@
"title": "Protobuf X Java Object",
"description": "Transforms from JSon to Java object using Jackson Protobuf
(supports content schema)",
"deprecated": false,
- "javaType":
"org.apache.camel.component.jackson3.protobuf.transform.ProtobufPojoDataTypeTransformer",
+ "javaType":
"org.apache.camel.component.jackson.protobuf.transform.ProtobufPojoDataTypeTransformer",
"groupId": "org.apache.camel.springboot",
- "artifactId": "camel-jackson3-protobuf-starter",
+ "artifactId": "camel-jackson-protobuf-starter",
"version": "4.22.0-SNAPSHOT"
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-x-struct.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-x-struct.json
index 218c359e86f..6aa89499cca 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-x-struct.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/transformers/protobuf-x-struct.json
@@ -5,9 +5,9 @@
"title": "Protobuf X Struct",
"description": "Transforms to generic JSonNode using Jackson Protobuf
(supports content schema)",
"deprecated": false,
- "javaType":
"org.apache.camel.component.jackson3.protobuf.transform.ProtobufStructDataTypeTransformer",
+ "javaType":
"org.apache.camel.component.jackson.protobuf.transform.ProtobufStructDataTypeTransformer",
"groupId": "org.apache.camel.springboot",
- "artifactId": "camel-jackson3-protobuf-starter",
+ "artifactId": "camel-jackson-protobuf-starter",
"version": "4.22.0-SNAPSHOT"
}
}
diff --git a/tooling/camel-spring-boot-bom/pom.xml
b/tooling/camel-spring-boot-bom/pom.xml
index 90f7e9e8102..8340c537faf 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -1348,6 +1348,11 @@
<artifactId>camel-master-starter</artifactId>
<version>4.22.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-mcp-server-starter</artifactId>
+ <version>4.22.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-mdc-starter</artifactId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index dbff63e0ded..5456e124151 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -1622,6 +1622,11 @@
<artifactId>camel-master-starter</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel.springboot</groupId>
+ <artifactId>camel-mcp-server-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-mdc-starter</artifactId>
@@ -4629,11 +4634,6 @@
<artifactId>camel-spring-ai-image</artifactId>
<version>4.22.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-ai-tools</artifactId>
- <version>4.22.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-ai-vector-store</artifactId>
@@ -5273,7 +5273,7 @@
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-assertj3</artifactId>
- <version>2.12.0</version>
+ <version>2.13.0</version>
</dependency>
</dependencies>
</dependencyManagement>
