You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/05/03 06:52:04 UTC

(camel) branch main updated (291d028752d -> 3f1ee046db9)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 291d028752d Bump com.google.cloud:libraries-bom from 26.37.0 to 26.38.0 (#14034)
     add 3f1ee046db9 Kamelet ctr5 (#14046)

No new revisions were added by this update.

Summary of changes:
 .../org/apache/camel/catalog/models-app/beans.json |   2 +-
 .../org/apache/camel/catalog/models-app/camel.json |   2 +-
 .../org/apache/camel/catalog/models.properties     |   2 -
 .../apache/camel/catalog/models/routeTemplate.json |   2 +-
 .../apache/camel/catalog/models/templateBean.json  |  28 ---
 .../camel/catalog/models/templatedRoute.json       |   2 +-
 .../camel/catalog/models/templatedRouteBean.json   |  28 ---
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 173 +++--------------
 .../org/apache/camel/spi/ModelToXMLDumper.java     |   2 +-
 .../org/apache/camel/spi/ModelToYAMLDumper.java    |   2 +-
 .../org/apache/camel/impl/DefaultCamelContext.java |  10 +-
 .../camel/impl/DefaultDumpRoutesStrategy.java      |  26 +--
 .../java/org/apache/camel/impl/DefaultModel.java   |  16 +-
 .../META-INF/org/apache/camel/model/app/beans.json |   2 +-
 .../META-INF/org/apache/camel/model/app/camel.json |   2 +-
 .../org/apache/camel/model/routeTemplate.json      |   2 +-
 .../org/apache/camel/model/templateBean.json       |  28 ---
 .../org/apache/camel/model/templatedRoute.json     |   2 +-
 .../org/apache/camel/model/templatedRouteBean.json |  28 ---
 .../services/org/apache/camel/model.properties     |   2 -
 .../org/apache/camel/model/app/jaxb.index          |   1 -
 .../resources/org/apache/camel/model/jaxb.index    |   3 +-
 .../org/apache/camel/builder/RouteBuilder.java     |  12 +-
 .../apache/camel/model/BeanFactoryDefinition.java  |  81 ++++----
 .../org/apache/camel/model/BeanModelHelper.java    |   5 +-
 .../main/java/org/apache/camel/model/Model.java    |   5 +-
 .../camel/model/RouteTemplateBeanDefinition.java   |  33 ----
 .../camel/model/RouteTemplateDefinition.java       |  22 +--
 .../camel/model/TemplatedRouteBeanDefinition.java  |  33 ----
 .../camel/model/TemplatedRouteDefinition.java      |  22 +--
 .../apache/camel/model/app/BeansDefinition.java    |   7 +-
 .../camel/model/app/RegistryBeanDefinition.java    |  34 ----
 .../java/org/apache/camel/xml/in/ModelParser.java  |  80 ++++----
 .../java/org/apache/camel/xml/out/ModelWriter.java |  40 +---
 .../org/apache/camel/xml/LwModelToXMLDumper.java   |  26 ++-
 .../org/apache/camel/xml/in/ModelParserTest.java   |  14 +-
 .../camel/xml/jaxb/JaxbModelToXMLDumper.java       |  26 ++-
 .../org/apache/camel/yaml/out/ModelWriter.java     |  40 +---
 .../org/apache/camel/yaml/LwModelToYAMLDumper.java |  31 ++--
 .../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc     |   6 +
 .../xml/blueprint/BlueprintXmlBeansHandler.java    |  42 ++---
 .../main/xml/spring/SpringXmlBeansHandler.java     |  24 +--
 .../{RegistryBeanDsl.kt => BeanFactoryDsl.kt}      |   8 +-
 .../main/kotlin/org/apache/camel/kotlin/RootDsl.kt |   8 +-
 .../camel/dsl/xml/io/XmlRoutesBuilderLoader.java   |  14 +-
 .../camel-yaml-dsl-deserializers/pom.xml           |   2 -
 .../dsl/yaml/deserializers/ModelDeserializers.java | 204 ++++++++++-----------
 .../deserializers/ModelDeserializersResolver.java  |   2 +-
 .../BeanFactoryDefinitionDeserializer.java         | 115 ------------
 .../dsl/yaml/deserializers/BeansDeserializer.java  |  24 +--
 .../dsl/yaml/deserializers/CustomResolver.java     |   4 -
 .../RouteTemplateBeanDefinitionDeserializer.java   |  63 -------
 .../RouteTemplateDefinitionDeserializer.java       |   8 +-
 .../TemplatedRouteBeanDefinitionDeserializer.java  |  63 -------
 .../TemplatedRouteDefinitionDeserializer.java      |   7 +-
 .../generated/resources/schema/camelYamlDsl.json   | 178 +++++-------------
 .../apache/camel/dsl/yaml/KameletLoaderTest.groovy |  10 +-
 57 files changed, 446 insertions(+), 1212 deletions(-)
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
 delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templatedRouteBean.json
 delete mode 100644 core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/templateBean.json
 delete mode 100644 core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/templatedRouteBean.json
 delete mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java
 delete mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteBeanDefinition.java
 delete mode 100644 core/camel-core-model/src/main/java/org/apache/camel/model/app/RegistryBeanDefinition.java
 rename dsl/camel-kotlin-api/src/main/kotlin/org/apache/camel/kotlin/{RegistryBeanDsl.kt => BeanFactoryDsl.kt} (88%)
 delete mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeanFactoryDefinitionDeserializer.java
 delete mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java
 delete mode 100644 dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/TemplatedRouteBeanDefinitionDeserializer.java