[camel] branch master updated: Updating documentation for Kafka to indicate that SASL_PLAINTEXT is also supported (I tested it with 2.23.1)

[co...@apache.org]

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

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new fd29415  Updating documentation for Kafka to indicate that SASL_PLAINTEXT is also supported (I tested it with 2.23.1)
fd29415 is described below

commit fd29415ec509b5de33be9d7d121b2a7b90997ef0
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Feb 7 18:28:47 2019 +0000

    Updating documentation for Kafka to indicate that SASL_PLAINTEXT is also supported (I tested it with 2.23.1)
---
 components/camel-kafka/src/main/docs/kafka-component.adoc             | 2 +-
 .../java/org/apache/camel/component/kafka/KafkaConfiguration.java     | 2 +-
 .../camel/component/kafka/springboot/KafkaComponentConfiguration.java | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc
index 0cc41ed..4f6e06a 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -155,7 +155,7 @@ with the following path and query parameters:
 | *saslJaasConfig* (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; |  | String
 | *saslKerberosServiceName* (security) | The Kerberos principal name that Kafka runs as. This can be defined either in Kafka's JAAS config or in Kafka's config. |  | String
 | *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
-| *securityProtocol* (security) | Protocol used to communicate with brokers. Currently only PLAINTEXT and SSL are supported. | PLAINTEXT | String
+| *securityProtocol* (security) | Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and SSL are supported | PLAINTEXT | String
 | *sslCipherSuites* (security) | A list of cipher suites. This is a named combination of authentication, encryption, MAC and key exchange algorithm used to negotiate the security settings for a network connection using TLS or SSL network protocol.By default all the available cipher suites are supported. |  | String
 | *sslContextParameters* (security) | SSL configuration using a Camel SSLContextParameters object. If configured it's applied before the other SSL endpoint parameters. |  | SSLContextParameters
 | *sslEnabledProtocols* (security) | The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default. | TLSv1.2,TLSv1.1,TLSv1 | String
diff --git a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
index ffae708..fe31a48 100644
--- a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
+++ b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConfiguration.java
@@ -1063,7 +1063,7 @@ public class KafkaConfiguration implements Cloneable, HeaderFilterStrategyAware
     }
 
     /**
-     * Protocol used to communicate with brokers. Currently only PLAINTEXT and SSL are supported.
+     * Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and SSL are supported
      */
     public void setSecurityProtocol(String securityProtocol) {
         this.securityProtocol = securityProtocol;
diff --git a/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index f6ff141..db6e347 100644
--- a/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -441,8 +441,8 @@ public class KafkaComponentConfiguration
          */
         private String saslJaasConfig;
         /**
-         * Protocol used to communicate with brokers. Currently only PLAINTEXT
-         * and SSL are supported.
+         * Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT
+         * and SSL are supported
          */
         private String securityProtocol = "PLAINTEXT";
         /**