This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 2515f7d421d5 CAMEL-22620: JAXB data format -
accessExternalSchemaProtocols should not have default value
2515f7d421d5 is described below
commit 2515f7d421d581da669bcc4a692f02f6119f4d84
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Oct 29 12:09:26 2025 +0100
CAMEL-22620: JAXB data format - accessExternalSchemaProtocols should not
have default value
---
.../resources/org/apache/camel/catalog/dataformats/jaxb.json | 2 +-
.../generated/resources/org/apache/camel/catalog/models/jaxb.json | 2 +-
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 6 +++---
.../resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd | 6 +++---
.../resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json | 2 +-
.../resources/META-INF/org/apache/camel/model/dataformat/jaxb.json | 2 +-
.../main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java | 6 +++---
.../src/generated/java/org/apache/camel/xml/out/ModelWriter.java | 2 +-
.../src/generated/java/org/apache/camel/yaml/out/ModelWriter.java | 2 +-
.../org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
.../camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json | 3 +--
11 files changed, 17 insertions(+), 18 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
index 889d5c525d43..46b56fd589ad 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/jaxb.json
@@ -36,6 +36,6 @@
"noNamespaceSchemaLocation": { "index": 17, "kind": "attribute",
"displayName": "No Namespace Schema Location", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To define the location of the namespaceless schema" },
"jaxbProviderProperties": { "index": 18, "kind": "attribute",
"displayName": "Jaxb Provider Properties", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom java.util.Map to lookup in the registry
containing custom JAXB provider properties to be used with the JAXB
marshaller." },
"contentTypeHeader": { "index": 19, "kind": "attribute", "displayName":
"Content Type Header", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether the data format
should set the Content-Type header with the type from the data format. For
example application\/xml for data formats marshalling to XML, or
application\/json for data formats marshall [...]
- "accessExternalSchemaProtocols": { "index": 20, "kind": "attribute",
"displayName": "Access External Schema Protocols", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "false", "description": "Only in use if schema validation has
been enabled. Restrict access to the protocols specified for external reference
set by the schemaLocation attribute, Impo [...]
+ "accessExternalSchemaProtocols": { "index": 20, "kind": "attribute",
"displayName": "Access External Schema Protocols", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Only in use if schema validation has been enabled. Restrict
access to the protocols specified for external reference set by the
schemaLocation attribute, Import and Include element. E [...]
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
index 7f766e731663..e59e07fc6fc6 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jaxb.json
@@ -33,6 +33,6 @@
"noNamespaceSchemaLocation": { "index": 17, "kind": "attribute",
"displayName": "No Namespace Schema Location", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To define the location of the namespaceless schema" },
"jaxbProviderProperties": { "index": 18, "kind": "attribute",
"displayName": "Jaxb Provider Properties", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom java.util.Map to lookup in the registry
containing custom JAXB provider properties to be used with the JAXB
marshaller." },
"contentTypeHeader": { "index": 19, "kind": "attribute", "displayName":
"Content Type Header", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether the data format
should set the Content-Type header with the type from the data format. For
example application\/xml for data formats marshalling to XML, or
application\/json for data formats marshall [...]
- "accessExternalSchemaProtocols": { "index": 20, "kind": "attribute",
"displayName": "Access External Schema Protocols", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "false", "description": "Only in use if schema validation has
been enabled. Restrict access to the protocols specified for external reference
set by the schemaLocation attribute, Impo [...]
+ "accessExternalSchemaProtocols": { "index": 20, "kind": "attribute",
"displayName": "Access External Schema Protocols", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Only in use if schema validation has been enabled. Restrict
access to the protocols specified for external reference set by the
schemaLocation attribute, Import and Include element. E [...]
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index bbdab286aff5..04eebcc6c588 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -9449,9 +9449,9 @@ value: true
<xs:documentation xml:lang="en">
<![CDATA[
Only in use if schema validation has been enabled. Restrict access to the
protocols specified for external reference set
-by the schemaLocation attribute, Import and Include element. Examples of
protocols are file, http, jar:file. false or
-none to deny all access to external references; a specific protocol, such as
file, to give permission to only the
-protocol; the keyword all to grant permission to all protocols. Default value:
false
+by the schemaLocation attribute, Import and Include element. Examples of
protocols are file, http, jar:file. empty,
+false or none to deny all access to external references; a specific protocol,
such as file, to give permission to only
+the protocol; the keyword all to grant permission to all protocols.
]]>
</xs:documentation>
</xs:annotation>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
index 3e382bffa755..77a77dd2db4c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
@@ -8122,9 +8122,9 @@ value: true
<xs:documentation xml:lang="en">
<![CDATA[
Only in use if schema validation has been enabled. Restrict access to the
protocols specified for external reference set
-by the schemaLocation attribute, Import and Include element. Examples of
protocols are file, http, jar:file. false or
-none to deny all access to external references; a specific protocol, such as
file, to give permission to only the
-protocol; the keyword all to grant permission to all protocols. Default value:
false
+by the schemaLocation attribute, Import and Include element. Examples of
protocols are file, http, jar:file. empty,
+false or none to deny all access to external references; a specific protocol,
such as file, to give permission to only
+the protocol; the keyword all to grant permission to all protocols.
]]>
</xs:documentation>
</xs:annotation>
diff --git
a/components/camel-jaxb/src/generated/resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json
b/components/camel-jaxb/src/generated/resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json
index 889d5c525d43..46b56fd589ad 100644
---
a/components/camel-jaxb/src/generated/resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json
+++
b/components/camel-jaxb/src/generated/resources/META-INF/org/apache/camel/converter/jaxb/jaxb.json
@@ -36,6 +36,6 @@
"noNamespaceSchemaLocation": { "index": 17, "kind": "attribute",
"displayName": "No Namespace Schema Location", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To define the location of the namespaceless schema" },
"jaxbProviderProperties": { "index": 18, "kind": "attribute",
"displayName": "Jaxb Provider Properties", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom java.util.Map to lookup in the registry
containing custom JAXB provider properties to be used with the JAXB
marshaller." },
"contentTypeHeader": { "index": 19, "kind": "attribute", "displayName":
"Content Type Header", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether the data format
should set the Content-Type header with the type from the data format. For
example application\/xml for data formats marshalling to XML, or
application\/json for data formats marshall [...]
- "accessExternalSchemaProtocols": { "index": 20, "kind": "attribute",
"displayName": "Access External Schema Protocols", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "false", "description": "Only in use if schema validation has
been enabled. Restrict access to the protocols specified for external reference
set by the schemaLocation attribute, Impo [...]
+ "accessExternalSchemaProtocols": { "index": 20, "kind": "attribute",
"displayName": "Access External Schema Protocols", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Only in use if schema validation has been enabled. Restrict
access to the protocols specified for external reference set by the
schemaLocation attribute, Import and Include element. E [...]
}
}
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/jaxb.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/jaxb.json
index 7f766e731663..e59e07fc6fc6 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/jaxb.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/dataformat/jaxb.json
@@ -33,6 +33,6 @@
"noNamespaceSchemaLocation": { "index": 17, "kind": "attribute",
"displayName": "No Namespace Schema Location", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To define the location of the namespaceless schema" },
"jaxbProviderProperties": { "index": 18, "kind": "attribute",
"displayName": "Jaxb Provider Properties", "group": "advanced", "label":
"advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom java.util.Map to lookup in the registry
containing custom JAXB provider properties to be used with the JAXB
marshaller." },
"contentTypeHeader": { "index": 19, "kind": "attribute", "displayName":
"Content Type Header", "group": "common", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether the data format
should set the Content-Type header with the type from the data format. For
example application\/xml for data formats marshalling to XML, or
application\/json for data formats marshall [...]
- "accessExternalSchemaProtocols": { "index": 20, "kind": "attribute",
"displayName": "Access External Schema Protocols", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "false", "description": "Only in use if schema validation has
been enabled. Restrict access to the protocols specified for external reference
set by the schemaLocation attribute, Impo [...]
+ "accessExternalSchemaProtocols": { "index": 20, "kind": "attribute",
"displayName": "Access External Schema Protocols", "group": "security",
"label": "security", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Only in use if schema validation has been enabled. Restrict
access to the protocols specified for external reference set by the
schemaLocation attribute, Import and Include element. E [...]
}
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
index ae2f9b68e25b..5909248d6e06 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
@@ -91,7 +91,7 @@ public class JaxbDataFormat extends DataFormatDefinition
implements ContentTypeH
+ " For example application/xml for data formats
marshalling to XML, or application/json for data formats marshalling to JSON")
private String contentTypeHeader;
@XmlAttribute
- @Metadata(label = "security", defaultValue = "false")
+ @Metadata(label = "security")
private String accessExternalSchemaProtocols;
public JaxbDataFormat() {
@@ -390,8 +390,8 @@ public class JaxbDataFormat extends DataFormatDefinition
implements ContentTypeH
* Restrict access to the protocols specified for external reference set
by the schemaLocation attribute, Import and
* Include element. Examples of protocols are file, http, jar:file.
*
- * false or none to deny all access to external references; a specific
protocol, such as file, to give permission to
- * only the protocol; the keyword all to grant permission to all protocols.
+ * empty, false or none to deny all access to external references; a
specific protocol, such as file, to give
+ * permission to only the protocol; the keyword all to grant permission to
all protocols.
*/
public void setAccessExternalSchemaProtocols(String
accessExternalSchemaProtocols) {
this.accessExternalSchemaProtocols = accessExternalSchemaProtocols;
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
index 18f9f687dd09..eacf991ebe83 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/out/ModelWriter.java
@@ -2713,7 +2713,7 @@ public class ModelWriter extends BaseWriter {
protected void doWriteJaxbDataFormat(String name, JaxbDataFormat def)
throws IOException {
startElement(name);
doWriteIdentifiedTypeAttributes(def);
- doWriteAttribute("accessExternalSchemaProtocols",
def.getAccessExternalSchemaProtocols(), "false");
+ doWriteAttribute("accessExternalSchemaProtocols",
def.getAccessExternalSchemaProtocols(), null);
doWriteAttribute("schema", def.getSchema(), null);
doWriteAttribute("contentTypeHeader", def.getContentTypeHeader(),
"true");
doWriteAttribute("prettyPrint", def.getPrettyPrint(), "true");
diff --git
a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
index 7d4070562009..900dc4ae34af 100644
---
a/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
+++
b/core/camel-yaml-io/src/generated/java/org/apache/camel/yaml/out/ModelWriter.java
@@ -2713,7 +2713,7 @@ public class ModelWriter extends BaseWriter {
protected void doWriteJaxbDataFormat(String name, JaxbDataFormat def)
throws IOException {
startElement(name);
doWriteIdentifiedTypeAttributes(def);
- doWriteAttribute("accessExternalSchemaProtocols",
def.getAccessExternalSchemaProtocols(), "false");
+ doWriteAttribute("accessExternalSchemaProtocols",
def.getAccessExternalSchemaProtocols(), null);
doWriteAttribute("schema", def.getSchema(), null);
doWriteAttribute("contentTypeHeader", def.getContentTypeHeader(),
"true");
doWriteAttribute("prettyPrint", def.getPrettyPrint(), "true");
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index c66fb3523c52..a8c9cf5bbed2 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -8121,7 +8121,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
description = "Unmarshal XML payloads to POJOs and back using
JAXB2 XML marshalling standard.",
deprecated = false,
properties = {
- @YamlProperty(name = "accessExternalSchemaProtocols", type
= "string", defaultValue = "false", description = "Only in use if schema
validation has been enabled. Restrict access to the protocols specified for
external reference set by the schemaLocation attribute, Import and Include
element. Examples of protocols are file, http, jar:file. false or none to deny
all access to external references; a specific protocol, such as file, to give
permission to only the protocol; [...]
+ @YamlProperty(name = "accessExternalSchemaProtocols", type
= "string", description = "Only in use if schema validation has been enabled.
Restrict access to the protocols specified for external reference set by the
schemaLocation attribute, Import and Include element. Examples of protocols are
file, http, jar:file. empty, false or none to deny all access to external
references; a specific protocol, such as file, to give permission to only the
protocol; the keyword all [...]
@YamlProperty(name = "contentTypeHeader", type =
"boolean", defaultValue = "true", description = "Whether the data format should
set the Content-Type header with the type from the data format. For example
application/xml for data formats marshalling to XML, or application/json for
data formats marshalling to JSON", displayName = "Content Type Header"),
@YamlProperty(name = "contextPath", type = "string",
required = true, description = "Package name where your JAXB classes are
located.", displayName = "Context Path"),
@YamlProperty(name = "contextPathIsClassName", type =
"boolean", defaultValue = "false", description = "This can be set to true to
mark that the contextPath is referring to a classname and not a package name.",
displayName = "Context Path Is Class Name"),
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 478a2443b819..100f5fa0d960 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -11981,8 +11981,7 @@
"accessExternalSchemaProtocols" : {
"type" : "string",
"title" : "Access External Schema Protocols",
- "description" : "Only in use if schema validation has been
enabled. Restrict access to the protocols specified for external reference set
by the schemaLocation attribute, Import and Include element. Examples of
protocols are file, http, jar:file. false or none to deny all access to
external references; a specific protocol, such as file, to give permission to
only the protocol; the keyword all to grant permission to all protocols.",
- "default" : "false"
+ "description" : "Only in use if schema validation has been
enabled. Restrict access to the protocols specified for external reference set
by the schemaLocation attribute, Import and Include element. Examples of
protocols are file, http, jar:file. empty, false or none to deny all access to
external references; a specific protocol, such as file, to give permission to
only the protocol; the keyword all to grant permission to all protocols."
},
"contentTypeHeader" : {
"type" : "boolean",
