You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/03/30 09:08:00 UTC

[camel-spring-boot] branch master updated (a413a71 -> 3d41644)

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

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.


    from a413a71  Merge pull request #36 from apache/automatic-periodic-sync
     new 21ffbed  Camel-Spring-Boot: Fixed build
     new 3d41644  CAMEL-14798: Regen camel-avro only dataformat and regen generic

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../springboot/catalog/components/influxdb.json    |   1 +
 .../camel/springboot/catalog/components/nats.json  |   3 +-
 components-starter/camel-avro-starter/pom.xml      |   4 +-
 .../src/main/docs/avro-starter.adoc                |  15 +-
 .../springboot/AvroComponentAutoConfiguration.java | 108 -------------
 .../springboot/AvroComponentConfiguration.java     | 176 ---------------------
 .../src/main/resources/META-INF/spring.factories   |   5 +-
 components-starter/camel-corda-starter/pom.xml     |  12 ++
 .../src/main/docs/influxdb-starter.adoc            |   4 +-
 .../springboot/InfluxDbComponentConfiguration.java |  13 ++
 .../src/main/docs/nats-starter.adoc                |   4 +-
 .../springboot/NatsComponentConfiguration.java     |  12 ++
 .../camel-spring-boot-starter/pom.xml              |  16 ++
 .../camel-spring-cloud-consul-starter/pom.xml      |  20 +++
 .../camel-spring-cloud-netflix-starter/pom.xml     |  20 +++
 .../camel-spring-cloud-starter/pom.xml             |  20 +++
 .../camel-spring-cloud-zookeeper-starter/pom.xml   |  20 +++
 .../ClusteredRouteControllerAutoConfiguration.java |   8 +-
 docs/modules/ROOT/pages/avro-starter.adoc          |  15 +-
 docs/modules/ROOT/pages/influxdb-starter.adoc      |   4 +-
 docs/modules/ROOT/pages/nats-starter.adoc          |   4 +-
 tooling/camel-spring-boot-dependencies/pom.xml     |  20 +--
 22 files changed, 168 insertions(+), 336 deletions(-)
 delete mode 100644 components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
 delete mode 100644 components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentConfiguration.java


[camel-spring-boot] 02/02: CAMEL-14798: Regen camel-avro only dataformat and regen generic

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 3d41644f6f6e4a6e30cad1df338b3bdf26b63d67
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 30 11:07:28 2020 +0200

    CAMEL-14798: Regen camel-avro only dataformat and regen generic
---
 .../springboot/catalog/components/influxdb.json    |   1 +
 .../camel/springboot/catalog/components/nats.json  |   3 +-
 components-starter/camel-avro-starter/pom.xml      |   4 +-
 .../src/main/docs/avro-starter.adoc                |  15 +-
 .../springboot/AvroComponentAutoConfiguration.java | 108 -------------
 .../springboot/AvroComponentConfiguration.java     | 176 ---------------------
 .../src/main/resources/META-INF/spring.factories   |   5 +-
 components-starter/camel-corda-starter/pom.xml     |  12 ++
 .../src/main/docs/influxdb-starter.adoc            |   4 +-
 .../springboot/InfluxDbComponentConfiguration.java |  13 ++
 .../src/main/docs/nats-starter.adoc                |   4 +-
 .../springboot/NatsComponentConfiguration.java     |  12 ++
 .../camel-spring-cloud-consul-starter/pom.xml      |  20 +++
 .../camel-spring-cloud-netflix-starter/pom.xml     |  20 +++
 .../camel-spring-cloud-starter/pom.xml             |  20 +++
 .../camel-spring-cloud-zookeeper-starter/pom.xml   |  20 +++
 docs/modules/ROOT/pages/avro-starter.adoc          |  15 +-
 docs/modules/ROOT/pages/influxdb-starter.adoc      |   4 +-
 docs/modules/ROOT/pages/nats-starter.adoc          |   4 +-
 19 files changed, 138 insertions(+), 322 deletions(-)

diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/influxdb.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/influxdb.json
index 5cc8e5c..f261c7c 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/influxdb.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/influxdb.json
@@ -19,6 +19,7 @@
     "version": "3.2.0-SNAPSHOT"
   },
   "componentProperties": {
+    "influxDB": { "kind": "property", "displayName": "Influx DB", "group": "producer", "required": false, "type": "object", "javaType": "org.influxdb.InfluxDB", "deprecated": false, "secret": false, "description": "The shared Influx DB to use for all endpoints" },
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
     "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }
   },
diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
index a69d2aa..75d49de 100644
--- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
+++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
@@ -20,6 +20,7 @@
   },
   "componentProperties": {
     "servers": { "kind": "property", "displayName": "Servers", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "URLs to one or more NAT servers. Use comma to separate URLs when specifying multiple servers." },
+    "verbose": { "kind": "property", "displayName": "Verbose", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether or not running in verbose mode" },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
     "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
@@ -34,7 +35,7 @@
     "maxReconnectAttempts": { "kind": "parameter", "displayName": "Max Reconnect Attempts", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "60", "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Max reconnection attempts" },
     "noEcho": { "kind": "parameter", "displayName": "No Echo", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Turn off echo. If supported by the gnatsd version you are connecting to this flag will prevent the server from echoing messages back to the conne [...]
     "noRandomizeServers": { "kind": "parameter", "displayName": "No Randomize Servers", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not randomizing the order of servers for the connection attempts" },
-    "pedantic": { "kind": "parameter", "displayName": "Pedantic", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not running in pedantic mode (this affects performace)" },
+    "pedantic": { "kind": "parameter", "displayName": "Pedantic", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not running in pedantic mode (this affects performance)" },
     "pingInterval": { "kind": "parameter", "displayName": "Ping Interval", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "120000", "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Ping interval to be aware if connection is still alive (in milliseconds)" },
     "reconnect": { "kind": "parameter", "displayName": "Reconnect", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not using reconnection feature" },
     "reconnectTimeWait": { "kind": "parameter", "displayName": "Reconnect Time Wait", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "2000", "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Waiting time before attempts reconnection (in milliseconds)" },
diff --git a/components-starter/camel-avro-starter/pom.xml b/components-starter/camel-avro-starter/pom.xml
index 378e72a..b4b10b7 100644
--- a/components-starter/camel-avro-starter/pom.xml
+++ b/components-starter/camel-avro-starter/pom.xml
@@ -26,8 +26,8 @@
   </parent>
   <artifactId>camel-avro-starter</artifactId>
   <packaging>jar</packaging>
-  <name>Camel SB Starters :: Avro</name>
-  <description>Spring-Boot Starter for Camel Avro data format</description>
+  <!--    <name>Camel Spring Boot :: Starters :: Dozer</name>-->
+  <!--    <description>Spring-Boot Starter for Camel Support for the Dozer type conversion framework</description>-->
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
diff --git a/components-starter/camel-avro-starter/src/main/docs/avro-starter.adoc b/components-starter/camel-avro-starter/src/main/docs/avro-starter.adoc
index 04585ae..5c7d205 100644
--- a/components-starter/camel-avro-starter/src/main/docs/avro-starter.adoc
+++ b/components-starter/camel-avro-starter/src/main/docs/avro-starter.adoc
@@ -17,26 +17,17 @@ When using avro with Spring Boot make sure to use the following Maven dependency
 ----
 
 
-The component supports 14 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *camel.component.avro.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.avro.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
-| *camel.component.avro.configuration* | To use a shared AvroConfiguration to configure options once. The option is a org.apache.camel.component.avro.AvroConfiguration type. |  | String
-| *camel.component.avro.enabled* | Whether to enable auto configuration of the avro component. This is enabled by default. |  | Boolean
-| *camel.component.avro.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then  [...]
-| *camel.component.avro.protocol* | Avro protocol to use. The option is a org.apache.avro.Protocol type. |  | String
-| *camel.component.avro.protocol-class-name* | Avro protocol to use defined by the FQN class name |  | String
-| *camel.component.avro.protocol-location* | Avro protocol location |  | String
-| *camel.component.avro.reflection-protocol* | If protocol object provided is reflection protocol. Should be used only with protocol parameter because for protocolClassName protocol type will be auto detected | false | Boolean
-| *camel.component.avro.single-parameter* | If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message | false | Boolean
-| *camel.component.avro.uri-authority* | Authority to use (username and password) |  | String
 | *camel.dataformat.avro.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
 | *camel.dataformat.avro.enabled* | Whether to enable auto configuration of the avro data format. This is enabled by default. |  | Boolean
 | *camel.dataformat.avro.instance-class-name* | Class name to use for marshal and unmarshalling |  | String
 |===
+
+
 // spring-boot-auto-configure options: END
diff --git a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
deleted file mode 100644
index 0d084b6..0000000
--- a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentAutoConfiguration.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.avro.springboot;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.annotation.Generated;
-import org.apache.camel.CamelContext;
-import org.apache.camel.component.avro.AvroComponent;
-import org.apache.camel.spi.ComponentCustomizer;
-import org.apache.camel.spi.HasId;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import org.apache.camel.spring.boot.ComponentConfigurationProperties;
-import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
-import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
-import org.apache.camel.spring.boot.util.GroupCondition;
-import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
-import org.apache.camel.support.IntrospectionSupport;
-import org.apache.camel.util.ObjectHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@Configuration(proxyBeanMethods = false)
-@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
-        AvroComponentAutoConfiguration.GroupConditions.class})
-@AutoConfigureAfter(CamelAutoConfiguration.class)
-@EnableConfigurationProperties({ComponentConfigurationProperties.class,
-        AvroComponentConfiguration.class})
-public class AvroComponentAutoConfiguration {
-
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(AvroComponentAutoConfiguration.class);
-    @Autowired
-    private ApplicationContext applicationContext;
-    @Autowired
-    private CamelContext camelContext;
-    @Autowired
-    private AvroComponentConfiguration configuration;
-    @Autowired(required = false)
-    private List<ComponentCustomizer<AvroComponent>> customizers;
-
-    static class GroupConditions extends GroupCondition {
-        public GroupConditions() {
-            super("camel.component", "camel.component.avro");
-        }
-    }
-
-    @Lazy
-    @Bean(name = "avro-component")
-    @ConditionalOnMissingBean(AvroComponent.class)
-    public AvroComponent configureAvroComponent() throws Exception {
-        AvroComponent component = new AvroComponent();
-        component.setCamelContext(camelContext);
-        Map<String, Object> parameters = new HashMap<>();
-        IntrospectionSupport.getProperties(configuration, parameters, null,
-                false);
-        CamelPropertiesHelper.setCamelProperties(camelContext, component,
-                parameters, false);
-        if (ObjectHelper.isNotEmpty(customizers)) {
-            for (ComponentCustomizer<AvroComponent> customizer : customizers) {
-                boolean useCustomizer = (customizer instanceof HasId)
-                        ? HierarchicalPropertiesEvaluator.evaluate(
-                                applicationContext.getEnvironment(),
-                                "camel.component.customizer",
-                                "camel.component.avro.customizer",
-                                ((HasId) customizer).getId())
-                        : HierarchicalPropertiesEvaluator.evaluate(
-                                applicationContext.getEnvironment(),
-                                "camel.component.customizer",
-                                "camel.component.avro.customizer");
-                if (useCustomizer) {
-                    LOGGER.debug("Configure component {}, with customizer {}",
-                            component, customizer);
-                    customizer.customize(component);
-                }
-            }
-        }
-        return component;
-    }
-}
\ No newline at end of file
diff --git a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentConfiguration.java b/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentConfiguration.java
deleted file mode 100644
index 0215389..0000000
--- a/components-starter/camel-avro-starter/src/main/java/org/apache/camel/component/avro/springboot/AvroComponentConfiguration.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.avro.springboot;
-
-import javax.annotation.Generated;
-import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * Working with Apache Avro for data serialization.
- * 
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.springboot.maven.SpringBootAutoConfigurationMojo")
-@ConfigurationProperties(prefix = "camel.component.avro")
-public class AvroComponentConfiguration
-        extends
-            ComponentConfigurationPropertiesCommon {
-
-    /**
-     * Whether to enable auto configuration of the avro component. This is
-     * enabled by default.
-     */
-    private Boolean enabled;
-    /**
-     * Avro protocol to use. The option is a org.apache.avro.Protocol type.
-     */
-    private String protocol;
-    /**
-     * Avro protocol to use defined by the FQN class name
-     */
-    private String protocolClassName;
-    /**
-     * Avro protocol location
-     */
-    private String protocolLocation;
-    /**
-     * If protocol object provided is reflection protocol. Should be used only
-     * with protocol parameter because for protocolClassName protocol type will
-     * be auto detected
-     */
-    private Boolean reflectionProtocol = false;
-    /**
-     * If true, consumer parameter won't be wrapped into array. Will fail if
-     * protocol specifies more then 1 parameter for the message
-     */
-    private Boolean singleParameter = false;
-    /**
-     * Authority to use (username and password)
-     */
-    private String uriAuthority;
-    /**
-     * Allows for bridging the consumer to the Camel routing Error Handler,
-     * which mean any exceptions occurred while the consumer is trying to pickup
-     * incoming messages, or the likes, will now be processed as a message and
-     * handled by the routing Error Handler. By default the consumer will use
-     * the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that
-     * will be logged at WARN or ERROR level and ignored.
-     */
-    private Boolean bridgeErrorHandler = false;
-    /**
-     * Whether the producer should be started lazy (on the first message). By
-     * starting lazy you can use this to allow CamelContext and routes to
-     * startup in situations where a producer may otherwise fail during starting
-     * and cause the route to fail being started. By deferring this startup to
-     * be lazy then the startup failure can be handled during routing messages
-     * via Camel's routing error handlers. Beware that when the first message is
-     * processed then creating and starting the producer may take a little time
-     * and prolong the total processing time of the processing.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
-     * Whether the component should use basic property binding (Camel 2.x) or
-     * the newer property binding with additional capabilities
-     */
-    private Boolean basicPropertyBinding = false;
-    /**
-     * To use a shared AvroConfiguration to configure options once. The option
-     * is a org.apache.camel.component.avro.AvroConfiguration type.
-     */
-    private String configuration;
-
-    public String getProtocol() {
-        return protocol;
-    }
-
-    public void setProtocol(String protocol) {
-        this.protocol = protocol;
-    }
-
-    public String getProtocolClassName() {
-        return protocolClassName;
-    }
-
-    public void setProtocolClassName(String protocolClassName) {
-        this.protocolClassName = protocolClassName;
-    }
-
-    public String getProtocolLocation() {
-        return protocolLocation;
-    }
-
-    public void setProtocolLocation(String protocolLocation) {
-        this.protocolLocation = protocolLocation;
-    }
-
-    public Boolean getReflectionProtocol() {
-        return reflectionProtocol;
-    }
-
-    public void setReflectionProtocol(Boolean reflectionProtocol) {
-        this.reflectionProtocol = reflectionProtocol;
-    }
-
-    public Boolean getSingleParameter() {
-        return singleParameter;
-    }
-
-    public void setSingleParameter(Boolean singleParameter) {
-        this.singleParameter = singleParameter;
-    }
-
-    public String getUriAuthority() {
-        return uriAuthority;
-    }
-
-    public void setUriAuthority(String uriAuthority) {
-        this.uriAuthority = uriAuthority;
-    }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
-    public Boolean getBasicPropertyBinding() {
-        return basicPropertyBinding;
-    }
-
-    public void setBasicPropertyBinding(Boolean basicPropertyBinding) {
-        this.basicPropertyBinding = basicPropertyBinding;
-    }
-
-    public String getConfiguration() {
-        return configuration;
-    }
-
-    public void setConfiguration(String configuration) {
-        this.configuration = configuration;
-    }
-}
\ No newline at end of file
diff --git a/components-starter/camel-avro-starter/src/main/resources/META-INF/spring.factories b/components-starter/camel-avro-starter/src/main/resources/META-INF/spring.factories
index 9e08882..4f7140e 100644
--- a/components-starter/camel-avro-starter/src/main/resources/META-INF/spring.factories
+++ b/components-starter/camel-avro-starter/src/main/resources/META-INF/spring.factories
@@ -14,7 +14,6 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.dataformat.avro.springboot.AvroDataFormatAutoConfiguration,\
-org.apache.camel.component.avro.springboot.AvroComponentAutoConfiguration
 
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.dataformat.avro.springboot.AvroDataFormatAutoConfiguration
diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index 61d6d32..cba8670 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-corda</artifactId>
       <version>${camel-version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-classic</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>ch.qos.logback</groupId>
+          <artifactId>logback-core</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-influxdb-starter/src/main/docs/influxdb-starter.adoc b/components-starter/camel-influxdb-starter/src/main/docs/influxdb-starter.adoc
index 5033169..213d05b 100644
--- a/components-starter/camel-influxdb-starter/src/main/docs/influxdb-starter.adoc
+++ b/components-starter/camel-influxdb-starter/src/main/docs/influxdb-starter.adoc
@@ -17,7 +17,7 @@ When using influxdb with Spring Boot make sure to use the following Maven depend
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
@@ -26,7 +26,7 @@ The component supports 3 options, which are listed below.
 | Name | Description | Default | Type
 | *camel.component.influxdb.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.influxdb.enabled* | Whether to enable auto configuration of the influxdb component. This is enabled by default. |  | Boolean
+| *camel.component.influxdb.influx-d-b* | The shared Influx DB to use for all endpoints. The option is a org.influxdb.InfluxDB type. |  | String
 | *camel.component.influxdb.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
 |===
-
 // spring-boot-auto-configure options: END
diff --git a/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConfiguration.java b/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConfiguration.java
index 202ca05..08d0d2d 100644
--- a/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConfiguration.java
+++ b/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConfiguration.java
@@ -38,6 +38,11 @@ public class InfluxDbComponentConfiguration
      */
     private Boolean enabled;
     /**
+     * The shared Influx DB to use for all endpoints. The option is a
+     * org.influxdb.InfluxDB type.
+     */
+    private String influxDB;
+    /**
      * Whether the producer should be started lazy (on the first message). By
      * starting lazy you can use this to allow CamelContext and routes to
      * startup in situations where a producer may otherwise fail during starting
@@ -54,6 +59,14 @@ public class InfluxDbComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
 
+    public String getInfluxDB() {
+        return influxDB;
+    }
+
+    public void setInfluxDB(String influxDB) {
+        this.influxDB = influxDB;
+    }
+
     public Boolean getLazyStartProducer() {
         return lazyStartProducer;
     }
diff --git a/components-starter/camel-nats-starter/src/main/docs/nats-starter.adoc b/components-starter/camel-nats-starter/src/main/docs/nats-starter.adoc
index 53c064a..b2b44ad 100644
--- a/components-starter/camel-nats-starter/src/main/docs/nats-starter.adoc
+++ b/components-starter/camel-nats-starter/src/main/docs/nats-starter.adoc
@@ -17,7 +17,7 @@ When using nats with Spring Boot make sure to use the following Maven dependency
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
@@ -30,6 +30,6 @@ The component supports 6 options, which are listed below.
 | *camel.component.nats.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then  [...]
 | *camel.component.nats.servers* | URLs to one or more NAT servers. Use comma to separate URLs when specifying multiple servers. |  | String
 | *camel.component.nats.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
+| *camel.component.nats.verbose* | Whether or not running in verbose mode | false | Boolean
 |===
-
 // spring-boot-auto-configure options: END
diff --git a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
index 1d77200..7a3841c 100644
--- a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
+++ b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
@@ -42,6 +42,10 @@ public class NatsComponentConfiguration
      */
     private String servers;
     /**
+     * Whether or not running in verbose mode
+     */
+    private Boolean verbose = false;
+    /**
      * Allows for bridging the consumer to the Camel routing Error Handler,
      * which mean any exceptions occurred while the consumer is trying to pickup
      * incoming messages, or the likes, will now be processed as a message and
@@ -79,6 +83,14 @@ public class NatsComponentConfiguration
         this.servers = servers;
     }
 
+    public Boolean getVerbose() {
+        return verbose;
+    }
+
+    public void setVerbose(Boolean verbose) {
+        this.verbose = verbose;
+    }
+
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-spring-cloud-consul-starter/pom.xml b/components-starter/camel-spring-cloud-consul-starter/pom.xml
index 65392d9..31e9a5e 100644
--- a/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -38,6 +38,26 @@
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-cloud-consul</artifactId>
       <version>${project.version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index 6792135..7b038ab 100644
--- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -38,6 +38,26 @@
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-cloud-netflix</artifactId>
       <version>${project.version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-spring-cloud-starter/pom.xml b/components-starter/camel-spring-cloud-starter/pom.xml
index ce02d1e..480eeec 100644
--- a/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-starter/pom.xml
@@ -38,6 +38,26 @@
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-cloud</artifactId>
       <version>${project.version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index e70dbf9..5f3927a 100644
--- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -38,6 +38,26 @@
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-spring-cloud-zookeeper</artifactId>
       <version>${project.version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/docs/modules/ROOT/pages/avro-starter.adoc b/docs/modules/ROOT/pages/avro-starter.adoc
index 04585ae..5c7d205 100644
--- a/docs/modules/ROOT/pages/avro-starter.adoc
+++ b/docs/modules/ROOT/pages/avro-starter.adoc
@@ -17,26 +17,17 @@ When using avro with Spring Boot make sure to use the following Maven dependency
 ----
 
 
-The component supports 14 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *camel.component.avro.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
-| *camel.component.avro.bridge-error-handler* | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | Boolean
-| *camel.component.avro.configuration* | To use a shared AvroConfiguration to configure options once. The option is a org.apache.camel.component.avro.AvroConfiguration type. |  | String
-| *camel.component.avro.enabled* | Whether to enable auto configuration of the avro component. This is enabled by default. |  | Boolean
-| *camel.component.avro.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then  [...]
-| *camel.component.avro.protocol* | Avro protocol to use. The option is a org.apache.avro.Protocol type. |  | String
-| *camel.component.avro.protocol-class-name* | Avro protocol to use defined by the FQN class name |  | String
-| *camel.component.avro.protocol-location* | Avro protocol location |  | String
-| *camel.component.avro.reflection-protocol* | If protocol object provided is reflection protocol. Should be used only with protocol parameter because for protocolClassName protocol type will be auto detected | false | Boolean
-| *camel.component.avro.single-parameter* | If true, consumer parameter won't be wrapped into array. Will fail if protocol specifies more then 1 parameter for the message | false | Boolean
-| *camel.component.avro.uri-authority* | Authority to use (username and password) |  | String
 | *camel.dataformat.avro.content-type-header* | Whether the data format should set the Content-Type header with the type from the data format if the data format is capable of doing so. For example application/xml for data formats marshalling to XML, or application/json for data formats marshalling to JSon etc. | false | Boolean
 | *camel.dataformat.avro.enabled* | Whether to enable auto configuration of the avro data format. This is enabled by default. |  | Boolean
 | *camel.dataformat.avro.instance-class-name* | Class name to use for marshal and unmarshalling |  | String
 |===
+
+
 // spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/influxdb-starter.adoc b/docs/modules/ROOT/pages/influxdb-starter.adoc
index 5033169..213d05b 100644
--- a/docs/modules/ROOT/pages/influxdb-starter.adoc
+++ b/docs/modules/ROOT/pages/influxdb-starter.adoc
@@ -17,7 +17,7 @@ When using influxdb with Spring Boot make sure to use the following Maven depend
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
@@ -26,7 +26,7 @@ The component supports 3 options, which are listed below.
 | Name | Description | Default | Type
 | *camel.component.influxdb.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.influxdb.enabled* | Whether to enable auto configuration of the influxdb component. This is enabled by default. |  | Boolean
+| *camel.component.influxdb.influx-d-b* | The shared Influx DB to use for all endpoints. The option is a org.influxdb.InfluxDB type. |  | String
 | *camel.component.influxdb.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...]
 |===
-
 // spring-boot-auto-configure options: END
diff --git a/docs/modules/ROOT/pages/nats-starter.adoc b/docs/modules/ROOT/pages/nats-starter.adoc
index 53c064a..b2b44ad 100644
--- a/docs/modules/ROOT/pages/nats-starter.adoc
+++ b/docs/modules/ROOT/pages/nats-starter.adoc
@@ -17,7 +17,7 @@ When using nats with Spring Boot make sure to use the following Maven dependency
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
@@ -30,6 +30,6 @@ The component supports 6 options, which are listed below.
 | *camel.component.nats.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then  [...]
 | *camel.component.nats.servers* | URLs to one or more NAT servers. Use comma to separate URLs when specifying multiple servers. |  | String
 | *camel.component.nats.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
+| *camel.component.nats.verbose* | Whether or not running in verbose mode | false | Boolean
 |===
-
 // spring-boot-auto-configure options: END


[camel-spring-boot] 01/02: Camel-Spring-Boot: Fixed build

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 21ffbed6ef1ff62413796daf78c691e5b4a7b35f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Mar 30 11:00:39 2020 +0200

    Camel-Spring-Boot: Fixed build
---
 components-starter/camel-spring-boot-starter/pom.xml | 16 ++++++++++++++++
 .../ClusteredRouteControllerAutoConfiguration.java   |  8 ++++----
 tooling/camel-spring-boot-dependencies/pom.xml       | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/components-starter/camel-spring-boot-starter/pom.xml b/components-starter/camel-spring-boot-starter/pom.xml
index 5760e35..c1ca9d2 100644
--- a/components-starter/camel-spring-boot-starter/pom.xml
+++ b/components-starter/camel-spring-boot-starter/pom.xml
@@ -48,6 +48,22 @@
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-core</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-slf4j-impl</artifactId>
+        </exclusion>
       </exclusions>
       <!--END OF GENERATED CODE-->
     </dependency>
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
index 7ceab96..7002d3d 100644
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
+++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java
@@ -24,10 +24,10 @@ import java.util.Optional;
 
 import org.apache.camel.catalog.impl.TimePatternConverter;
 import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.cluster.ClusteredRouteConfiguration;
-import org.apache.camel.cluster.ClusteredRouteController;
-import org.apache.camel.cluster.ClusteredRouteFilter;
-import org.apache.camel.cluster.ClusteredRouteFilters;
+import org.apache.camel.impl.cluster.ClusteredRouteConfiguration;
+import org.apache.camel.impl.cluster.ClusteredRouteController;
+import org.apache.camel.impl.cluster.ClusteredRouteFilter;
+import org.apache.camel.impl.cluster.ClusteredRouteFilters;
 
 import org.apache.camel.spi.RouteController;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml
index deee0ee..dd2b0a1 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -758,6 +758,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel.springboot</groupId>
+        <artifactId>camel-elytron-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel.springboot</groupId>
         <artifactId>camel-etcd-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -1969,6 +1974,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-avro-rpc</artifactId>
+        <version>3.2.0-SNAPSHOT</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-aws-cw</artifactId>
         <version>3.2.0-SNAPSHOT</version>
       </dependency>
@@ -2304,11 +2314,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-commands-core</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-componentdsl</artifactId>
         <version>3.2.0-SNAPSHOT</version>
       </dependency>
@@ -3556,11 +3561,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
-        <artifactId>camel-test-karaf</artifactId>
-        <version>3.2.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.camel</groupId>
         <artifactId>camel-test-spring</artifactId>
         <version>3.2.0-SNAPSHOT</version>
       </dependency>