[camel] branch master updated (48596d6f -> 3fd8816)

[davsclaus]

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

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


from 48596d6f CAMEL-15047: camel-saleforce - Fix services to do correctly 
start|stop logic in their doStart/doStop methods and defer creating the http 
clients to this phase so they are created at correct moment. Also for buuld 
time optimizations via camel-quarkus/graalvm would benefit from this.
 new f729b80  Regen
 new 3fd8816  Fixed test and also make ManagementStrategy a static service 
as there is only one per context.

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:
 camel-dependencies/pom.xml   |  2 +-
 .../java/org/apache/camel/spi/ManagementStrategy.java|  3 ++-
 .../apache/camel/management/JmxManagementStrategy.java   | 16 
 .../camel/management/ManagedNonManagedServiceTest.java   |  2 +-
 .../ManagedProducerRouteAddRemoveRegisterAlwaysTest.java |  2 +-
 .../camel/management/ManagedRouteAddRemoveTest.java  |  2 +-
 6 files changed, 18 insertions(+), 9 deletions(-)

[camel] 01/02: Regen

[davsclaus]

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

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

commit f729b80b278fd1094ed8b5a11484f25800cc6c93
Author: Claus Ibsen 
AuthorDate: Tue May 12 06:48:58 2020 +0200

Regen
---
 camel-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 740adc2..003fb00 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -17,7 +17,7 @@
 limitations under the License.
 
 -->
-http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns="http://maven.apache.org/POM/4.0.0;
+http://maven.apache.org/POM/4.0.0 
https://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns="http://maven.apache.org/POM/4.0.0;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
   4.0.0
   

[camel] 02/02: Fixed test and also make ManagementStrategy a static service as there is only one per context.

[davsclaus]

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

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

commit 3fd881654322c1c364e60437bd6f1e7a50d73dc2
Author: Claus Ibsen 
AuthorDate: Tue May 12 07:10:30 2020 +0200

Fixed test and also make ManagementStrategy a static service as there is 
only one per context.
---
 .../java/org/apache/camel/spi/ManagementStrategy.java|  3 ++-
 .../apache/camel/management/JmxManagementStrategy.java   | 16 
 .../camel/management/ManagedNonManagedServiceTest.java   |  2 +-
 .../ManagedProducerRouteAddRemoveRegisterAlwaysTest.java |  2 +-
 .../camel/management/ManagedRouteAddRemoveTest.java  |  2 +-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java 
b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
index 78fe47d..e880506 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementStrategy.java
@@ -20,6 +20,7 @@ import java.util.List;
 
 import org.apache.camel.NamedNode;
 import org.apache.camel.Service;
+import org.apache.camel.StaticService;
 
 /**
  * Strategy for management.
@@ -31,7 +32,7 @@ import org.apache.camel.Service;
  * @see ManagementObjectNameStrategy
  * @see org.apache.camel.spi.ManagementAgent
  */
-public interface ManagementStrategy extends Service {
+public interface ManagementStrategy extends StaticService {
 
 /**
  * Adds a managed object allowing the ManagementStrategy implementation to 
record or expose
diff --git 
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
 
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
index 65ea9b8..7a1f969 100644
--- 
a/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
+++ 
b/core/camel-management/src/main/java/org/apache/camel/management/JmxManagementStrategy.java
@@ -16,20 +16,19 @@
  */
 package org.apache.camel.management;
 
+import javax.management.ObjectName;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.management.ObjectName;
-
 import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.NamedNode;
+import org.apache.camel.api.management.ManagedAttribute;
 import org.apache.camel.api.management.ManagedCamelContext;
+import org.apache.camel.api.management.ManagedResource;
 import org.apache.camel.impl.engine.DefaultManagementStrategy;
 import org.apache.camel.spi.ManagementAgent;
 import org.apache.camel.spi.ManagementObjectNameStrategy;
 import org.apache.camel.spi.ManagementObjectStrategy;
-import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,11 +40,13 @@ import org.slf4j.LoggerFactory;
  *
  * @see org.apache.camel.spi.ManagementStrategy
  */
+@ManagedResource(description = "Managed JmxManagementStrategy")
 public class JmxManagementStrategy extends DefaultManagementStrategy {
 
 private static final Logger LOG = 
LoggerFactory.getLogger(JmxManagementStrategy.class);
 
 private final List managed = new ArrayList<>();
+private int counter;
 
 public JmxManagementStrategy() {
 }
@@ -65,6 +66,7 @@ public class JmxManagementStrategy extends 
DefaultManagementStrategy {
 ObjectName objectName = 
getManagementObjectNameStrategy().getObjectName(managedObject);
 if (objectName != null) {
 getManagementAgent().register(managedObject, objectName);
+counter++;
 }
 }
 
@@ -77,6 +79,7 @@ public class JmxManagementStrategy extends 
DefaultManagementStrategy {
 ObjectName objectName = 
getManagementObjectNameStrategy().getObjectName(managedObject);
 if (objectName != null) {
 getManagementAgent().unregister(objectName);
+counter--;
 }
 }
 
@@ -110,6 +113,11 @@ public class JmxManagementStrategy extends 
DefaultManagementStrategy {
 return true;
 }
 
+@ManagedAttribute(description = "Number of managed MBean instances")
+public int getManagedCount() {
+return counter;
+}
+
 @Override
 protected void doInit() throws Exception {
 LOG.info("JMX is enabled");
diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
index 3642872..e9d545e 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 
 public class ManagedNonManagedServiceTest extends 

[camel] branch master updated: CAMEL-15047: camel-saleforce - Fix services to do correctly start|stop logic in their doStart/doStop methods and defer creating the http clients to this phase so they ar

[davsclaus]

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

davsclaus 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 48596d6f CAMEL-15047: camel-saleforce - Fix services to do correctly 
start|stop logic in their doStart/doStop methods and defer creating the http 
clients to this phase so they are created at correct moment. Also for buuld 
time optimizations via camel-quarkus/graalvm would benefit from this.
48596d6f is described below

commit 48596d6fcac90ce01067b0d27174d1757621790c
Author: Claus Ibsen 
AuthorDate: Mon May 11 16:07:17 2020 +0200

CAMEL-15047: camel-saleforce - Fix services to do correctly start|stop 
logic in their doStart/doStop methods and defer creating the http clients to 
this phase so they are created at correct moment. Also for buuld time 
optimizations via camel-quarkus/graalvm would benefit from this.
---
 .../component/salesforce/SalesforceComponent.java  |  2 +-
 .../salesforce/internal/SalesforceSession.java | 21 
 .../internal/client/AbstractClientBase.java| 12 ---
 .../internal/client/DefaultAnalyticsApiClient.java |  2 --
 .../internal/processor/AbstractRestProcessor.java  | 37 --
 .../processor/AbstractSalesforceProcessor.java | 30 --
 .../internal/processor/AnalyticsApiProcessor.java  | 29 -
 .../internal/processor/BulkApiProcessor.java   | 25 ---
 .../internal/processor/CompositeApiProcessor.java  | 28 
 .../internal/processor/XmlRestProcessor.java   |  2 --
 10 files changed, 94 insertions(+), 94 deletions(-)

diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
index 9309ab1..d476fb0 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponent.java
@@ -302,7 +302,7 @@ public class SalesforceComponent extends DefaultComponent 
implements SSLContextP
 return result;
 }
 
-protected SalesforceHttpClient getHttpClient() {
+public SalesforceHttpClient getHttpClient() {
 return httpClient;
 }
 
diff --git 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
index cf21315..94011e6 100644
--- 
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
+++ 
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/SalesforceSession.java
@@ -37,8 +37,6 @@ import java.util.concurrent.TimeoutException;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.camel.CamelContext;
-import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.Service;
 import org.apache.camel.component.salesforce.AuthenticationType;
 import org.apache.camel.component.salesforce.SalesforceHttpClient;
 import org.apache.camel.component.salesforce.SalesforceLoginConfig;
@@ -48,6 +46,7 @@ import 
org.apache.camel.component.salesforce.api.utils.JsonUtils;
 import org.apache.camel.component.salesforce.internal.dto.LoginError;
 import org.apache.camel.component.salesforce.internal.dto.LoginToken;
 import org.apache.camel.support.jsse.KeyStoreParameters;
+import org.apache.camel.support.service.ServiceSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.eclipse.jetty.client.HttpConversation;
 import org.eclipse.jetty.client.api.ContentResponse;
@@ -59,7 +58,7 @@ import org.eclipse.jetty.util.Fields;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SalesforceSession implements Service {
+public class SalesforceSession extends ServiceSupport {
 
 private static final String JWT_SIGNATURE_ALGORITHM = "SHA256withRSA";
 
@@ -345,23 +344,15 @@ public class SalesforceSession implements Service {
 }
 
 @Override
-public void start() {
+public void doStart() throws Exception {
 // auto-login at start if needed
-try {
-login(accessToken);
-} catch (SalesforceException e) {
-throw RuntimeCamelException.wrapRuntimeCamelException(e);
-}
+login(accessToken);
 }
 
 @Override
-public void stop() {
+public void doStop() throws Exception {
 // logout
-try 

[camel-kafka-connector] branch master updated: chore: rename poorly named variable in test code

[valdar]

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

valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git


The following commit(s) were added to refs/heads/master by this push:
 new 4b96891  chore: rename poorly named variable in test code
4b96891 is described below

commit 4b968918b963cdc9c1c0308c9848402be2d34fcd
Author: Otavio Rodolfo Piske 
AuthorDate: Mon May 11 16:17:50 2020 +0200

chore: rename poorly named variable in test code
---
 .../apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/tests/src/test/java/org/apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java
 
b/tests/src/test/java/org/apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java
index 221384d..ecab0db 100644
--- 
a/tests/src/test/java/org/apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java
+++ 
b/tests/src/test/java/org/apache/camel/kafkaconnector/SourceConnectorPropertyFactory.java
@@ -25,8 +25,8 @@ public abstract class SourceConnectorPropertyFactory

[camel-kafka-connector] branch master updated (9cb3266 -> 8e60b91)

[valdar]

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

valdar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.


from 9cb3266  Merge pull request #206 from apache/camel-3.2.0
 add 8e60b91  Re-enable Cassandra test using properties

No new revisions were added by this update.

Summary of changes:
 .../kafkaconnector/clients/cassandra/dao/TestDataDao.java|  9 +
 .../sink/cassandra/CamelSinkCassandraITCase.java | 12 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

[camel-k] 06/06: Fix #1449: add e2e check on help option

[nferraro]

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

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

commit 4b5f215d7a690195babd9657889fd4b797ba547f
Author: Nicola Ferraro 
AuthorDate: Fri May 8 15:04:17 2020 +0200

Fix #1449: add e2e check on help option
---
 e2e/common/offline_commands_test.go | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/e2e/common/offline_commands_test.go 
b/e2e/common/offline_commands_test.go
index a0b0e9c..74956ce 100644
--- a/e2e/common/offline_commands_test.go
+++ b/e2e/common/offline_commands_test.go
@@ -39,6 +39,12 @@ func TestKamelHelpTraitWorksOffline(t *testing.T) {
assert.Nil(t, traitCmd.Execute())
 }
 
+func TestKamelHelpOptionWorksOffline(t *testing.T) {
+   traitCmd := Kamel("run", "Xxx.java", "--help")
+   traitCmd.SetOut(ioutil.Discard)
+   assert.Nil(t, traitCmd.Execute())
+}
+
 func TestKamelCompletionWorksOffline(t *testing.T) {
bashCmd := Kamel("completion", "bash", "--config", 
"non-existent-kubeconfig-file")
bashCmd.SetOut(ioutil.Discard)

[camel-k] 02/06: Fix #1449: fix help command and logs

[nferraro]

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

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

commit d5e750235cf156a19f40c30b19711e52c48a3c65
Author: Nicola Ferraro 
AuthorDate: Fri May 8 12:40:52 2020 +0200

Fix #1449: fix help command and logs
---
 cmd/kamel/main.go| 15 ++-
 pkg/cmd/modeline.go  | 22 --
 pkg/cmd/modeline_test.go | 13 +
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/cmd/kamel/main.go b/cmd/kamel/main.go
index be385b4..9b99fa2 100644
--- a/cmd/kamel/main.go
+++ b/cmd/kamel/main.go
@@ -19,7 +19,6 @@ package main
 
 import (
"context"
-   "fmt"
"math/rand"
"os"
"time"
@@ -42,18 +41,8 @@ func main() {
defer cancel()
 
// Add modeline options to the command
-   rootCmd, args, err := cmd.NewKamelWithModelineCommand(ctx, os.Args)
-   if err != nil {
-   fmt.Printf("Error: %s\n", err.Error())
-   exitOnError(err)
-   }
-
-   // Give a feedback about the actual command that is run
-   fmt.Fprint(rootCmd.OutOrStdout(), "Executing: kamel ")
-   for _, a := range args {
-   fmt.Fprintf(rootCmd.OutOrStdout(), "%s ", a)
-   }
-   fmt.Fprintln(rootCmd.OutOrStdout())
+   rootCmd, _, err := cmd.NewKamelWithModelineCommand(ctx, os.Args)
+   exitOnError(err)
 
err = rootCmd.Execute()
exitOnError(err)
diff --git a/pkg/cmd/modeline.go b/pkg/cmd/modeline.go
index 60343ca..caa1310 100644
--- a/pkg/cmd/modeline.go
+++ b/pkg/cmd/modeline.go
@@ -8,6 +8,7 @@ import (
"github.com/apache/camel-k/pkg/util/modeline"
"github.com/pkg/errors"
"github.com/spf13/cobra"
+   "github.com/spf13/pflag"
"path/filepath"
 )
 
@@ -33,7 +34,22 @@ var (
 
 func NewKamelWithModelineCommand(ctx context.Context, osArgs []string) 
(*cobra.Command, []string, error) {
processed := make(map[string]bool)
-   return createKamelWithModelineCommand(ctx, osArgs[1:], processed)
+   originalFlags := osArgs[1:]
+   rootCmd, flags, err := createKamelWithModelineCommand(ctx, 
append([]string(nil), originalFlags...), processed)
+   if err != nil {
+   fmt.Printf("Error: %s\n", err.Error())
+   return rootCmd, flags, err
+   }
+   if len(originalFlags) != len(flags) {
+   // Give a feedback about the actual command that is run
+   fmt.Fprintln(rootCmd.OutOrStdout(), "Modeline options have been 
loaded from source files")
+   fmt.Fprint(rootCmd.OutOrStdout(), "Full command: kamel ")
+   for _, a := range flags {
+   fmt.Fprintf(rootCmd.OutOrStdout(), "%s ", a)
+   }
+   fmt.Fprintln(rootCmd.OutOrStdout())
+   }
+   return rootCmd, flags, nil
 }
 
 func createKamelWithModelineCommand(ctx context.Context, args []string, 
processedFiles map[string]bool) (*cobra.Command, []string, error) {
@@ -52,7 +68,9 @@ func createKamelWithModelineCommand(ctx context.Context, args 
[]string, processe
}
 
err = target.ParseFlags(flags)
-   if err != nil {
+   if err == pflag.ErrHelp {
+   return rootCmd, args, nil
+   } else if err != nil {
return nil, nil, err
}
 
diff --git a/pkg/cmd/modeline_test.go b/pkg/cmd/modeline_test.go
index 6eabd18..33de320 100644
--- a/pkg/cmd/modeline_test.go
+++ b/pkg/cmd/modeline_test.go
@@ -46,6 +46,19 @@ func TestModelineRunSimple(t *testing.T) {
assert.Equal(t, []string{"run", fileName, "--dependency", 
"mvn:org.my:lib:1.0"}, flags)
 }
 
+func TestModelineRunHelp(t *testing.T) {
+   dir, err := ioutil.TempDir("", "camel-k-test-")
+   assert.NoError(t, err)
+   defer os.RemoveAll(dir)
+   // no file created
+   fileName := path.Join(dir, "simple.groovy")
+
+   cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), 
[]string{"kamel", "run", fileName, "--help"})
+   assert.NoError(t, err)
+   assert.NotNil(t, cmd)
+   assert.Equal(t, []string{"run", fileName, "--help"}, flags)
+}
+
 func TestModelineRunChain(t *testing.T) {
dir, err := ioutil.TempDir("", "camel-k-test-")
assert.NoError(t, err)

[camel-k] 03/06: Fix #1449: document modeline and CLI

[nferraro]

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

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

commit fd1646a90a53f1f6f26447335108778db13aacb1
Author: Nicola Ferraro 
AuthorDate: Fri May 8 12:41:12 2020 +0200

Fix #1449: document modeline and CLI
---
 docs/modules/ROOT/nav-end.adoc|  2 -
 docs/modules/ROOT/nav.adoc|  4 ++
 docs/modules/ROOT/pages/cli/cli.adoc  | 54 +
 docs/modules/ROOT/pages/cli/modeline.adoc | 98 +++
 pkg/cmd/run.go|  2 +-
 5 files changed, 157 insertions(+), 3 deletions(-)

diff --git a/docs/modules/ROOT/nav-end.adoc b/docs/modules/ROOT/nav-end.adoc
index ff8f435..bfd2ea1 100644
--- a/docs/modules/ROOT/nav-end.adoc
+++ b/docs/modules/ROOT/nav-end.adoc
@@ -1,4 +1,2 @@
-* xref:tutorials/tutorials.adoc[Tutorials]
-** xref:tutorials/tekton/tekton.adoc[Tekton Pipelines]
 * xref:uninstalling.adoc[Uninstalling]
 * xref:developers.adoc[Contributing to Camel K]
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 6d7dde0..9754790 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -9,6 +9,10 @@
 *** xref:installation/registry/gcr.adoc[Gcr.io]
 * xref:running/running.adoc[Running]
 ** xref:running/dev-mode.adoc[Dev Mode]
+* xref:tutorials/tutorials.adoc[Tutorials]
+** xref:tutorials/tekton/tekton.adoc[Tekton Pipelines]
+* xref:cli/cli.adoc[CLI]
+** xref:cli/modeline.adoc[Modeline]
 * xref:configuration/configuration.adoc[Configuration]
 ** xref:configuration/components.adoc[Components]
 ** xref:configuration/logging.adoc[Logging]
diff --git a/docs/modules/ROOT/pages/cli/cli.adoc 
b/docs/modules/ROOT/pages/cli/cli.adoc
new file mode 100644
index 000..a388d17
--- /dev/null
+++ b/docs/modules/ROOT/pages/cli/cli.adoc
@@ -0,0 +1,54 @@
+= Camel K CLI (kamel)
+
+The Camel K command line interface (kamel) is the main entry point for running 
integrations on a Kubernetes cluster.
+
+Releases of the Camel K CLI are available on:
+
+- Apache Mirrors (official): https://downloads.apache.org/camel/camel-k/
+- Github Releases: https://github.com/apache/camel-k/releases
+- Homebrew (Mac and Linux): https://formulae.brew.sh/formula/kamel
+
+== Available Commands
+
+Some of the most used commands are:
+
+.Useful Commands
+|===
+|Name |Description |Example
+
+|help
+|Obtain the full list of available commands
+|`kamel help`
+
+|init
+|Initialize empty Camel K files
+|`kamel init Routes.java`
+
+|run
+|Run an integration on Kubernetes
+|`kamel run Routes.java`
+
+|get
+|Get integrations deployed on Kubernetes
+|`kamel get`
+
+|describe
+|Get detailed information on a resource
+|`kamel describe integration routes`
+
+|log
+|Print the logs of a running integration
+|`kamel log routes`
+
+|delete
+|Delete integrations deployed on Kubernetes
+|`kamel delete routes`
+
+|===
+
+The list above is not the full list of available commands. You can run `kamel 
help` to obtain the full list.
+
+== Modeline
+
+Some command options in the CLI can be also specified as modeline in the 
source file, take a look at the xref:cli/modeline.adoc[Modeline section]
+for more information.
diff --git a/docs/modules/ROOT/pages/cli/modeline.adoc 
b/docs/modules/ROOT/pages/cli/modeline.adoc
new file mode 100644
index 000..9f58304
--- /dev/null
+++ b/docs/modules/ROOT/pages/cli/modeline.adoc
@@ -0,0 +1,98 @@
+= Camel K Modeline
+
+Integration files can contain modeline hooks that allow to customize the way 
integrations are executed via command line.
+
+For example, take the following integration file:
+
+.Hello.java
+
+// camel-k: dependency=mvn:org.my:application:1.0 // <1>
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class Hello extends RouteBuilder {
+  @Override
+  public void configure() throws Exception {
+
+  from("timer:java?period=1000")
+.bean(org.my.BusinessLogic) // <2>
+.log("${body}");
+
+  }
+}
+
+<1> Modeline import of Maven library
+<2> Usage of a business logic class from the external library
+
+When the integration code above is executed using the `kamel run` CLI command, 
the modeline options declared in the file are appended to
+the list of arguments that are passed to the command.
+
+The `kamel` CLI will alert you, printing the full command in the shell:
+
+
+$ kamel run Hello.java
+Modeline options have been loaded from source files
+Full command: kamel run Hello.java --dependency mvn:org.my:application:1.0
+...
+
+
+Multiple options, even of the same type, can be specified for an integration. 
For example
+the following modeline options make sure that the integration runs on the 
Quarkus runtime and enable the 3scale exposure.
+
+.QuarkusRest.java
+
+// camel-k: trait=quarkus.enabled=true trait=3scale.enabled=true // <1>
+
+import org.apache.camel.builder.RouteBuilder;
+
+public class QuarkusRest extends RouteBuilder {
+  

[camel] branch camel-2.x updated: fix xrefs

[djencks]

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

djencks pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-2.x by this push:
 new 7e30e22  fix xrefs
7e30e22 is described below

commit 7e30e22e6b60224799eba8d436cd82ed4dbce5ec
Author: David Jencks 
AuthorDate: Mon May 11 09:23:34 2020 -0700

fix xrefs
---
 components/camel-bam/src/main/docs/bam-example.adoc|  4 ++--
 .../main/docs/openshift-build-configs-component.adoc   |  2 +-
 components/camel-scala/src/main/docs/scala-eip.adoc|  2 +-
 components/camel-shiro/src/main/docs/shiro.adoc|  2 +-
 .../src/main/docs/spring-security.adoc |  4 ++--
 .../camel-spring/src/main/docs/spring-summary.adoc |  2 +-
 components/camel-test-cdi/src/main/docs/test-cdi.adoc  |  2 +-
 .../camel-test-spring/src/main/docs/test-spring.adoc   |  2 +-
 .../camel-urlrewrite/src/main/docs/urlrewrite.adoc | 18 +-
 .../ROOT/pages/openshift-build-configs-component.adoc  |  2 +-
 docs/components/modules/ROOT/pages/spring-summary.adoc |  2 +-
 docs/components/modules/others/pages/bam-example.adoc  |  4 ++--
 docs/components/modules/others/pages/scala-eip.adoc|  2 +-
 docs/components/modules/others/pages/shiro.adoc|  2 +-
 .../modules/others/pages/spring-security.adoc  |  4 ++--
 docs/components/modules/others/pages/test-cdi.adoc |  2 +-
 docs/components/modules/others/pages/test-spring.adoc  |  2 +-
 docs/components/modules/others/pages/urlrewrite.adoc   | 18 +-
 18 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/components/camel-bam/src/main/docs/bam-example.adoc 
b/components/camel-bam/src/main/docs/bam-example.adoc
index e49e237..f4f9012 100644
--- a/components/camel-bam/src/main/docs/bam-example.adoc
+++ b/components/camel-bam/src/main/docs/bam-example.adoc
@@ -62,8 +62,8 @@ occurs in this example we just send it to the log component
 component to log out an error level message to commons-logging / log4j.
 You could change this to use some of the other
 Components such as ActiveMQ,
-xref:jms-component.adoc[JMS], xref:irc-component.adoc[IRC], 
xref:mail-component.adoc[Mail],
-xref:xmpp-component.adoc[XMPP] etc.
+xref:ROOT:jms-component.adoc[JMS], xref:ROOT:irc-component.adoc[IRC], 
xref:ROOT:mail-component.adoc[Mail],
+xref:ROOT:xmpp-component.adoc[XMPP] etc.
 
 == Running the example
 
diff --git 
a/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
 
b/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
index 8a7fad1..bd4de99 100644
--- 
a/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
+++ 
b/components/camel-kubernetes/src/main/docs/openshift-build-configs-component.adoc
@@ -8,7 +8,7 @@
 
 *Since Camel {since}*
 
-The *OpenShift Build Config* component is one of 
xref:kubernetes.adoc[Kubernetes Components] which
+The *OpenShift Build Config* component is one of 
xref:kubernetes-summary.adoc[Kubernetes Components] which
 provides a producer to execute kubernetes build config operations. 
 
 
diff --git a/components/camel-scala/src/main/docs/scala-eip.adoc 
b/components/camel-scala/src/main/docs/scala-eip.adoc
index 83f54b2..c708437 100644
--- a/components/camel-scala/src/main/docs/scala-eip.adoc
+++ b/components/camel-scala/src/main/docs/scala-eip.adoc
@@ -203,5 +203,5 @@ transformation and pass that to the `process` method 
instead. The
 example below uses pattern matching to enrich the message content:
 
 Off course, you can also use any other Camel component (e.g.
-xref:velocity-component.adoc[Velocity]) to enrich the content and add it to a
+xref:ROOT:velocity-component.adoc[Velocity]) to enrich the content and add it 
to a
 pipeline
diff --git a/components/camel-shiro/src/main/docs/shiro.adoc 
b/components/camel-shiro/src/main/docs/shiro.adoc
index 5f70617..0530cd9 100644
--- a/components/camel-shiro/src/main/docs/shiro.adoc
+++ b/components/camel-shiro/src/main/docs/shiro.adoc
@@ -135,7 +135,7 @@ of the roles in the list are applicable.
 these or pass in your own Cipher implementation
 
 |`base64` |`false` |`boolean` |*Camel 2.12:* To use base64 encoding for the 
security token header,
-which allows transferring the header over xref:jms-component.adoc[JMS] etc. 
This
+which allows transferring the header over xref:ROOT:jms-component.adoc[JMS] 
etc. This
 option must also be set on `ShiroSecurityTokenInjector` as well.
 
 |`allPermissionsRequired` |`false` |`boolean` |*Camel 2.13:* The default is 
that authorization is granted if any of the
diff --git 
a/components/camel-spring-security/src/main/docs/spring-security.adoc 
b/components/camel-spring-security/src/main/docs/spring-security.adoc
index 95d5d9f..2fbba99 100644
--- a/components/camel-spring-security/src/main/docs/spring-security.adoc
+++ 

[camel-k] 05/06: Fix #1449: fix lint and typos

[nferraro]

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

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

commit f0e73852e519c7d197b5d44405fbc16360ab8b41
Author: Nicola Ferraro 
AuthorDate: Fri May 8 12:56:04 2020 +0200

Fix #1449: fix lint and typos
---
 docs/modules/ROOT/pages/cli/modeline.adoc |  4 ++--
 pkg/cmd/modeline.go   |  2 +-
 pkg/cmd/modeline_test.go  | 14 +++---
 pkg/cmd/run.go|  4 
 pkg/util/modeline/parser_test.go  |  3 ++-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/docs/modules/ROOT/pages/cli/modeline.adoc 
b/docs/modules/ROOT/pages/cli/modeline.adoc
index 9f58304..7d77da3 100644
--- a/docs/modules/ROOT/pages/cli/modeline.adoc
+++ b/docs/modules/ROOT/pages/cli/modeline.adoc
@@ -6,7 +6,7 @@ For example, take the following integration file:
 
 .Hello.java
 
-// camel-k: dependency=mvn:org.my:application:1.0 // <1>
+// camel-k: dependency=mvn:org.my/application:1.0 // <1>
 
 import org.apache.camel.builder.RouteBuilder;
 
@@ -32,7 +32,7 @@ The `kamel` CLI will alert you, printing the full command in 
the shell:
 
 $ kamel run Hello.java
 Modeline options have been loaded from source files
-Full command: kamel run Hello.java --dependency mvn:org.my:application:1.0
+Full command: kamel run Hello.java --dependency mvn:org.my/application:1.0
 ...
 
 
diff --git a/pkg/cmd/modeline.go b/pkg/cmd/modeline.go
index caa1310..aee189e 100644
--- a/pkg/cmd/modeline.go
+++ b/pkg/cmd/modeline.go
@@ -84,7 +84,7 @@ func createKamelWithModelineCommand(ctx context.Context, args 
[]string, processe
var files = append([]string(nil), fg.Args()...)
files = append(files, sources...)
 
-   var opts []modeline.Option
+   opts := make([]modeline.Option, 0)
for _, f := range files {
if processedFiles[f] {
continue
diff --git a/pkg/cmd/modeline_test.go b/pkg/cmd/modeline_test.go
index 33de320..4206b6d 100644
--- a/pkg/cmd/modeline_test.go
+++ b/pkg/cmd/modeline_test.go
@@ -34,7 +34,7 @@ func TestModelineRunSimple(t *testing.T) {
defer os.RemoveAll(dir)
 
file := `
-   // camel-k: dependency=mvn:org.my:lib:1.0
+   // camel-k: dependency=mvn:org.my/lib:1.0
`
fileName := path.Join(dir, "simple.groovy")
err = ioutil.WriteFile(fileName, []byte(file), 0777)
@@ -43,7 +43,7 @@ func TestModelineRunSimple(t *testing.T) {
cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), 
[]string{"kamel", "run", fileName})
assert.NoError(t, err)
assert.NotNil(t, cmd)
-   assert.Equal(t, []string{"run", fileName, "--dependency", 
"mvn:org.my:lib:1.0"}, flags)
+   assert.Equal(t, []string{"run", fileName, "--dependency", 
"mvn:org.my/lib:1.0"}, flags)
 }
 
 func TestModelineRunHelp(t *testing.T) {
@@ -65,16 +65,16 @@ func TestModelineRunChain(t *testing.T) {
defer os.RemoveAll(dir)
 
file := `
-   // camel-k: dependency=mvn:org.my:lib:1.0
+   // camel-k: dependency=mvn:org.my/lib:2.0
`
fileName := path.Join(dir, "simple.groovy")
err = ioutil.WriteFile(fileName, []byte(file), 0777)
assert.NoError(t, err)
 
-   cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), 
[]string{"kamel", "run", "-d", "mvn:org.my:lib2:1.0", fileName})
+   cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), 
[]string{"kamel", "run", "-d", "mvn:org.my/lib2:1.0", fileName})
assert.NoError(t, err)
assert.NotNil(t, cmd)
-   assert.Equal(t, []string{"run", "-d", "mvn:org.my:lib2:1.0", fileName, 
"--dependency", "mvn:org.my:lib:1.0"}, flags)
+   assert.Equal(t, []string{"run", "-d", "mvn:org.my/lib2:1.0", fileName, 
"--dependency", "mvn:org.my/lib:2.0"}, flags)
 }
 
 func TestModelineRunMultipleFiles(t *testing.T) {
@@ -90,7 +90,7 @@ func TestModelineRunMultipleFiles(t *testing.T) {
assert.NoError(t, err)
 
file2 := `
-   // camel-k: dependency=mvn:org.my:lib:1.0
+   // camel-k: dependency=mvn:org.my/lib:3.0
`
fileName2 := path.Join(dir, "ext.groovy")
err = ioutil.WriteFile(fileName2, []byte(file2), 0777)
@@ -99,7 +99,7 @@ func TestModelineRunMultipleFiles(t *testing.T) {
cmd, flags, err := NewKamelWithModelineCommand(context.TODO(), 
[]string{"kamel", "run", fileName})
assert.NoError(t, err)
assert.NotNil(t, cmd)
-   assert.Equal(t, []string{"run", fileName, "--source", fileName2, 
"--dependency", "mvn:org.my:lib:1.0"}, flags)
+   assert.Equal(t, []string{"run", fileName, "--source", fileName2, 
"--dependency", "mvn:org.my/lib:3.0"}, flags)
 }
 
 func TestModelineRunPropertyFiles(t *testing.T) {
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index c5faea6..6392f2e 100644
--- a/pkg/cmd/run.go
+++ 

[camel-k] 04/06: Fix #1171: fix error in ready condition from replicaset

[nferraro]

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

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

commit 000595fdeacbd115caf618bd91b7acb12d849af2
Author: Nicola Ferraro 
AuthorDate: Fri May 8 12:52:33 2020 +0200

Fix #1171: fix error in ready condition from replicaset
---
 pkg/util/kubernetes/conditions.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/util/kubernetes/conditions.go 
b/pkg/util/kubernetes/conditions.go
index 85c3e9b..1cf9bf4 100644
--- a/pkg/util/kubernetes/conditions.go
+++ b/pkg/util/kubernetes/conditions.go
@@ -69,8 +69,8 @@ func mirrorReadyConditionFromReplicaSet(ctx context.Context, 
c client.Client, it
} else {
it.Status.SetCondition(
v1.IntegrationConditionReady,
-   corev1.ConditionTrue,
-   v1.IntegrationConditionReplicaSetReadyReason,
+   corev1.ConditionFalse,
+   v1.IntegrationConditionReplicaSetNotReadyReason,
"",
)
}

[camel-kafka-connector] branch master updated: Improved CamelSourceTaskTest

[valdar]

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

valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git


The following commit(s) were added to refs/heads/master by this push:
 new 49aa5e8  Improved CamelSourceTaskTest
 new 5593ea7  Merge pull request #205 from fvaleri/no-flaky
49aa5e8 is described below

commit 49aa5e8cba11a49c9fa57f4dc1a3639e9a2c0e29
Author: Federico Valeri 
AuthorDate: Sat May 9 21:06:28 2020 +0200

Improved CamelSourceTaskTest
---
 .../camel/kafkaconnector/CamelSourceTaskTest.java  | 365 ++---
 1 file changed, 165 insertions(+), 200 deletions(-)

diff --git 
a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java 
b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
index 9c40d40..33807ee 100644
--- 
a/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
+++ 
b/core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.kafkaconnector;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 import org.apache.camel.ProducerTemplate;
 import org.apache.kafka.connect.data.Schema;
@@ -32,270 +31,236 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CamelSourceTaskTest {
 
+private static final String DIRECT_URI = "direct:start";
+private static final String TOPIC_NAME = "my-topic";
+
+private void sendBatchOfRecords(CamelSourceTask sourceTask, long size) {
+final ProducerTemplate template = 
sourceTask.getCms().createProducerTemplate();
+for (int i = 0; i < size; i++) {
+template.sendBody(DIRECT_URI, "test" + i);
+}
+}
+
 @Test
 public void testSourcePolling() {
+final long size = 2;
 Map props = new HashMap<>();
-props.put("camel.source.url", "direct:start");
-props.put("topics", "mytopic");
+props.put(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME);
+props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, 
DIRECT_URI);
 
-CamelSourceTask camelSourceTask = new CamelSourceTask();
-camelSourceTask.start(props);
+CamelSourceTask sourceTask = new CamelSourceTask();
+sourceTask.start(props);
 
-final ProducerTemplate template = 
camelSourceTask.getCms().createProducerTemplate();
-template.sendBody("direct:start", "awesome!");
+sendBatchOfRecords(sourceTask, size);
+List poll = sourceTask.poll();
 
-List poll = 
camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertEquals("mytopic", poll.get(0).topic());
+assertEquals(size, poll.size());
+assertEquals(TOPIC_NAME, poll.get(0).topic());
 
-camelSourceTask.stop();
+sourceTask.stop();
 }
 
 @Test
-public void testSourcePollingWithKey() {
+public void testSourcePollingMaxBatchPollSize() {
+final long size = 2;
 Map props = new HashMap<>();
-props.put("camel.source.url", "direct:start");
-props.put("topics", "mytopic");
-
props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_MESSAGE_HEADER_KEY_CONF, 
"CamelSpecialTestKey");
-
-CamelSourceTask camelSourceTask = new CamelSourceTask();
-camelSourceTask.start(props);
-
-final ProducerTemplate template = 
camelSourceTask.getCms().createProducerTemplate();
-
-// first we test if we have a key in the message with body
-template.sendBodyAndHeader("direct:start", "awesome!", 
"CamelSpecialTestKey", 1234);
-
-List poll = 
camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertEquals(1234, poll.get(0).key());
-assertEquals(Schema.Type.INT32, poll.get(0).keySchema().type());
-
-// second we test if we have no key under the header
-template.sendBodyAndHeader("direct:start", "awesome!", "WrongHeader", 
1234);
-
-poll = camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertNull(poll.get(0).key());
-assertNull(poll.get(0).keySchema());
-
-// third we test if we have the header but with null value
-template.sendBodyAndHeader("direct:start", "awesome!", 
"CamelSpecialTestKey", null);
+props.put(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME);
+props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, 
DIRECT_URI);
+
props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_MAX_BATCH_POLL_SIZE_CONF, 
String.valueOf(size));
 
-poll = camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertNull(poll.get(0).key());
-assertNull(poll.get(0).keySchema());
+CamelSourceTask sourceTask = new 

[camel-k] 01/06: Fix #1449: add support for modeline options

[nferraro]

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

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

commit 7a9b7f896fd9e975c0c077de7223eae49eff5222
Author: Nicola Ferraro 
AuthorDate: Thu May 7 15:05:37 2020 +0200

Fix #1449: add support for modeline options
---
 cmd/kamel/main.go|  16 -
 pkg/cmd/modeline.go  | 130 +
 pkg/cmd/modeline_test.go | 119 ++
 pkg/cmd/run.go   |   8 +--
 pkg/util/modeline/parser.go  |  84 ++
 pkg/util/modeline/parser_test.go | 152 +++
 pkg/util/modeline/types.go   |   7 ++
 7 files changed, 510 insertions(+), 6 deletions(-)

diff --git a/cmd/kamel/main.go b/cmd/kamel/main.go
index 2ba8ea9..be385b4 100644
--- a/cmd/kamel/main.go
+++ b/cmd/kamel/main.go
@@ -19,6 +19,7 @@ package main
 
 import (
"context"
+   "fmt"
"math/rand"
"os"
"time"
@@ -40,8 +41,19 @@ func main() {
// Cancel ctx as soon as main returns
defer cancel()
 
-   rootCmd, err := cmd.NewKamelCommand(ctx)
-   exitOnError(err)
+   // Add modeline options to the command
+   rootCmd, args, err := cmd.NewKamelWithModelineCommand(ctx, os.Args)
+   if err != nil {
+   fmt.Printf("Error: %s\n", err.Error())
+   exitOnError(err)
+   }
+
+   // Give a feedback about the actual command that is run
+   fmt.Fprint(rootCmd.OutOrStdout(), "Executing: kamel ")
+   for _, a := range args {
+   fmt.Fprintf(rootCmd.OutOrStdout(), "%s ", a)
+   }
+   fmt.Fprintln(rootCmd.OutOrStdout())
 
err = rootCmd.Execute()
exitOnError(err)
diff --git a/pkg/cmd/modeline.go b/pkg/cmd/modeline.go
new file mode 100644
index 000..60343ca
--- /dev/null
+++ b/pkg/cmd/modeline.go
@@ -0,0 +1,130 @@
+package cmd
+
+import (
+   "context"
+   "fmt"
+   "path"
+
+   "github.com/apache/camel-k/pkg/util/modeline"
+   "github.com/pkg/errors"
+   "github.com/spf13/cobra"
+   "path/filepath"
+)
+
+const (
+   runCmdName= "run"
+   runCmdSourcesArgs = "source"
+)
+
+var (
+   nonRunOptions = map[string]bool{
+   "language": true, // language is a marker modeline option for 
other tools
+   }
+
+   // file options must be considered relative to the source files they 
belong to
+   fileOptions = map[string]bool{
+   "source":true,
+   "resource":  true,
+   "config":true,
+   "open-api":  true,
+   "property-file": true,
+   }
+)
+
+func NewKamelWithModelineCommand(ctx context.Context, osArgs []string) 
(*cobra.Command, []string, error) {
+   processed := make(map[string]bool)
+   return createKamelWithModelineCommand(ctx, osArgs[1:], processed)
+}
+
+func createKamelWithModelineCommand(ctx context.Context, args []string, 
processedFiles map[string]bool) (*cobra.Command, []string, error) {
+   rootCmd, err := NewKamelCommand(ctx)
+   if err != nil {
+   return nil, nil, err
+   }
+
+   target, flags, err := rootCmd.Find(args)
+   if err != nil {
+   return nil, nil, err
+   }
+
+   if target.Name() != runCmdName {
+   return rootCmd, args, nil
+   }
+
+   err = target.ParseFlags(flags)
+   if err != nil {
+   return nil, nil, err
+   }
+
+   fg := target.Flags()
+
+   sources, err := fg.GetStringArray(runCmdSourcesArgs)
+   if err != nil {
+   return nil, nil, err
+   }
+
+   var files = append([]string(nil), fg.Args()...)
+   files = append(files, sources...)
+
+   var opts []modeline.Option
+   for _, f := range files {
+   if processedFiles[f] {
+   continue
+   }
+   baseDir := filepath.Dir(f)
+   content, err := loadData(f, false)
+   if err != nil {
+   return nil, nil, errors.Wrapf(err, "cannot read file 
%s", f)
+   }
+   ops, err := modeline.Parse(f, content)
+   if err != nil {
+   return nil, nil, errors.Wrapf(err, "cannot process file 
%s", f)
+   }
+   for i, o := range ops {
+   if fileOptions[o.Name] && !isRemoteHTTPFile(f) {
+   refPath := o.Value
+   if !filepath.IsAbs(refPath) {
+   full := path.Join(baseDir, refPath)
+   o.Value = full
+   ops[i] = o
+   }
+   }
+   }
+   opts = append(opts, ops...)
+   }
+   // 

[camel-k] branch master updated (44b9c51 -> 4b5f215)

[nferraro]

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

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


from 44b9c51  information to update the homebrew formula
 new 7a9b7f8  Fix #1449: add support for modeline options
 new d5e7502  Fix #1449: fix help command and logs
 new fd1646a  Fix #1449: document modeline and CLI
 new 000595f  Fix #1171: fix error in ready condition from replicaset
 new f0e7385  Fix #1449: fix lint and typos
 new 4b5f215  Fix #1449: add e2e check on help option

The 6 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:
 cmd/kamel/main.go |   3 +-
 docs/modules/ROOT/nav-end.adoc|   2 -
 docs/modules/ROOT/nav.adoc|   4 +
 docs/modules/ROOT/pages/cli/cli.adoc  |  54 +++
 docs/modules/ROOT/pages/cli/modeline.adoc |  98 +++
 e2e/common/offline_commands_test.go   |   6 ++
 pkg/cmd/modeline.go   | 148 +
 pkg/cmd/modeline_test.go  | 132 ++
 pkg/cmd/run.go|  14 ++-
 pkg/util/kubernetes/conditions.go |   4 +-
 pkg/util/modeline/parser.go   |  84 
 pkg/util/modeline/parser_test.go  | 153 ++
 pkg/util/modeline/types.go|   7 ++
 13 files changed, 699 insertions(+), 10 deletions(-)
 create mode 100644 docs/modules/ROOT/pages/cli/cli.adoc
 create mode 100644 docs/modules/ROOT/pages/cli/modeline.adoc
 create mode 100644 pkg/cmd/modeline.go
 create mode 100644 pkg/cmd/modeline_test.go
 create mode 100644 pkg/util/modeline/parser.go
 create mode 100644 pkg/util/modeline/parser_test.go
 create mode 100644 pkg/util/modeline/types.go

[camel-kafka-connector] branch master updated (1a65e00 -> 9cb3266)

[valdar]

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

valdar pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.


from 1a65e00  Merge pull request #204 from valdar/flakeyTests
 add 3a7cfe1  Bump to Camel 3.2.0
 new 9cb3266  Merge pull request #206 from apache/camel-3.2.0

The 1 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:
 connectors/camel-activemq-kafka-connector/pom.xml  |  12 +
 .../docs/camel-activemq-kafka-sink-connector.adoc  |  29 +-
 .../camel-activemq-kafka-source-connector.adoc |  25 +-
 .../activemq/CamelActivemqSinkConnectorConfig.java |  68 +++--
 .../CamelActivemqSourceConnectorConfig.java|  68 +++--
 connectors/camel-ahc-kafka-connector/pom.xml   |  12 +
 connectors/camel-ahc-ws-kafka-connector/pom.xml|  12 +
 connectors/camel-ahc-wss-kafka-connector/pom.xml   |  12 +
 connectors/camel-amqp-kafka-connector/pom.xml  |  12 +
 .../main/docs/camel-amqp-kafka-sink-connector.adoc |  29 +-
 .../docs/camel-amqp-kafka-source-connector.adoc|  25 +-
 .../amqp/CamelAmqpSinkConnectorConfig.java |  68 +++--
 .../amqp/CamelAmqpSourceConnectorConfig.java   |  68 +++--
 connectors/camel-apns-kafka-connector/pom.xml  |  12 +
 .../docs/camel-apns-kafka-source-connector.adoc|   4 +-
 .../apns/CamelApnsSourceConnectorConfig.java   |   4 +-
 connectors/camel-as2-kafka-connector/pom.xml   |  12 +
 .../docs/camel-as2-kafka-source-connector.adoc |   4 +-
 .../as2/CamelAs2SourceConnectorConfig.java |   4 +-
 connectors/camel-asterisk-kafka-connector/pom.xml  |  12 +
 connectors/camel-atmos-kafka-connector/pom.xml |  12 +
 .../pom.xml|  12 +
 connectors/camel-atom-kafka-connector/pom.xml  |  12 +
 .../docs/camel-atom-kafka-source-connector.adoc|   4 +-
 .../atom/CamelAtomSourceConnectorConfig.java   |   4 +-
 .../camel-atomix-map-kafka-connector/pom.xml   |  12 +
 .../camel-atomix-map-kafka-sink-connector.adoc |  15 +-
 .../camel-atomix-map-kafka-source-connector.adoc   |  15 +-
 .../CamelAtomixmapSinkConnectorConfig.java |  46 +++-
 .../CamelAtomixmapSourceConnectorConfig.java   |  46 +++-
 .../camel-atomix-messaging-kafka-connector/pom.xml |  12 +
 ...amel-atomix-messaging-kafka-sink-connector.adoc |  16 +-
 ...el-atomix-messaging-kafka-source-connector.adoc |  16 +-
 .../CamelAtomixmessagingSinkConnectorConfig.java   |  50 +++-
 .../CamelAtomixmessagingSourceConnectorConfig.java |  50 +++-
 .../camel-atomix-multimap-kafka-connector/pom.xml  |  12 +
 ...camel-atomix-multimap-kafka-sink-connector.adoc |  15 +-
 .../CamelAtomixmultimapSinkConnectorConfig.java|  46 +++-
 .../camel-atomix-queue-kafka-connector/pom.xml |  12 +
 .../camel-atomix-queue-kafka-sink-connector.adoc   |  13 +-
 .../camel-atomix-queue-kafka-source-connector.adoc |  13 +-
 .../CamelAtomixqueueSinkConnectorConfig.java   |  38 ++-
 .../CamelAtomixqueueSourceConnectorConfig.java |  38 ++-
 .../camel-atomix-set-kafka-connector/pom.xml   |  12 +
 .../camel-atomix-set-kafka-sink-connector.adoc |  14 +-
 .../camel-atomix-set-kafka-source-connector.adoc   |  14 +-
 .../CamelAtomixsetSinkConnectorConfig.java |  42 ++-
 .../CamelAtomixsetSourceConnectorConfig.java   |  42 ++-
 .../camel-atomix-value-kafka-connector/pom.xml |  12 +
 .../camel-atomix-value-kafka-sink-connector.adoc   |  14 +-
 .../camel-atomix-value-kafka-source-connector.adoc |  14 +-
 .../CamelAtomixvalueSinkConnectorConfig.java   |  42 ++-
 .../CamelAtomixvalueSourceConnectorConfig.java |  42 ++-
 connectors/camel-avro-kafka-connector/pom.xml  |  12 +
 .../main/docs/camel-avro-kafka-sink-connector.adoc |   8 +-
 .../docs/camel-avro-kafka-source-connector.adoc|   8 +-
 .../avro/CamelAvroSinkConnectorConfig.java |  24 ++
 .../avro/CamelAvroSourceConnectorConfig.java   |  24 ++
 connectors/camel-aws-cw-kafka-connector/pom.xml|  12 +
 .../docs/camel-aws-cw-kafka-sink-connector.adoc|  18 +-
 .../awscw/CamelAwscwSinkConnectorConfig.java   |  58 +++-
 connectors/camel-aws-ddb-kafka-connector/pom.xml   |  12 +
 .../docs/camel-aws-ddb-kafka-sink-connector.adoc   |  18 +-
 .../awsddb/CamelAwsddbSinkConnectorConfig.java |  64 -
 .../camel-aws-ddbstream-kafka-connector/pom.xml|  12 +
 ...camel-aws-ddbstream-kafka-source-connector.adoc |  21 +-
 .../CamelAwsddbstreamSourceConnectorConfig.java|  58 ++--
 connectors/camel-aws-ec2-kafka-connector/pom.xml   |  12 +
 .../docs/camel-aws-ec2-kafka-sink-connector.adoc   |  13 +-
 .../awsec2/CamelAwsec2SinkConnectorConfig.java |  32 ++-
 connectors/camel-aws-ecs-kafka-connector/pom.xml   |  12 +
 

[camel-kafka-connector] 01/01: Merge pull request #206 from apache/camel-3.2.0

[valdar]

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

valdar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git

commit 9cb3266625c9b75c177992129dbc52686b8c3620
Merge: 1a65e00 3a7cfe1
Author: Andrea Tarocchi 
AuthorDate: Mon May 11 14:53:02 2020 +0200

Merge pull request #206 from apache/camel-3.2.0

 connectors/camel-activemq-kafka-connector/pom.xml  |  12 +
 .../docs/camel-activemq-kafka-sink-connector.adoc  |  29 +-
 .../camel-activemq-kafka-source-connector.adoc |  25 +-
 .../activemq/CamelActivemqSinkConnectorConfig.java |  68 +++--
 .../CamelActivemqSourceConnectorConfig.java|  68 +++--
 connectors/camel-ahc-kafka-connector/pom.xml   |  12 +
 connectors/camel-ahc-ws-kafka-connector/pom.xml|  12 +
 connectors/camel-ahc-wss-kafka-connector/pom.xml   |  12 +
 connectors/camel-amqp-kafka-connector/pom.xml  |  12 +
 .../main/docs/camel-amqp-kafka-sink-connector.adoc |  29 +-
 .../docs/camel-amqp-kafka-source-connector.adoc|  25 +-
 .../amqp/CamelAmqpSinkConnectorConfig.java |  68 +++--
 .../amqp/CamelAmqpSourceConnectorConfig.java   |  68 +++--
 connectors/camel-apns-kafka-connector/pom.xml  |  12 +
 .../docs/camel-apns-kafka-source-connector.adoc|   4 +-
 .../apns/CamelApnsSourceConnectorConfig.java   |   4 +-
 connectors/camel-as2-kafka-connector/pom.xml   |  12 +
 .../docs/camel-as2-kafka-source-connector.adoc |   4 +-
 .../as2/CamelAs2SourceConnectorConfig.java |   4 +-
 connectors/camel-asterisk-kafka-connector/pom.xml  |  12 +
 connectors/camel-atmos-kafka-connector/pom.xml |  12 +
 .../pom.xml|  12 +
 connectors/camel-atom-kafka-connector/pom.xml  |  12 +
 .../docs/camel-atom-kafka-source-connector.adoc|   4 +-
 .../atom/CamelAtomSourceConnectorConfig.java   |   4 +-
 .../camel-atomix-map-kafka-connector/pom.xml   |  12 +
 .../camel-atomix-map-kafka-sink-connector.adoc |  15 +-
 .../camel-atomix-map-kafka-source-connector.adoc   |  15 +-
 .../CamelAtomixmapSinkConnectorConfig.java |  46 +++-
 .../CamelAtomixmapSourceConnectorConfig.java   |  46 +++-
 .../camel-atomix-messaging-kafka-connector/pom.xml |  12 +
 ...amel-atomix-messaging-kafka-sink-connector.adoc |  16 +-
 ...el-atomix-messaging-kafka-source-connector.adoc |  16 +-
 .../CamelAtomixmessagingSinkConnectorConfig.java   |  50 +++-
 .../CamelAtomixmessagingSourceConnectorConfig.java |  50 +++-
 .../camel-atomix-multimap-kafka-connector/pom.xml  |  12 +
 ...camel-atomix-multimap-kafka-sink-connector.adoc |  15 +-
 .../CamelAtomixmultimapSinkConnectorConfig.java|  46 +++-
 .../camel-atomix-queue-kafka-connector/pom.xml |  12 +
 .../camel-atomix-queue-kafka-sink-connector.adoc   |  13 +-
 .../camel-atomix-queue-kafka-source-connector.adoc |  13 +-
 .../CamelAtomixqueueSinkConnectorConfig.java   |  38 ++-
 .../CamelAtomixqueueSourceConnectorConfig.java |  38 ++-
 .../camel-atomix-set-kafka-connector/pom.xml   |  12 +
 .../camel-atomix-set-kafka-sink-connector.adoc |  14 +-
 .../camel-atomix-set-kafka-source-connector.adoc   |  14 +-
 .../CamelAtomixsetSinkConnectorConfig.java |  42 ++-
 .../CamelAtomixsetSourceConnectorConfig.java   |  42 ++-
 .../camel-atomix-value-kafka-connector/pom.xml |  12 +
 .../camel-atomix-value-kafka-sink-connector.adoc   |  14 +-
 .../camel-atomix-value-kafka-source-connector.adoc |  14 +-
 .../CamelAtomixvalueSinkConnectorConfig.java   |  42 ++-
 .../CamelAtomixvalueSourceConnectorConfig.java |  42 ++-
 connectors/camel-avro-kafka-connector/pom.xml  |  12 +
 .../main/docs/camel-avro-kafka-sink-connector.adoc |   8 +-
 .../docs/camel-avro-kafka-source-connector.adoc|   8 +-
 .../avro/CamelAvroSinkConnectorConfig.java |  24 ++
 .../avro/CamelAvroSourceConnectorConfig.java   |  24 ++
 connectors/camel-aws-cw-kafka-connector/pom.xml|  12 +
 .../docs/camel-aws-cw-kafka-sink-connector.adoc|  18 +-
 .../awscw/CamelAwscwSinkConnectorConfig.java   |  58 +++-
 connectors/camel-aws-ddb-kafka-connector/pom.xml   |  12 +
 .../docs/camel-aws-ddb-kafka-sink-connector.adoc   |  18 +-
 .../awsddb/CamelAwsddbSinkConnectorConfig.java |  64 -
 .../camel-aws-ddbstream-kafka-connector/pom.xml|  12 +
 ...camel-aws-ddbstream-kafka-source-connector.adoc |  21 +-
 .../CamelAwsddbstreamSourceConnectorConfig.java|  58 ++--
 connectors/camel-aws-ec2-kafka-connector/pom.xml   |  12 +
 .../docs/camel-aws-ec2-kafka-sink-connector.adoc   |  13 +-
 .../awsec2/CamelAwsec2SinkConnectorConfig.java |  32 ++-
 connectors/camel-aws-ecs-kafka-connector/pom.xml   |  12 +
 .../docs/camel-aws-ecs-kafka-sink-connector.adoc   |  11 +-
 .../awsecs/CamelAwsecsSinkConnectorConfig.java |  30 ++-
 connectors/camel-aws-eks-kafka-connector/pom.xml   |  12 +
 .../docs/camel-aws-eks-kafka-sink-connector.adoc   |  11 +-
 

[GitHub] [camel-kafka-connector] oscerd commented on pull request #206: Bump to Camel 3.2.0

[GitBox]

oscerd commented on pull request #206:
URL: 
https://github.com/apache/camel-kafka-connector/pull/206#issuecomment-626680075


   > Do we know which connectors we need to remove that are not present in 
camel 3.2.0 anymore?
   
   camel-eventadmin (OSGi related, moved to camel-karaf)
   camel-paxlogging (OSgi related, moved to camel-karaf)
   camel-spark-rest (removed in 3.2.0)
   
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-kafka-connector] oscerd edited a comment on pull request #206: Bump to Camel 3.2.0

[GitBox]

oscerd edited a comment on pull request #206:
URL: 
https://github.com/apache/camel-kafka-connector/pull/206#issuecomment-626680075


   > Do we know which connectors we need to remove that are not present in 
camel 3.2.0 anymore?
   
   camel-eventadmin (OSGi related, moved to camel-karaf)
   camel-paxlogging (OSgi related, moved to camel-karaf)
   camel-spark-rest (removed in 3.2.0)
   
   
   they are already removed with this PR



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-kafka-connector] oscerd commented on a change in pull request #206: Bump to Camel 3.2.0

[GitBox]

oscerd commented on a change in pull request #206:
URL: 
https://github.com/apache/camel-kafka-connector/pull/206#discussion_r423012526



##
File path: connectors/camel-activemq-kafka-connector/pom.xml
##
@@ -118,6 +118,18 @@
 true
   
 
+

Review comment:
   This repo seems to be needed from 3.2.0 ahead, because of weka and 
camel-ipfs





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-quarkus] aldettinger commented on issue #1206: Kudu IT failing

[GitBox]

aldettinger commented on issue #1206:
URL: https://github.com/apache/camel-quarkus/issues/1206#issuecomment-626678958


   @lburgazzoli I don't have much details, but let me share my findings.
   
   From the logs of a non-working configuration you've shared above, the first 
meaningful difference is that line:
   `client connection to 192.168.96.2:7051: connect: No route to host (error 
113)`
   It means that from the 2 containers involved in this test, the tablet server 
one is not able to communicate with the master one.
   
   In a working configuration however the communication between containers is 
working. This is the purpose of the shared org.testcontainers.container.Network 
instance in the `KuduTestResource` class. From there, I was not able to find 
anything meaningful.
   
   I'm happy to investigate if you have anything to share.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-kafka-connector] valdar commented on a change in pull request #206: Bump to Camel 3.2.0

[GitBox]

valdar commented on a change in pull request #206:
URL: 
https://github.com/apache/camel-kafka-connector/pull/206#discussion_r423010041



##
File path: connectors/camel-activemq-kafka-connector/pom.xml
##
@@ -118,6 +118,18 @@
 true
   
 
+

Review comment:
   I this repo not needed anymore with camel 3.2.0 or it wasn't ever needed?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-kafka-connector] valdar commented on pull request #205: Improved CamelSourceTaskTest

[GitBox]

valdar commented on pull request #205:
URL: 
https://github.com/apache/camel-kafka-connector/pull/205#issuecomment-626675912


   @fvaleri the amount of time spared is largely due to the fact that now 100 
messages are sent instead of 999. I agree that at present 100 should do since 
in 1 millisecond is unlikely that all of them will be consumed even on a faster 
machine than ours (we don't know what future will hold though :) )



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-kafka-connector] valdar commented on a change in pull request #205: Improved CamelSourceTaskTest

[GitBox]

valdar commented on a change in pull request #205:
URL: 
https://github.com/apache/camel-kafka-connector/pull/205#discussion_r423005983



##
File path: 
core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
##
@@ -32,270 +31,239 @@
 
 public class CamelSourceTaskTest {
 
+private static final String DIRECT_URI = "direct:start";
+private static final String TOPIC_NAME = "my-topic";
+
+private void sendBatchOfRecords(CamelSourceTask sourceTask, long size) {
+final ProducerTemplate template = 
sourceTask.getCms().createProducerTemplate();
+for (int i = 0; i < size; i++) {
+template.sendBody(DIRECT_URI, "test" + i);
+}
+}
+
 @Test
 public void testSourcePolling() {
+final long size = 2;
 Map props = new HashMap<>();
-props.put("camel.source.url", "direct:start");
-props.put("topics", "mytopic");
+props.put(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME);
+props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, 
DIRECT_URI);
 
-CamelSourceTask camelSourceTask = new CamelSourceTask();
-camelSourceTask.start(props);
+CamelSourceTask sourceTask = new CamelSourceTask();
+sourceTask.start(props);
 
-final ProducerTemplate template = 
camelSourceTask.getCms().createProducerTemplate();
-template.sendBody("direct:start", "awesome!");
+sendBatchOfRecords(sourceTask, size);
+List poll = sourceTask.poll();
 
-List poll = 
camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertEquals("mytopic", poll.get(0).topic());
+assertEquals(size, poll.size());
+assertEquals(TOPIC_NAME, poll.get(0).topic());
 
-camelSourceTask.stop();
+sourceTask.stop();
 }
 
 @Test
-public void testSourcePollingWithKey() {
+public void testSourcePollingMaxBatchPollSize() {
+final long size = 2;
 Map props = new HashMap<>();
-props.put("camel.source.url", "direct:start");
-props.put("topics", "mytopic");
-
props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_MESSAGE_HEADER_KEY_CONF, 
"CamelSpecialTestKey");
-
-CamelSourceTask camelSourceTask = new CamelSourceTask();
-camelSourceTask.start(props);
-
-final ProducerTemplate template = 
camelSourceTask.getCms().createProducerTemplate();
+props.put(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME);
+props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, 
DIRECT_URI);
+
props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_MAX_BATCH_POLL_SIZE_CONF, 
String.valueOf(size));
 
-// first we test if we have a key in the message with body
-template.sendBodyAndHeader("direct:start", "awesome!", 
"CamelSpecialTestKey", 1234);
+CamelSourceTask sourceTask = new CamelSourceTask();
+sourceTask.start(props);
 
-List poll = 
camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertEquals(1234, poll.get(0).key());
-assertEquals(Schema.Type.INT32, poll.get(0).keySchema().type());
+sendBatchOfRecords(sourceTask, size + 1);
+List poll = sourceTask.poll();
+int pollSize = poll.size();
 
-// second we test if we have no key under the header
-template.sendBodyAndHeader("direct:start", "awesome!", "WrongHeader", 
1234);
-
-poll = camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertNull(poll.get(0).key());
-assertNull(poll.get(0).keySchema());
-
-// third we test if we have the header but with null value
-template.sendBodyAndHeader("direct:start", "awesome!", 
"CamelSpecialTestKey", null);
-
-poll = camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertNull(poll.get(0).key());
-assertNull(poll.get(0).keySchema());
-
-camelSourceTask.stop();
-}
-
-@Test
-public void testSourcePollingWithBody() {
-Map props = new HashMap<>();
-props.put("camel.source.url", "direct:start");
-props.put("topics", "mytopic");
-
-CamelSourceTask camelSourceTask = new CamelSourceTask();
-camelSourceTask.start(props);
-
-final ProducerTemplate template = 
camelSourceTask.getCms().createProducerTemplate();
-
-// send first data
-template.sendBody("direct:start", "testing kafka connect");
-
-List poll = 
camelSourceTaskPollWithRetries(camelSourceTask, 5);
-assertEquals(1, poll.size());
-assertEquals("testing kafka connect", poll.get(0).value());
-assertEquals(Schema.Type.STRING, poll.get(0).valueSchema().type());
-assertNull(poll.get(0).key());
-assertNull(poll.get(0).keySchema());
-
-// send second data
-

[camel] 01/02: Upgrade Atmosphere Websocket to version 2.5.15

[acosentino]

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.git

commit 21a8764de926c5fb713499957c5ce69feac31724
Author: Andrea Cosentino 
AuthorDate: Mon May 11 13:52:58 2020 +0200

Upgrade Atmosphere Websocket to version 2.5.15
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 5851b22..171394b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -66,7 +66,7 @@
 1.0.0-final
 3.0.0
 3.1.0
-2.5.13
+2.5.15
 [2.5,3.0)
 1.0.8
 1.2.1

[camel] 02/02: Sync Properties

[acosentino]

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.git

commit d78b86e2ebf30573af3d2f1c92dff55d22c94f1b
Author: Andrea Cosentino 
AuthorDate: Mon May 11 13:53:40 2020 +0200

Sync Properties
---
 camel-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0dd29bc..740adc2 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -58,7 +58,7 @@
 1.0.0-final
 3.0.0
 3.1.0
-2.5.13
+2.5.15
 [2.5,3.0)
 1.2.1
 1.0.8

[camel] branch master updated (b644aa0 -> d78b86e)

[acosentino]

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.git.


from b644aa0  CAMEL-15036: Make it easier to switch to use supervising 
route controller in XML DSL
 new 21a8764  Upgrade Atmosphere Websocket to version 2.5.15
 new d78b86e  Sync Properties

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:
 camel-dependencies/pom.xml | 2 +-
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[camel] branch master updated: CAMEL-15036: Make it easier to switch to use supervising route controller in XML DSL

[davsclaus]

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

davsclaus 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 b644aa0  CAMEL-15036: Make it easier to switch to use supervising 
route controller in XML DSL
b644aa0 is described below

commit b644aa0de2f494656f52209f63ca5923d665c70c
Author: Claus Ibsen 
AuthorDate: Mon May 11 14:10:52 2020 +0200

CAMEL-15036: Make it easier to switch to use supervising route controller 
in XML DSL
---
 .../modules/ROOT/pages/graceful-shutdown.adoc   |  6 ++
 .../modules/ROOT/pages/route-controller.adoc| 21 +
 2 files changed, 27 insertions(+)

diff --git a/docs/user-manual/modules/ROOT/pages/graceful-shutdown.adoc 
b/docs/user-manual/modules/ROOT/pages/graceful-shutdown.adoc
index 37e6f87..72a4a2e 100644
--- a/docs/user-manual/modules/ROOT/pages/graceful-shutdown.adoc
+++ b/docs/user-manual/modules/ROOT/pages/graceful-shutdown.adoc
@@ -415,3 +415,9 @@ xref:batch-consumer.adoc[Batch Consumer] should implement
 `ShutdownAware` so they properly support the `ShutdownRunningTask`
 option. See `GenericFileConsumer` for an example.
 
+
+== See Also
+
+When Camel is starting up, then its xref:route-controller.adoc[Route 
Controller]
+that handles this to ensure all the routes are started with support for 
managing
+troublesome routes with restaring.
diff --git a/docs/user-manual/modules/ROOT/pages/route-controller.adoc 
b/docs/user-manual/modules/ROOT/pages/route-controller.adoc
index 34c0c92..c04fe98 100644
--- a/docs/user-manual/modules/ROOT/pages/route-controller.adoc
+++ b/docs/user-manual/modules/ROOT/pages/route-controller.adoc
@@ -71,6 +71,8 @@ from("salesforce:cheese")
 Then we can tell Camel to use the supervising route controller to let Camel 
attempt to
 recover starting the salesforce route.
 
+Enabling and configuring supervising route controller from Java:
+
 [source,java]
 -
 CamelContext camel = ...
@@ -108,6 +110,25 @@ camel.springboot.routeControllerInitialDelay = 1000
 camel.springboot.routeControllerThreadPoolSize = 2
 
 
+And for users with XML DSL in Spring or OSGi Blueprint, you can do as follows:
+
+[source,xml]
+
+
+
+
+  
+  
+
+
+  
+  
+
+
+
+
 === Supervising Options
 
 You can configure the `SupervisingRouteController` using the following options:

[camel-karaf] branch master updated: CAMEL-15036: Make it easier to switch to use supervising route controller in XML DSL

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 55e02ea  CAMEL-15036: Make it easier to switch to use supervising 
route controller in XML DSL
55e02ea is described below

commit 55e02ea4d6aa4f80ac1d747cb444ca71ba1d7333
Author: Claus Ibsen 
AuthorDate: Mon May 11 14:05:44 2020 +0200

CAMEL-15036: Make it easier to switch to use supervising route controller 
in XML DSL
---
 .../camel/blueprint/CamelContextFactoryBean.java   |  12 +++
 .../blueprint/SupervisingRouteControllerTest.java  | 116 +
 .../BlueprintSupervisingRouteControllerTest.xml|  50 +
 3 files changed, 178 insertions(+)

diff --git 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index bd6fb2e..4ae7856 100644
--- 
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++ 
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -45,6 +45,7 @@ import 
org.apache.camel.core.xml.AbstractCamelContextFactoryBean;
 import org.apache.camel.core.xml.AbstractCamelFactoryBean;
 import org.apache.camel.core.xml.CamelJMXAgentDefinition;
 import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
+import org.apache.camel.core.xml.CamelRouteControllerDefinition;
 import org.apache.camel.core.xml.CamelServiceExporterDefinition;
 import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
 import org.apache.camel.model.ContextScanDefinition;
@@ -166,6 +167,8 @@ public class CamelContextFactoryBean extends 
AbstractCamelContextFactoryBean> getBeansFactory() {
 return beansFactory;
 }
diff --git 
a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SupervisingRouteControllerTest.java
 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SupervisingRouteControllerTest.java
new file mode 100644
index 000..b00f300
--- /dev/null
+++ 
b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/SupervisingRouteControllerTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.test.blueprint;
+
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Processor;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.seda.SedaComponent;
+import org.apache.camel.component.seda.SedaConsumer;
+import org.apache.camel.component.seda.SedaEndpoint;
+import org.apache.camel.spi.SupervisingRouteController;
+import org.junit.Test;
+
+public class SupervisingRouteControllerTest extends CamelBlueprintTestSupport {
+
+@Override
+protected String getBlueprintDescriptor() {
+return 
"org/apache/camel/test/blueprint/BlueprintSupervisingRouteControllerTest.xml";
+}
+
+@Test
+public void testSupervising() throws Exception {
+MockEndpoint mock = context.getEndpoint("mock:foo", 
MockEndpoint.class);
+mock.expectedMinimumMessageCount(3);
+
+MockEndpoint mock2 = context.getEndpoint("mock:cheese", 
MockEndpoint.class);
+mock2.expectedMessageCount(0);
+
+MockEndpoint mock3 = context.getEndpoint("mock:cake", 
MockEndpoint.class);
+mock3.expectedMessageCount(0);
+
+MockEndpoint mock4 = context.getEndpoint("mock:bar", 
MockEndpoint.class);
+mock4.expectedMessageCount(0);
+
+MockEndpoint.assertIsSatisfied(5, TimeUnit.SECONDS, mock, mock2, 
mock3, mock4);
+
+assertEquals("Started", 
context.getRouteController().getRouteStatus("foo").toString());
+// cheese was not able to start
+assertEquals("Stopped", 
context.getRouteController().getRouteStatus("cheese").toString());
+// cake was not able to start
+assertEquals("Stopped", 

[camel] branch master updated: CAMEL-15036: Make it easier to switch to use supervising route controller in XML DSL

[davsclaus]

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

davsclaus 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 3da7391  CAMEL-15036: Make it easier to switch to use supervising 
route controller in XML DSL
3da7391 is described below

commit 3da7391444e79f806e14097c1a134a8460346e0b
Author: Claus Ibsen 
AuthorDate: Mon May 11 14:00:02 2020 +0200

CAMEL-15036: Make it easier to switch to use supervising route controller 
in XML DSL
---
 .../camel/cdi/xml/CamelContextFactoryBean.java |  13 ++
 .../org/apache/camel/spring/camelContext.json  |   1 +
 .../camel/spring/CamelContextFactoryBean.java  |  12 ++
 .../spring/handler/CamelNamespaceHandler.java  |   3 +
 .../impl/SpringSupervisingRouteControllerTest.java |  85 ++---
 .../impl/SpringSupervisingRouteControllerTest.xml  |  50 ++
 .../engine/DefaultSupervisingRouteController.java  |  15 +-
 .../resources/org/apache/camel/core/xml/jaxb.index |   1 +
 .../org/apache/camel/core/xml/routeController.json |  26 +++
 .../core/xml/AbstractCamelContextFactoryBean.java  |  70 +++-
 .../core/xml/CamelRouteControllerDefinition.java   | 197 +
 .../DefaultSupervisingRouteControllerTest.java |   1 -
 12 files changed, 387 insertions(+), 87 deletions(-)

diff --git 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
index 18d5c88..4827132 100644
--- 
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
+++ 
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
@@ -41,6 +41,7 @@ import org.apache.camel.core.xml.AbstractCamelFactoryBean;
 import org.apache.camel.core.xml.CamelJMXAgentDefinition;
 import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
 import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
+import org.apache.camel.core.xml.CamelRouteControllerDefinition;
 import org.apache.camel.core.xml.CamelServiceExporterDefinition;
 import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
 import org.apache.camel.impl.DefaultCamelContext;
@@ -177,6 +178,9 @@ public class CamelContextFactoryBean extends 
AbstractCamelContextFactoryBean>",
 "oneOf": [ "consumerTemplate", "fluentTemplate", "template" ], "deprecated": 
false, "secret": false, "description": "Miscellaneous configurations" },
 "beans": { "kind": "element", "displayName": "Beans", "required": true, 
"type": "array", "javaType": "java.util.List", "oneOf": [ 
"errorHandler", "export", "proxy" ], "deprecated": false, "secret": false, 
"description": "Miscellaneous configurations" },
 "defaultServiceCallConfiguration": { "kind": "element", "displayName": 
"Default Service Call Configuration", "required": false, "type": "object", 
"javaType": "org.apache.camel.model.cloud.ServiceCallConfigurationDefinition", 
"deprecated": false, "secret": false, "description": "ServiceCall EIP default 
configuration" },
diff --git 
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
 
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index 99bdc6e..f556e73 100644
--- 
a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ 
b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -42,6 +42,7 @@ import org.apache.camel.core.xml.AbstractCamelFactoryBean;
 import org.apache.camel.core.xml.CamelJMXAgentDefinition;
 import org.apache.camel.core.xml.CamelPropertyPlaceholderDefinition;
 import org.apache.camel.core.xml.CamelProxyFactoryDefinition;
+import org.apache.camel.core.xml.CamelRouteControllerDefinition;
 import org.apache.camel.core.xml.CamelServiceExporterDefinition;
 import org.apache.camel.core.xml.CamelStreamCachingStrategyDefinition;
 import org.apache.camel.model.ContextScanDefinition;
@@ -173,6 +174,8 @@ public class CamelContextFactoryBean extends 
AbstractCamelContextFactoryBean parameters) throws Exception {
@@ -141,7 +80,7 @@ public class DefaultSupervisingRouteControllerTest extends 
ContextTestSupport {
 }
 }
 
-private class MyJmsEndpoint extends SedaEndpoint {
+public static  class MyJmsEndpoint extends SedaEndpoint {
 
 private String name;
 
@@ -161,7 +100,7 @@ public class DefaultSupervisingRouteControllerTest extends 
ContextTestSupport {
 }
 }
 
-private class MyJmsConsumer extends SedaConsumer {
+public static  class MyJmsConsumer extends SedaConsumer {
 
 private int counter;
 
diff --git 
a/components/camel-spring/src/test/resources/org/apache/camel/spring/impl/SpringSupervisingRouteControllerTest.xml
 

[GitHub] [camel-quarkus] lburgazzoli commented on issue #1206: Kudu IT failing

[GitBox]

lburgazzoli commented on issue #1206:
URL: https://github.com/apache/camel-quarkus/issues/1206#issuecomment-626659655


   @aldettinger do you have some details ?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-quarkus] aldettinger commented on issue #1206: Kudu IT failing

[GitBox]

aldettinger commented on issue #1206:
URL: https://github.com/apache/camel-quarkus/issues/1206#issuecomment-626657872


   I've disabled Kudu itests as testcontainer is not able to bridge master and 
tablet server container on some platforms/configurations.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-quarkus] galderz commented on issue #1166: Unresolved type Base64 in camel-jira native test

[GitBox]

galderz commented on issue #1166:
URL: https://github.com/apache/camel-quarkus/issues/1166#issuecomment-626639437


   Somehow things have changed for Camel Jira native tests. They're now skipped 
unless you start a JIRA instance (e.g. docker) and set the right env variables. 
Can't find a CI run that would show an example so maybe Camel Jira native tests 
are not run? Discussion 
[here](https://quarkusio.zulipchat.com/#narrow/stream/187038-dev/topic/Camel.20jira.20native.20tests.20not.20running.3F).



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel] 02/02: Sync Properties

[acosentino]

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.git

commit 698c447ce8b40faf33ee050520cc7f54db0c8661
Author: Andrea Cosentino 
AuthorDate: Mon May 11 12:19:05 2020 +0200

Sync Properties
---
 camel-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index dcfdde6..0dd29bc 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -36,7 +36,7 @@
 2.12.0
 5.15.12
 1.0.2.v20150114
-2.11.0
+2.12.1
 4.1.1.4
 2.3
 1.17.0

[camel] 01/02: Upgrade Async Http Client to version 2.12.1

[acosentino]

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.git

commit 35f60d1c99a9206cb4836e70f208c42c5ab733a0
Author: Andrea Cosentino 
AuthorDate: Mon May 11 11:41:02 2020 +0200

Upgrade Async Http Client to version 2.12.1
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 366199f..5851b22 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -45,7 +45,7 @@
 5.15.12
 2.12.0
 1.0.2.v20150114
-2.11.0
+2.12.1
 4.1.1.4
 2.0.0.AM25
 2.3

[camel] branch master updated (6ae7f24 -> 698c447)

[acosentino]

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.git.


from 6ae7f24  CAMEL-15036: Make it easier to switch to use supervising 
route controller.
 new 35f60d1  Upgrade Async Http Client to version 2.12.1
 new 698c447  Sync Properties

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:
 camel-dependencies/pom.xml | 2 +-
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[camel-spring-boot] branch master updated: CAMEL-15036: Make it easier to switch to use supervising route controller.

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 4e8158a  CAMEL-15036: Make it easier to switch to use supervising 
route controller.
4e8158a is described below

commit 4e8158a8cb7d3b7d315af7bd8dac8c5c704ab0b3
Author: Claus Ibsen 
AuthorDate: Mon May 11 12:51:47 2020 +0200

CAMEL-15036: Make it easier to switch to use supervising route controller.
---
 .../src/main/resources/application.properties   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties
 
b/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties
index 0c1c000..ab64699 100644
--- 
a/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties
+++ 
b/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties
@@ -37,7 +37,7 @@ management.endpoint.camelroutes.read-only = false
 
 camel.springboot.name = SampleSupervisingRouteController
 
-camel.springboot.routeControllerEnabled = true
+camel.springboot.routeControllerSuperviseEnabled = true
 camel.springboot.routeControllerInitialDelay = 5000
 camel.springboot.routeControllerBackoffDelay = 5000
 camel.springboot.routeControllerBackoffMaxAttempts = 10

[camel] branch master updated: CAMEL-15036: Make it easier to switch to use supervising route controller.

[davsclaus]

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

davsclaus 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 6ae7f24  CAMEL-15036: Make it easier to switch to use supervising 
route controller.
6ae7f24 is described below

commit 6ae7f243fa529c5382a18b1d1a0e597cd81d8349
Author: Claus Ibsen 
AuthorDate: Mon May 11 12:37:43 2020 +0200

CAMEL-15036: Make it easier to switch to use supervising route controller.
---
 .../org/apache/camel/ExtendedCamelContext.java | 11 ---
 .../java/org/apache/camel/spi/RouteController.java | 15 +
 .../camel/impl/engine/AbstractCamelContext.java| 32 ++-
 .../camel/impl/engine/DefaultRouteController.java  | 19 
 .../camel/impl/engine/SimpleCamelContext.java  |  6 
 .../camel/impl/ExtendedCamelContextConfigurer.java |  5 ---
 .../camel/impl/lw/LightweightCamelContext.java | 10 --
 .../impl/lw/LightweightRuntimeCamelContext.java| 36 ++
 .../DefaultSupervisingRouteControllerTest.java |  8 ++---
 .../camel/main/DefaultConfigurationConfigurer.java |  5 +--
 .../modules/ROOT/pages/route-controller.adoc   | 30 +++---
 11 files changed, 91 insertions(+), 86 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java 
b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 0546459..ca9bd29 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -56,7 +56,6 @@ import org.apache.camel.spi.Registry;
 import org.apache.camel.spi.RestBindingJaxbDataFormatFactory;
 import org.apache.camel.spi.RouteController;
 import org.apache.camel.spi.RouteStartupOrder;
-import org.apache.camel.spi.SupervisingRouteController;
 import org.apache.camel.spi.UnitOfWorkFactory;
 import org.apache.camel.spi.XMLRoutesDefinitionLoader;
 
@@ -556,16 +555,6 @@ public interface ExtendedCamelContext extends CamelContext 
{
 void setConfigurerResolver(ConfigurerResolver configurerResolver);
 
 /**
- * Gets the {@link SupervisingRouteController} to use.
- */
-SupervisingRouteController getSupervisingRouteController();
-
-/**
- * Sets the {@link SupervisingRouteController} to use.
- */
-void setSupervisingRouteController(SupervisingRouteController 
supervisingRouteController);
-
-/**
  * Internal {@link RouteController} that are only used internally by Camel 
to
  * perform basic route operations. Do not use this as end user.
  */
diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java 
b/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java
index 126620b..862b816 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java
@@ -30,6 +30,21 @@ import org.apache.camel.StaticService;
 public interface RouteController extends CamelContextAware, StaticService {
 
 /**
+ * Enables supervising {@link RouteController}.
+ */
+SupervisingRouteController supervising();
+
+/**
+ * Adapts this {@link org.apache.camel.spi.RouteController} to the 
specialized type.
+ * 
+ * For example to adapt to SupervisingRouteController.
+ *
+ * @param type the type to adapt to
+ * @return this {@link org.apache.camel.CamelContext} adapted to the given 
type
+ */
+ T adapt(Class type);
+
+/**
  * Return the list of routes controlled by this controller.
  *
  * @return the list of controlled routes
diff --git 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index c175ae3..94b799f 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -26,7 +26,6 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -53,7 +52,6 @@ import org.apache.camel.Endpoint;
 import org.apache.camel.ErrorHandlerFactory;
 import org.apache.camel.ExchangeConstantProvider;
 import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.ExtendedStartupListener;
 import org.apache.camel.FailedToStartRouteException;
 import org.apache.camel.FluentProducerTemplate;
 import org.apache.camel.GlobalEndpointConfiguration;
@@ -277,7 +275,6 @@ public abstract class AbstractCamelContext extends 
BaseService
 private volatile UuidGenerator uuidGenerator;
 

[camel-spring-boot] branch master updated: CAMEL-15036: Make it easier to switch to use supervising route controller.

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 2ac74fc  CAMEL-15036: Make it easier to switch to use supervising 
route controller.
2ac74fc is described below

commit 2ac74fc017c513913bc27e527ac36ac0c3eee7c1
Author: Claus Ibsen 
AuthorDate: Mon May 11 12:47:52 2020 +0200

CAMEL-15036: Make it easier to switch to use supervising route controller.
---
 .../camel/spring/boot/SupervisingRouteControllerRestartTest.java   | 7 +++
 .../apache/camel/spring/boot/SupervisingRouteControllerTest.java   | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
index 46e3c90..0737e22 100644
--- 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
+++ 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.spring.boot;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.SupervisingRouteController;
@@ -62,10 +61,10 @@ public class SupervisingRouteControllerRestartTest {
 Assert.assertNotNull(context.getRouteController());
 Assert.assertTrue(context.getRouteController() instanceof 
SupervisingRouteController);
 
-SupervisingRouteController controller = 
context.adapt(ExtendedCamelContext.class).getSupervisingRouteController();
+SupervisingRouteController controller = 
context.getRouteController().adapt(SupervisingRouteController.class);
 
 // Wait for the controller to start the routes
-await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
+await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
 Assert.assertEquals(ServiceStatus.Started, 
context.getRouteController().getRouteStatus("foo"));
 Assert.assertEquals(ServiceStatus.Started, 
context.getRouteController().getRouteStatus("bar"));
 Assert.assertEquals(ServiceStatus.Started, 
context.getRouteController().getRouteStatus("dummy"));
@@ -83,7 +82,7 @@ public class SupervisingRouteControllerRestartTest {
 }
 
 // Wait for wile to give time to the controller to start the route
-await().atMost(2, TimeUnit.SECONDS).untilAsserted(() -> {
+await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {
 // now its suspended by the policy
 Assert.assertEquals(ServiceStatus.Started, 
context.getRouteController().getRouteStatus("dummy"));
 
Assert.assertNotNull(context.getRoute("dummy").getRouteController());
diff --git 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
index f358772..38594ed 100644
--- 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
+++ 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.spring.boot;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.SupervisingRouteController;
@@ -62,7 +61,7 @@ public class SupervisingRouteControllerTest {
 Assert.assertNotNull(context.getRouteController());
 Assert.assertTrue(context.getRouteController() instanceof 
SupervisingRouteController);
 
-SupervisingRouteController controller = 
context.adapt(ExtendedCamelContext.class).getSupervisingRouteController();
+SupervisingRouteController controller = 
context.getRouteController().adapt(SupervisingRouteController.class);
 
 // Wait for the controller to start the routes
 await().atMost(5, TimeUnit.SECONDS).untilAsserted(() -> {

[camel-quarkus] branch master updated: Disabled Kudu itests as testcontainer is not able to bridge master and tablet server container on some platforms/configurations fixes #1026

[aldettinger]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 4994632  Disabled Kudu itests as testcontainer is not able to bridge 
master and tablet server container on some platforms/configurations fixes #1026
4994632 is described below

commit 49946324d4c2864077d70564f8fb75d07dd4171b
Author: aldettinger 
AuthorDate: Mon May 11 12:28:12 2020 +0200

Disabled Kudu itests as testcontainer is not able to bridge master and 
tablet server container on some platforms/configurations fixes #1026
---
 .../kudu/it/KuduInfrastructureTestHelper.java | 19 +--
 .../camel/quarkus/component/kudu/it/KuduIT.java   |  5 ++---
 .../camel/quarkus/component/kudu/it/KuduTest.java |  7 ++-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git 
a/integration-tests/kudu/src/main/java/org/apache/camel/quarkus/component/kudu/it/KuduInfrastructureTestHelper.java
 
b/integration-tests/kudu/src/main/java/org/apache/camel/quarkus/component/kudu/it/KuduInfrastructureTestHelper.java
index 7ebaef0..95650a7 100644
--- 
a/integration-tests/kudu/src/main/java/org/apache/camel/quarkus/component/kudu/it/KuduInfrastructureTestHelper.java
+++ 
b/integration-tests/kudu/src/main/java/org/apache/camel/quarkus/component/kudu/it/KuduInfrastructureTestHelper.java
@@ -37,23 +37,22 @@ import org.jboss.logging.Logger;
  * {@code KuduTestResource}.
  *
  * A) How to run integration tests against a custom setup:
- * Comment @EnabledIfSystemProperty annotations from {@code KuduTest} and 
{@code KuduIT}.
+ * Comment @Disabled and @DisabledOnNativeImage annotations from {@code 
KuduTest} and {@code KuduIT}.
  * Install Kudu master and tablet servers on the same network than integration 
tests.
  * Configure "camel.kudu.test.master.rpc-authority" in 
"application.properties", for instance:
  * camel.kudu.test.master.rpc-authority=kudu-master-hostname:7051
  * Run integration tests with mvn clean integration-test -P native
  *
- * B) How to run integration tests against the container based setup when NOT 
running on top of OpenJDK:
- * Comment @EnabledIfSystemProperty annotations from {@code KuduTest} and 
{@code KuduIT}.
- * Override the ip resolution of the host "kudu-tserver" to 127.0.0.1, e.g. by 
adding an entry in /etc/hosts file as
- * below:
+ * B) How to run integration tests against the container based setup:
+ * Comment @Disabled and @DisabledOnNativeImage annotations from {@code 
KuduTest} and {@code KuduIT}.
+ * When NOT running on top of OpenJDK 9+, you'll need to manually override the 
ip resolution of the host "kudu-tserver"
+ * to 127.0.0.1, e.g. by adding an entry in /etc/hosts file as below:
  * 127.0.0.1 kudu-tserver
  * Run integration tests with mvn clean integration-test -P native
- *
- * C) How to run integration tests against the container based setup when 
running on top of OpenJDK 9 onward:
- * No extra setup is needed as {@code overrideTabletServerHostnameResolution} 
takes care of redirecting
- * the Kudu tablet server traffic toward localhost.
- * Run integration tests with mvn clean integration-test -P native
+ * Note that under some platforms/configurations, testcontainers is not able 
to bridge master and tablet servers in a
+ * shared network.
+ * In such cases, a log like "0 tablet servers are alive" could be issued and 
falling back to a custom local setup is
+ * advised.
  */
 @ApplicationScoped
 public class KuduInfrastructureTestHelper {
diff --git 
a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java
 
b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java
index 8bf9fad..8f5be00 100644
--- 
a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java
+++ 
b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduIT.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.quarkus.component.kudu.it;
 
+import io.quarkus.test.junit.DisabledOnNativeImage;
 import io.quarkus.test.junit.NativeImageTest;
-import org.junit.jupiter.api.condition.DisabledOnJre;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-import org.junit.jupiter.api.condition.JRE;
 
 @NativeImageTest
 @EnabledIfSystemProperty(named = "java.runtime.name", matches = ".*OpenJDK.*")
-@DisabledOnJre(JRE.JAVA_8)
+@DisabledOnNativeImage
 class KuduIT extends KuduTest {
 
 }
diff --git 
a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java
 
b/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java
index 068d39a..18dc9a8 100644
--- 
a/integration-tests/kudu/src/test/java/org/apache/camel/quarkus/component/kudu/it/KuduTest.java
+++ 

[camel-spring-boot] branch master updated: CAMEL-15036: Make it easier to use supervising route controller

[davsclaus]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 8c3d250  CAMEL-15036: Make it easier to use supervising route 
controller
8c3d250 is described below

commit 8c3d25090df6d20e68a544d5b701dfd43a96d8e2
Author: Claus Ibsen 
AuthorDate: Mon May 11 11:56:53 2020 +0200

CAMEL-15036: Make it easier to use supervising route controller
---
 .../org/apache/camel/spring/boot/CamelConfigurationProperties.java   | 2 +-
 .../camel/spring/boot/SupervisingRouteControllerRestartTest.java | 5 +++--
 .../org/apache/camel/spring/boot/SupervisingRouteControllerTest.java | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git 
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index 3afa5f1..5539875 100644
--- 
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++ 
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -530,7 +530,7 @@ public class CamelConfigurationProperties extends 
DefaultConfigurationProperties
  * using a background thread. The controller allows to be configured with 
various
  * settings to attempt to restart failing routes.
  */
-boolean routeControllerEnabled;
+boolean routeControllerSuperviseEnabled;
 
 /**
  * The number of threads used by the route controller scheduled thread 
pool that are used for restarting
diff --git 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
index c0a6399..46e3c90 100644
--- 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
+++ 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.boot;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.SupervisingRouteController;
@@ -45,7 +46,7 @@ import static org.awaitility.Awaitility.await;
 properties = {
 "camel.springboot.xml-routes = false",
 "camel.springboot.main-run-controller = true",
-"camel.springboot.routeControllerEnabled = true",
+"camel.springboot.routeControllerSuperviseEnabled = true",
 "camel.springboot.routeControllerInitialDelay = 500",
 "camel.springboot.routeControllerBackoffDelay = 1000",
 "camel.springboot.routeControllerBackoffMaxAttempts = 5",
@@ -61,7 +62,7 @@ public class SupervisingRouteControllerRestartTest {
 Assert.assertNotNull(context.getRouteController());
 Assert.assertTrue(context.getRouteController() instanceof 
SupervisingRouteController);
 
-SupervisingRouteController controller = 
context.getRouteController().unwrap(SupervisingRouteController.class);
+SupervisingRouteController controller = 
context.adapt(ExtendedCamelContext.class).getSupervisingRouteController();
 
 // Wait for the controller to start the routes
 await().atMost(3, TimeUnit.SECONDS).untilAsserted(() -> {
diff --git 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
index b48c18a..f358772 100644
--- 
a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
+++ 
b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.spring.boot;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.ExtendedCamelContext;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.spi.SupervisingRouteController;
@@ -46,7 +47,7 @@ import static org.awaitility.Awaitility.await;
 "camel.springboot.xml-routes = false",
 "camel.springboot.xml-rests = false",
 "camel.springboot.main-run-controller = true",
-"camel.springboot.routeControllerEnabled = true",
+"camel.springboot.routeControllerSuperviseEnabled = true",
 "camel.springboot.routeControllerInitialDelay = 500",
 "camel.springboot.routeControllerBackoffDelay = 1000",
 

[camel] branch master updated: CAMEL-15036: Make it easier to use supervising route controller

[davsclaus]

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

davsclaus 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 71edd74  CAMEL-15036: Make it easier to use supervising route 
controller
71edd74 is described below

commit 71edd74b22d7cbcf706b2b8017175b78528033d4
Author: Claus Ibsen 
AuthorDate: Mon May 11 11:45:26 2020 +0200

CAMEL-15036: Make it easier to use supervising route controller
---
 .../camel/main/MainConfigurationPropertiesConfigurer.java | 11 ++-
 .../resources/META-INF/camel-main-configuration-metadata.json |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git 
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
 
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index fb8125f..810f174 100644
--- 
a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
+++ 
b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
@@ -7,6 +7,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
+import org.apache.camel.main.MainConfigurationProperties;
 
 /**
  * Generated by camel build tools - do NOT edit this file!
@@ -114,14 +115,14 @@ public class MainConfigurationPropertiesConfigurer 
extends org.apache.camel.supp
 case "RouteControllerBackOffMaxElapsedTime": 
target.setRouteControllerBackOffMaxElapsedTime(property(camelContext, 
long.class, value)); return true;
 case "routecontrollerbackoffmultiplier":
 case "RouteControllerBackOffMultiplier": 
target.setRouteControllerBackOffMultiplier(property(camelContext, double.class, 
value)); return true;
-case "routecontrollerenabled":
-case "RouteControllerEnabled": 
target.setRouteControllerSuperviseEnabled(property(camelContext, boolean.class, 
value)); return true;
 case "routecontrollerexcluderoutes":
 case "RouteControllerExcludeRoutes": 
target.setRouteControllerExcludeRoutes(property(camelContext, 
java.lang.String.class, value)); return true;
 case "routecontrollerincluderoutes":
 case "RouteControllerIncludeRoutes": 
target.setRouteControllerIncludeRoutes(property(camelContext, 
java.lang.String.class, value)); return true;
 case "routecontrollerinitialdelay":
 case "RouteControllerInitialDelay": 
target.setRouteControllerInitialDelay(property(camelContext, long.class, 
value)); return true;
+case "routecontrollersuperviseenabled":
+case "RouteControllerSuperviseEnabled": 
target.setRouteControllerSuperviseEnabled(property(camelContext, boolean.class, 
value)); return true;
 case "routecontrollerthreadpoolsize":
 case "RouteControllerThreadPoolSize": 
target.setRouteControllerThreadPoolSize(property(camelContext, int.class, 
value)); return true;
 case "routefilterexcludepattern":
@@ -235,10 +236,10 @@ public class MainConfigurationPropertiesConfigurer 
extends org.apache.camel.supp
 answer.put("RouteControllerBackOffMaxDelay", long.class);
 answer.put("RouteControllerBackOffMaxElapsedTime", long.class);
 answer.put("RouteControllerBackOffMultiplier", double.class);
-answer.put("RouteControllerEnabled", boolean.class);
 answer.put("RouteControllerExcludeRoutes", java.lang.String.class);
 answer.put("RouteControllerIncludeRoutes", java.lang.String.class);
 answer.put("RouteControllerInitialDelay", long.class);
+answer.put("RouteControllerSuperviseEnabled", boolean.class);
 answer.put("RouteControllerThreadPoolSize", int.class);
 answer.put("RouteFilterExcludePattern", java.lang.String.class);
 answer.put("RouteFilterIncludePattern", java.lang.String.class);
@@ -371,14 +372,14 @@ public class MainConfigurationPropertiesConfigurer 
extends org.apache.camel.supp
 case "RouteControllerBackOffMaxElapsedTime": return 
target.getRouteControllerBackOffMaxElapsedTime();
 case "routecontrollerbackoffmultiplier":
 case "RouteControllerBackOffMultiplier": return 
target.getRouteControllerBackOffMultiplier();
-case "routecontrollerenabled":
-case "RouteControllerEnabled": return 
target.isRouteControllerSuperviseEnabled();
 case "routecontrollerexcluderoutes":
 case "RouteControllerExcludeRoutes": return 
target.getRouteControllerExcludeRoutes();
 case "routecontrollerincluderoutes":
 case "RouteControllerIncludeRoutes": return 
target.getRouteControllerIncludeRoutes();
 case "routecontrollerinitialdelay":
 case "RouteControllerInitialDelay": return 

[camel] 02/02: Sync Properties

[acosentino]

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.git

commit cc351cb546e9e52b4b48025806ebe5bb99cf8ad6
Author: Andrea Cosentino 
AuthorDate: Mon May 11 11:39:10 2020 +0200

Sync Properties
---
 camel-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index f311d55..dcfdde6 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -69,7 +69,7 @@
 4.0.2
 1.11.22
 1.11.714
-2.13.12
+2.13.13
 2.4.0
 1.2.14
 
12.6.0

[camel] branch master updated (e5c5044 -> cc351cb)

[acosentino]

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.git.


from e5c5044  CAMEL-15036: Make it easier to use supervising route 
controller
 new 19ffdbc  Upgrade AWS SDK v2 to version 2.13.13
 new cc351cb  Sync Properties

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:
 camel-dependencies/pom.xml | 2 +-
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[camel] 01/02: Upgrade AWS SDK v2 to version 2.13.13

[acosentino]

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.git

commit 19ffdbca544aa6e1c183dc63e772538fa7a89b93
Author: Andrea Cosentino 
AuthorDate: Mon May 11 11:37:48 2020 +0200

Upgrade AWS SDK v2 to version 2.13.13
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index e928791..366199f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -76,7 +76,7 @@
 1.9.1
 4.0.2
 1.11.714
-2.13.12
+2.13.13
 1.11.22
 2.4.0
 1.2.14

[camel] branch master updated: CAMEL-15036: Make it easier to use supervising route controller

[davsclaus]

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

davsclaus 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 e5c5044  CAMEL-15036: Make it easier to use supervising route 
controller
e5c5044 is described below

commit e5c50448a1f59a37383224e5113abd110cf7e496
Author: Claus Ibsen 
AuthorDate: Mon May 11 11:35:37 2020 +0200

CAMEL-15036: Make it easier to use supervising route controller
---
 .../java/org/apache/camel/spi/RouteController.java |  15 --
 .../engine/DefaultSupervisingRouteController.java  |   3 +-
 .../DefaultSupervisingRouteControllerTest.java | 182 +
 .../MainConfigurationPropertiesConfigurer.java |   5 +-
 .../camel/main/DefaultConfigurationConfigurer.java |   4 +-
 .../camel/main/DefaultConfigurationProperties.java |  25 ++-
 ...gRouteControllerFilterFailToStartRouteTest.java |   2 +-
 .../main/MainSupervisingRouteControllerTest.java   |  65 ++--
 8 files changed, 261 insertions(+), 40 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java 
b/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java
index 4ef114f..126620b 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RouteController.java
@@ -145,19 +145,4 @@ public interface RouteController extends 
CamelContextAware, StaticService {
  */
 void resumeRoute(String routeId) throws Exception;
 
-/**
- * Access the underlying concrete RouteController implementation.
- *
- * @param clazz the proprietary class or interface of the underlying 
concrete RouteController.
- * @return an instance of the underlying concrete RouteController as the 
required type.
- */
-default  T unwrap(Class clazz) {
-if (RouteController.class.isAssignableFrom(clazz)) {
-return clazz.cast(this);
-}
-
-throw new IllegalArgumentException(
-"Unable to unwrap this RouteController type (" + getClass() + ") 
to the required type (" + clazz + ")"
-);
-}
 }
diff --git 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
index 948cd5f..b62219f 100644
--- 
a/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
+++ 
b/core/camel-base/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
@@ -478,6 +478,7 @@ public class DefaultSupervisingRouteController extends 
DefaultRouteController im
 try {
 logger.info("Restarting route: {} attempt: {}", 
r.getId(), attempt);
 doStartRoute(r, false, rx -> 
DefaultSupervisingRouteController.super.startRoute(rx.getId()));
+logger.info("Route: {} started after {} attempts", 
r.getId(), attempt);
 return false;
 } catch (Exception e) {
 exceptions.put(r.getId(), e);
@@ -520,7 +521,7 @@ public class DefaultSupervisingRouteController extends 
DefaultRouteController im
 exceptions.remove(route.getId());
 BackOffTimer.Task task = routes.remove(route);
 if (task != null) {
-LOG.info("Cancel restart task for route {}", route.getId());
+LOG.info("Cancelling restart task for route: {}", 
route.getId());
 task.cancel();
 }
 
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
new file mode 100644
index 000..9cc9820
--- /dev/null
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/engine/DefaultSupervisingRouteControllerTest.java
@@ -0,0 +1,182 @@
+/*
+ * 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 

[GitHub] [camel-kafka-connector] fvaleri commented on a change in pull request #205: Improved CamelSourceTaskTest

[GitBox]

fvaleri commented on a change in pull request #205:
URL: 
https://github.com/apache/camel-kafka-connector/pull/205#discussion_r422904391



##
File path: 
core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
##
@@ -32,270 +31,239 @@
 
 public class CamelSourceTaskTest {
 
+private static final String DIRECT_URI = "direct:start";
+private static final String TOPIC_NAME = "my-topic";
+
+private void sendBatchOfRecords(CamelSourceTask sourceTask, long size) {
+final ProducerTemplate template = 
sourceTask.getCms().createProducerTemplate();
+for (int i = 0; i < size; i++) {
+template.sendBody(DIRECT_URI, "test" + i);
+}
+}
+
 @Test
 public void testSourcePolling() {
+final long size = 2;
 Map props = new HashMap<>();
-props.put("camel.source.url", "direct:start");
-props.put("topics", "mytopic");
+props.put(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME);
+props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, 
DIRECT_URI);
 
-CamelSourceTask camelSourceTask = new CamelSourceTask();
-camelSourceTask.start(props);
+CamelSourceTask sourceTask = new CamelSourceTask();

Review comment:
   It's part of the refactoring, we have only CamelSourceTask, so it's 
redundant.





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-kafka-connector] oscerd commented on a change in pull request #205: Improved CamelSourceTaskTest

[GitBox]

oscerd commented on a change in pull request #205:
URL: 
https://github.com/apache/camel-kafka-connector/pull/205#discussion_r422902443



##
File path: 
core/src/test/java/org/apache/camel/kafkaconnector/CamelSourceTaskTest.java
##
@@ -32,270 +31,239 @@
 
 public class CamelSourceTaskTest {
 
+private static final String DIRECT_URI = "direct:start";
+private static final String TOPIC_NAME = "my-topic";
+
+private void sendBatchOfRecords(CamelSourceTask sourceTask, long size) {
+final ProducerTemplate template = 
sourceTask.getCms().createProducerTemplate();
+for (int i = 0; i < size; i++) {
+template.sendBody(DIRECT_URI, "test" + i);
+}
+}
+
 @Test
 public void testSourcePolling() {
+final long size = 2;
 Map props = new HashMap<>();
-props.put("camel.source.url", "direct:start");
-props.put("topics", "mytopic");
+props.put(CamelSourceConnectorConfig.TOPIC_CONF, TOPIC_NAME);
+props.put(CamelSourceConnectorConfig.CAMEL_SOURCE_URL_CONF, 
DIRECT_URI);
 
-CamelSourceTask camelSourceTask = new CamelSourceTask();
-camelSourceTask.start(props);
+CamelSourceTask sourceTask = new CamelSourceTask();

Review comment:
   Is there a particular reason to change variable names?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-kafka-connector] oscerd opened a new pull request #206: Bump to Camel 3.2.0

[GitBox]

oscerd opened a new pull request #206:
URL: https://github.com/apache/camel-kafka-connector/pull/206


   Fixes #199 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel-kafka-connector] branch camel-3.2.0 created (now 3a7cfe1)

[acosentino]

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

acosentino pushed a change to branch camel-3.2.0
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.


  at 3a7cfe1  Bump to Camel 3.2.0

This branch includes the following new commits:

 new 3a7cfe1  Bump to Camel 3.2.0

The 1 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.

[GitHub] [camel-kafka-connector] fvaleri commented on pull request #205: Improved CamelSourceTaskTest

[GitBox]

fvaleri commented on pull request #205:
URL: 
https://github.com/apache/camel-kafka-connector/pull/205#issuecomment-626569307


   Yes, let me fix `testSourcePollingTimeout` and push force.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel-quarkus] branch master updated: Move integration-tests support modules out of integration-tests folder

[lburgazzoli]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new a76dc0d  Move integration-tests support modules out of 
integration-tests folder
a76dc0d is described below

commit a76dc0d052361d9d9dfc14acae6e574d5fc18773
Author: lburgazzoli 
AuthorDate: Mon May 11 08:55:00 2020 +0200

Move integration-tests support modules out of integration-tests folder
---
 .../core-main-collector/deployment/pom.xml| 0
 .../apache/camel/quarkus/core/runtime/support/deployment/Feature.java | 0
 .../quarkus/core/runtime/support/deployment/SupportBuildStep.java | 0
 .../support => integration-tests-support}/core-main-collector/pom.xml | 2 +-
 .../core-main-collector/runtime/pom.xml   | 0
 .../apache/camel/quarkus/core/runtime/support/SupportRecorder.java| 0
 .../camel/quarkus/core/runtime/support/SupportRoutesCollector.java| 0
 .../core-main/deployment/pom.xml  | 0
 .../apache/camel/quarkus/core/runtime/support/deployment/Feature.java | 0
 .../quarkus/core/runtime/support/deployment/SupportBuildStep.java | 0
 .../support => integration-tests-support}/core-main/pom.xml   | 2 +-
 .../support => integration-tests-support}/core-main/runtime/pom.xml   | 0
 .../java/org/apache/camel/quarkus/core/runtime/support/MyPair.java| 0
 .../apache/camel/quarkus/core/runtime/support/SupportListener.java| 0
 .../apache/camel/quarkus/core/runtime/support/SupportRecorder.java| 0
 .../quarkus/core/runtime/support/SupportTypeConverterLoader.java  | 0
 .../support => integration-tests-support}/core/deployment/pom.xml | 0
 .../org/apache/camel/quarkus/core/support/deployment/Feature.java | 0
 .../camel/quarkus/core/support/deployment/SupportBuildStep.java   | 0
 {integration-tests/support => integration-tests-support}/core/pom.xml | 2 +-
 .../support => integration-tests-support}/core/runtime/pom.xml| 0
 .../java/org/apache/camel/quarkus/core/support/SupportRecorder.java   | 0
 .../support => integration-tests-support}/custom-dataformat/pom.xml   | 2 +-
 .../org/apache/camel/quarkus/it/support/dataformat/MyDataformat.java  | 0
 .../META-INF/services/org/apache/camel/dataformat/my-dataformat   | 0
 {integration-tests/support => integration-tests-support}/pom.xml  | 4 ++--
 .../support => integration-tests-support}/test-support/pom.xml| 2 +-
 .../main/java/org/apache/camel/quarkus/test/AvailablePortFinder.java  | 0
 .../src/main/java/org/apache/camel/quarkus/test/Conditions.java   | 0
 .../src/main/java/org/apache/camel/quarkus/test/EnabledIf.java| 0
 .../main/java/org/apache/camel/quarkus/test/EnabledIfCondition.java   | 0
 .../main/java/org/apache/camel/quarkus/test/EnabledIfProperty.java| 0
 .../org/apache/camel/quarkus/test/EnabledIfPropertyCondition.java | 0
 .../main/java/org/apache/camel/quarkus/test/TrustStoreResource.java   | 0
 .../testcontainers-support/pom.xml| 2 +-
 .../quarkus/testcontainers/ContainerResourceLifecycleManager.java | 0
 .../org/apache/camel/quarkus/testcontainers/ContainerSupport.java | 0
 .../src/main/resources/testcontainers.properties  | 0
 integration-tests/pom.xml | 1 -
 pom.xml   | 1 +
 40 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/integration-tests/support/core-main-collector/deployment/pom.xml 
b/integration-tests-support/core-main-collector/deployment/pom.xml
similarity index 100%
rename from integration-tests/support/core-main-collector/deployment/pom.xml
rename to integration-tests-support/core-main-collector/deployment/pom.xml
diff --git 
a/integration-tests/support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
 
b/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
similarity index 100%
rename from 
integration-tests/support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
rename to 
integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
diff --git 
a/integration-tests/support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
 
b/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
similarity index 100%
rename from 

[camel] branch master updated: CAMEL-15035: SupervisingRouteController - JMX management

[davsclaus]

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

davsclaus 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 34c028e  CAMEL-15035: SupervisingRouteController - JMX management
34c028e is described below

commit 34c028e1e514bffe246740e98eda321488c754a3
Author: Claus Ibsen 
AuthorDate: Mon May 11 10:52:20 2020 +0200

CAMEL-15035: SupervisingRouteController - JMX management
---
 .../src/main/java/org/apache/camel/Route.java  |  6 ++
 .../camel/spi/ManagementObjectNameStrategy.java|  2 +-
 .../apache/camel/spi/ManagementObjectStrategy.java |  2 +-
 .../camel/spi/SupervisingRouteController.java  | 17 
 .../camel/impl/engine/DefaultRouteController.java  | 12 ++-
 .../engine/DefaultSupervisingRouteController.java  | 21 -
 .../main/MainSupervisingRouteControllerTest.java   |  8 ++
 .../api/management/mbean/CamelOpenMBeanTypes.java  | 13 +++
 .../mbean/ManagedRouteControllerMBean.java |  2 +-
 .../mbean/ManagedRuntimeEndpointRegistryMBean.java |  4 +-
 .../ManagedSupervisingRouteControllerMBean.java| 13 ++-
 .../DefaultManagementObjectNameStrategy.java   | 11 ++-
 .../DefaultManagementObjectStrategy.java   | 12 ++-
 .../management/JmxManagementLifecycleStrategy.java | 15 ++--
 .../management/mbean/ManagedRouteController.java   | 22 ++---
 .../mbean/ManagedSupervisingRouteController.java   | 95 ++
 .../ManagedSupervisingRouteControllerTest.java | 14 ++--
 .../apache/camel/util/backoff/BackOffTimer.java|  5 ++
 .../camel/util/backoff/BackOffTimerTask.java   | 13 +++
 .../camel/util/backoff/BackOffTimerTest.java   | 11 ++-
 20 files changed, 257 insertions(+), 41 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/Route.java 
b/core/camel-api/src/main/java/org/apache/camel/Route.java
index 13586e6..ae4f818 100644
--- a/core/camel-api/src/main/java/org/apache/camel/Route.java
+++ b/core/camel-api/src/main/java/org/apache/camel/Route.java
@@ -180,8 +180,14 @@ public interface Route extends RuntimeConfiguration {
  */
 void setLastError(RouteError error);
 
+/**
+ * Gets the route startup order
+ */
 Integer getStartupOrder();
 
+/**
+ * Sets the route startup order
+ */
 void setStartupOrder(Integer startupOrder);
 
 /**
diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
index 1656ff8..e6ccdd08 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectNameStrategy.java
@@ -46,7 +46,7 @@ public interface ManagementObjectNameStrategy {
 
 ObjectName getObjectNameForCamelContext(CamelContext context) throws 
MalformedObjectNameException;
 
-ObjectName getObjectNameForRouteController(CamelContext context) throws 
MalformedObjectNameException;
+ObjectName getObjectNameForRouteController(CamelContext context, 
RouteController controller) throws MalformedObjectNameException;
 
 ObjectName getObjectNameForComponent(Component component, String name) 
throws MalformedObjectNameException;
 
diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
index 9649519..b906d13 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/ManagementObjectStrategy.java
@@ -48,7 +48,7 @@ public interface ManagementObjectStrategy {
 Object getManagedObjectForErrorHandler(CamelContext context, Route route,
Processor errorHandler, 
ErrorHandlerFactory errorHandlerBuilder);
 
-Object getManagedObjectForRouteController(CamelContext context);
+Object getManagedObjectForRouteController(CamelContext context, 
RouteController routeController);
 
 Object getManagedObjectForRoute(CamelContext context, Route route);
 
diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
index e0b6228..cb6e6e1 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
@@ -19,6 +19,7 @@ package org.apache.camel.spi;
 import java.util.Collection;
 
 import org.apache.camel.Route;
+import org.apache.camel.util.backoff.BackOffTimer;
 
 /**
  * A supervising capable {@link RouteController} that delays the startup
@@ -123,4 +124,20 @@ public interface SupervisingRouteController extends 
RouteController {
  */
   

[GitHub] [camel-quarkus] lburgazzoli commented on issue #1206: Kudu IT failing

[GitBox]

lburgazzoli commented on issue #1206:
URL: https://github.com/apache/camel-quarkus/issues/1206#issuecomment-626566490


   here the full log:
   
   [build.log](https://github.com/apache/camel-quarkus/files/4608531/build.log)
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-kafka-connector] fvaleri opened a new pull request #205: Improved CamelSourceTaskTest

[GitBox]

fvaleri opened a new pull request #205:
URL: https://github.com/apache/camel-kafka-connector/pull/205


   Merged last commit from @valdar with my previous refactoring. There is no 
sleep time and I have also removed timer delay option that adds about 30s delay 
or more. Now, on my machine, the whole suite runs consistently in about 8s vs 
38s of previous version.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel] branch master updated: Fixed CS in camel-management

[acosentino]

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.git


The following commit(s) were added to refs/heads/master by this push:
 new 1cb37c9  Fixed CS in camel-management
1cb37c9 is described below

commit 1cb37c9981f99b9e78640a4b6f2ef2e6e33db899
Author: Andrea Cosentino 
AuthorDate: Mon May 11 10:49:39 2020 +0200

Fixed CS in camel-management
---
 .../camel/management/ManagedSupervisingRouteControllerTest.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSupervisingRouteControllerTest.java
 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSupervisingRouteControllerTest.java
index 4b51a07..b218bc6 100644
--- 
a/core/camel-management/src/test/java/org/apache/camel/management/ManagedSupervisingRouteControllerTest.java
+++ 
b/core/camel-management/src/test/java/org/apache/camel/management/ManagedSupervisingRouteControllerTest.java
@@ -16,11 +16,12 @@
  */
 package org.apache.camel.management;
 
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Consumer;
 import org.apache.camel.Endpoint;

[camel] branch master updated: Added project.version to sync-properties-maven-plugin

[acosentino]

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.git


The following commit(s) were added to refs/heads/master by this push:
 new 58a4905  Added project.version to sync-properties-maven-plugin
58a4905 is described below

commit 58a490502289b14d231b59e6afec3b253a601d4d
Author: Andrea Cosentino 
AuthorDate: Mon May 11 10:40:01 2020 +0200

Added project.version to sync-properties-maven-plugin
---
 catalog/camel-catalog/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/catalog/camel-catalog/pom.xml b/catalog/camel-catalog/pom.xml
index a7a7056..ebda93d 100644
--- a/catalog/camel-catalog/pom.xml
+++ b/catalog/camel-catalog/pom.xml
@@ -134,6 +134,7 @@
 
 org.apache.camel
 sync-properties-maven-plugin
+${project.version}
 
 
 

[camel] 02/02: Sync Properties

[acosentino]

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.git

commit 7b5b0a009d0c0b65a11736a95e3f4e83c0c46efa
Author: Andrea Cosentino 
AuthorDate: Mon May 11 09:58:07 2020 +0200

Sync Properties
---
 camel-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index b2bc836..f311d55 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -428,7 +428,7 @@
 3.3.3
 0.1.8
 1.5.0
-4.0.1
+4.0.3
 2013.6.1
 0.9.6
 2.4.5.Final

[camel] branch master updated (db6ae5f -> 7b5b0a0)

[acosentino]

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.git.


from db6ae5f  Regen
 new 70ad46d  Upgrade Mongodb Java Driver to version 4.0.3
 new 7b5b0a0  Sync Properties

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:
 camel-dependencies/pom.xml | 2 +-
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[camel] 01/02: Upgrade Mongodb Java Driver to version 4.0.3

[acosentino]

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.git

commit 70ad46d42d1751a1ed9216529e8e295c17dad134
Author: Andrea Cosentino 
AuthorDate: Mon May 11 09:57:20 2020 +0200

Upgrade Mongodb Java Driver to version 4.0.3
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 6f236c7..e928791 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -412,7 +412,7 @@
 1.9
 0.1.8
 3.3.3
-4.0.1
+4.0.3
 1.5.0
 2013.6.1
 0.9.6

[GitHub] [camel-quarkus] aldettinger commented on issue #1206: Kudu IT failing

[GitBox]

aldettinger commented on issue #1206:
URL: https://github.com/apache/camel-quarkus/issues/1206#issuecomment-626556268


   @lburgazzoli, darn, I thought I got them ok as it was running on CI and my 
machine. Those Kudu itests are using a somewhat tricky testcontainer setup.
   
   `Not enough live tablet server` would indicate that the tablet server is not 
running, or that tablet and master containers are not able to communicate.
   
   Could you please attach full logs from the build ? Maybe, there is something 
simple, worst case I will disable them by default.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel-spring-boot] branch release/3.3.0 updated (c55dffb -> cbd562e)

[gzurowski]

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

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


from c55dffb  CAMEL-15034: SupervisingRouteController - Allow to easily 
filter routes
 new 3239712  Set Camel version to 3.3.0 for releasing
 new 922371d  Remove incorrect version tag pointing to Camel release
 new cbd562e  [maven-release-plugin] prepare release camel-spring-boot-3.3.0

The 3 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:
 catalog/camel-catalog-provider-springboot/pom.xml  |   2 +-
 catalog/pom.xml|   2 +-
 components-starter/camel-activemq-starter/pom.xml  |   2 +-
 components-starter/camel-ahc-starter/pom.xml   |   2 +-
 components-starter/camel-ahc-ws-starter/pom.xml|   2 +-
 components-starter/camel-amqp-starter/pom.xml  |   2 +-
 components-starter/camel-any23-starter/pom.xml |   2 +-
 components-starter/camel-apns-starter/pom.xml  |   2 +-
 components-starter/camel-as2-starter/pom.xml   |   2 +-
 components-starter/camel-asn1-starter/pom.xml  |   2 +-
 components-starter/camel-asterisk-starter/pom.xml  |   2 +-
 components-starter/camel-atmos-starter/pom.xml |   2 +-
 .../camel-atmosphere-websocket-starter/pom.xml |   2 +-
 components-starter/camel-atom-starter/pom.xml  |   2 +-
 components-starter/camel-atomix-starter/pom.xml|   2 +-
 components-starter/camel-avro-rpc-starter/pom.xml  |   2 +-
 components-starter/camel-avro-starter/pom.xml  |   2 +-
 components-starter/camel-aws-cw-starter/pom.xml|   2 +-
 components-starter/camel-aws-ddb-starter/pom.xml   |   2 +-
 components-starter/camel-aws-ec2-starter/pom.xml   |   2 +-
 components-starter/camel-aws-ecs-starter/pom.xml   |   2 +-
 components-starter/camel-aws-eks-starter/pom.xml   |   2 +-
 components-starter/camel-aws-iam-starter/pom.xml   |   2 +-
 .../camel-aws-kinesis-starter/pom.xml  |   2 +-
 components-starter/camel-aws-kms-starter/pom.xml   |   2 +-
 .../camel-aws-lambda-starter/pom.xml   |   2 +-
 components-starter/camel-aws-mq-starter/pom.xml|   2 +-
 components-starter/camel-aws-msk-starter/pom.xml   |   2 +-
 components-starter/camel-aws-s3-starter/pom.xml|   2 +-
 components-starter/camel-aws-sdb-starter/pom.xml   |   2 +-
 components-starter/camel-aws-ses-starter/pom.xml   |   2 +-
 components-starter/camel-aws-sns-starter/pom.xml   |   2 +-
 components-starter/camel-aws-sqs-starter/pom.xml   |   2 +-
 components-starter/camel-aws-swf-starter/pom.xml   |   2 +-
 .../camel-aws-translate-starter/pom.xml|   2 +-
 components-starter/camel-aws-xray-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-cw-starter/pom.xml   |   2 +-
 components-starter/camel-aws2-ddb-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-ec2-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-ecs-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-eks-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-iam-starter/pom.xml  |   2 +-
 .../camel-aws2-kinesis-starter/pom.xml |   2 +-
 components-starter/camel-aws2-kms-starter/pom.xml  |   2 +-
 .../camel-aws2-lambda-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-mq-starter/pom.xml   |   2 +-
 components-starter/camel-aws2-msk-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-s3-starter/pom.xml   |   2 +-
 components-starter/camel-aws2-ses-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-sns-starter/pom.xml  |   2 +-
 components-starter/camel-aws2-sqs-starter/pom.xml  |   2 +-
 .../camel-aws2-translate-starter/pom.xml   |   2 +-
 components-starter/camel-azure-starter/pom.xml |   2 +-
 .../camel-azure-storage-blob-starter/pom.xml   |   2 +-
 .../camel-azure-storage-queue-starter/pom.xml  |   2 +-
 components-starter/camel-barcode-starter/pom.xml   |   2 +-
 components-starter/camel-base64-starter/pom.xml|   2 +-
 components-starter/camel-bean-starter/pom.xml  |   2 +-
 .../camel-bean-validator-starter/pom.xml   |   2 +-
 components-starter/camel-beanio-starter/pom.xml|   2 +-
 components-starter/camel-beanstalk-starter/pom.xml |   2 +-
 components-starter/camel-bindy-starter/pom.xml |   2 +-
 components-starter/camel-bonita-starter/pom.xml|   2 +-
 components-starter/camel-box-starter/pom.xml   |   2 +-
 components-starter/camel-braintree-starter/pom.xml |   2 +-
 components-starter/camel-browse-starter/pom.xml|   2 +-
 components-starter/camel-caffeine-starter/pom.xml  |   2 +-
 .../camel-cassandraql-starter/pom.xml  |   2 +-
 components-starter/camel-cbor-starter/pom.xml  |   2 +-
 .../camel-chatscript-starter/pom.xml  

[camel-spring-boot] 02/03: Remove incorrect version tag pointing to Camel release

[gzurowski]

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

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

commit 922371ddec41a33b0b60b2fd4a4c2338e6e8bafd
Author: Gregor Zurowski 
AuthorDate: Mon May 11 00:39:45 2020 -0700

Remove incorrect version tag pointing to Camel release
---
 components-starter/camel-undertow-spring-security-starter/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components-starter/camel-undertow-spring-security-starter/pom.xml 
b/components-starter/camel-undertow-spring-security-starter/pom.xml
index 36e36f8..a18a9a3 100644
--- a/components-starter/camel-undertow-spring-security-starter/pom.xml
+++ b/components-starter/camel-undertow-spring-security-starter/pom.xml
@@ -42,7 +42,6 @@
 
   org.apache.camel.springboot
   camel-undertow-starter
-  ${camel-version}
 
 
   org.springframework.boot

[camel-spring-boot] annotated tag camel-spring-boot-3.3.0 created (now c7d878a)

[gzurowski]

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

gzurowski pushed a change to annotated tag camel-spring-boot-3.3.0
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.


  at c7d878a  (tag)
 tagging cbd562e40a76f275820444c59e6545e242689425 (commit)
  by Gregor Zurowski
  on Mon May 11 01:16:02 2020 -0700

- Log -
[maven-release-plugin]  copy for tag camel-spring-boot-3.3.0
---

No new revisions were added by this update.

[camel-spring-boot] 01/03: Set Camel version to 3.3.0 for releasing

[gzurowski]

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

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

commit 3239712f8913a588b8f14c7aea5fb07d56531bef
Author: Gregor Zurowski 
AuthorDate: Mon May 11 00:00:07 2020 -0700

Set Camel version to 3.3.0 for releasing
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73238e3..284e2ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 camel-dependencies
-3.3.0-SNAPSHOT
+3.3.0
 
 
 org.apache.camel.springboot
@@ -112,7 +112,7 @@
 2.2.7.RELEASE
 
 
-3.3.0-SNAPSHOT
+3.3.0
 
 
 1.0.2.v20150114
@@ -494,7 +494,7 @@
 
 dev
 
-3.3.0-SNAPSHOT
+3.3.0
 
 
 

[camel-spring-boot] branch master updated: Remove incorrect version tag pointing to Camel release

[gzurowski]

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

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


The following commit(s) were added to refs/heads/master by this push:
 new 98110fa  Remove incorrect version tag pointing to Camel release
98110fa is described below

commit 98110fa64bb868c189eb1b7057641244f17fddd2
Author: Gregor Zurowski 
AuthorDate: Mon May 11 00:39:45 2020 -0700

Remove incorrect version tag pointing to Camel release
---
 components-starter/camel-undertow-spring-security-starter/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components-starter/camel-undertow-spring-security-starter/pom.xml 
b/components-starter/camel-undertow-spring-security-starter/pom.xml
index 36e36f8..a18a9a3 100644
--- a/components-starter/camel-undertow-spring-security-starter/pom.xml
+++ b/components-starter/camel-undertow-spring-security-starter/pom.xml
@@ -42,7 +42,6 @@
 
   org.apache.camel.springboot
   camel-undertow-starter
-  ${camel-version}
 
 
   org.springframework.boot

[GitHub] [camel-quarkus] galderz commented on issue #1166: Unresolved type Base64 in camel-jira native test

[GitBox]

galderz commented on issue #1166:
URL: https://github.com/apache/camel-quarkus/issues/1166#issuecomment-626528906


   @claudio4j I'm trying to verify the fix, but have not yet managed to do so.
   
   Last week patched camel 3.2.x with the fix (see 
[branch](https://github.com/galderz/camel/tree/t_base64_32x)), but was unable 
to get to the test failure. I encountered 
https://github.com/quarkusio/quarkus/issues/9103 and @ppalaga's PR didn't work 
when I first tried it. I'm trying again now that @ppalaga has a new fix and 
he's rebased the branch.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel] branch master updated: Regen

[acosentino]

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.git


The following commit(s) were added to refs/heads/master by this push:
 new db6ae5f  Regen
db6ae5f is described below

commit db6ae5fba98af8326b7c5ab5a0ffa012d2730a50
Author: Andrea Cosentino 
AuthorDate: Mon May 11 09:08:03 2020 +0200

Regen
---
 camel-dependencies/pom.xml  | 2 +-
 docs/components/modules/ROOT/pages/disruptor-component.adoc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index c360088..b2bc836 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -17,7 +17,7 @@
 limitations under the License.
 
 -->
-http://maven.apache.org/POM/4.0.0 
https://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns="http://maven.apache.org/POM/4.0.0;
+http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd; 
xmlns="http://maven.apache.org/POM/4.0.0;
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
   4.0.0
   
diff --git a/docs/components/modules/ROOT/pages/disruptor-component.adoc 
b/docs/components/modules/ROOT/pages/disruptor-component.adoc
index 6863355..79e7b11 100644
--- a/docs/components/modules/ROOT/pages/disruptor-component.adoc
+++ b/docs/components/modules/ROOT/pages/disruptor-component.adoc
@@ -260,7 +260,7 @@ to the original caller.
 
 [source,java]
 -
-public void configure() throws Exception {
+public void configure() {
 from("direct:start")
 // send it to the disruptor that is async
 .to("disruptor:next")

[GitHub] [camel-quarkus] lburgazzoli commented on issue #1128: Revisit camel-quarkus bootstrap

[GitBox]

lburgazzoli commented on issue #1128:
URL: https://github.com/apache/camel-quarkus/issues/1128#issuecomment-626512952


   I'm workign on a big refactor :)



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-quarkus] zhfeng commented on issue #1128: Revisit camel-quarkus bootstrap

[GitBox]

zhfeng commented on issue #1128:
URL: https://github.com/apache/camel-quarkus/issues/1128#issuecomment-626511920


   @lburgazzoli is there any update on this issue ?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel-spring-boot] branch release/3.3.0 created (now c55dffb)

[gzurowski]

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

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


  at c55dffb  CAMEL-15034: SupervisingRouteController - Allow to easily 
filter routes

No new revisions were added by this update.

[camel-spring-boot] branch camel-spring-boot-3.3.x created (now c55dffb)

[gzurowski]

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

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


  at c55dffb  CAMEL-15034: SupervisingRouteController - Allow to easily 
filter routes

No new revisions were added by this update.

[GitHub] [camel-quarkus] lburgazzoli opened a new pull request #1207: Move integration-tests support modules out of integration-tests folder

[GitBox]

lburgazzoli opened a new pull request #1207:
URL: https://github.com/apache/camel-quarkus/pull/1207


   We defined a goal to move the integrations tests closewd to the related
   extenbsions so integration tests support modules should be moved to a
   dedictaed directory 
   
   [ ] An issue should be filed for the change unless this is a trivial change 
(fixing a typo or similar). One issue should ideally be fixed by not more than 
one commit and the other way round, each commit should fix just one issue, 
without pulling in other changes.
   [ ] Each commit in the pull request should have a meaningful and properly 
spelled subject line and body. Copying the title of the associated issue is 
typically enough. Please include the issue number in the commit message 
prefixed by #.
   [ ] The pull request description should explain what the pull request does, 
how, and why. If the info is available in the associated issue or some other 
external document, a link is enough.
   [ ] Phrases like Fix # or Fixes # will auto-close 
the named issue upon merging the pull request. Using them is typically a good 
idea.
   [ ] Please run mvn process-resources -Pformat (and amend the changes if 
necessary) before sending the pull request.
   [ ] Contributor guide is your good friend: 
https://camel.apache.org/camel-quarkus/latest/contributor-guide.html



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel-examples] branch master updated: Fixed camel-example-aggregate by using camel-spring-main

[acosentino]

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-examples.git


The following commit(s) were added to refs/heads/master by this push:
 new b0c40c8  Fixed camel-example-aggregate by using camel-spring-main
b0c40c8 is described below

commit b0c40c835e64ef5fab3657fa0b94cfbf126e0a24
Author: Andrea Cosentino 
AuthorDate: Mon May 11 08:47:20 2020 +0200

Fixed camel-example-aggregate by using camel-spring-main
---
 examples/camel-example-aggregate/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/camel-example-aggregate/pom.xml 
b/examples/camel-example-aggregate/pom.xml
index 12dfe49..32e1455 100644
--- a/examples/camel-example-aggregate/pom.xml
+++ b/examples/camel-example-aggregate/pom.xml
@@ -57,7 +57,7 @@
 
 
 org.apache.camel
-camel-spring
+camel-spring-main
 
 
 org.apache.camel

[GitHub] [camel-quarkus] lburgazzoli opened a new issue #1206: Kudu IT failing

[GitBox]

lburgazzoli opened a new issue #1206:
URL: https://github.com/apache/camel-quarkus/issues/1206


   The Kudu IT tests are failing on my environment:
   
   ```
   2020-05-11 08:37:33,800 INFO  [org.apa.cam.qua.com.kud.it.KuduResource] 
(executor-thread-1) Calling createTable
   2020-05-11 08:37:33,957 ERROR [org.apa.cam.pro.err.DefaultErrorHandler] 
(executor-thread-1) Failed delivery for (MessageId: 
C9BC00A8CDBDC43- on ExchangeId: 
C9BC00A8CDBDC43-). Exhausted after delivery attempt: 1 caught: 
org.apache.kudu.client.NonRecoverableException: not enough live tablet servers 
to create a table with the requested replication factor 1; 0 tablet servers are 
alive
   ```
   
   **java -version**
   ```
   openjdk version "11.0.6" 2020-01-14
   OpenJDK Runtime Environment 18.9 (build 11.0.6+10)
   OpenJDK 64-Bit Server VM 18.9 (build 11.0.6+10, mixed mode, sharing)
   ```
   
   **cat /etc/fedora-release** 
   ```
   Fedora release 32 (Thirty Two)
   ```
   
   **docker info**
   ```
   Client:
Debug Mode: false
   
   Server:
Containers: 4
 Running: 0
 Paused: 0
 Stopped: 4
Images: 66
Server Version: 19.03.8
Storage Driver: overlay2
 Backing Filesystem: 
 Supports d_type: true
 Native Overlay Diff: true
Logging Driver: journald
Cgroup Driver: systemd
Plugins:
 Volume: local
 Network: bridge host ipvlan macvlan null overlay
 Log: awslogs fluentd gcplogs gelf journald json-file local logentries 
splunk syslog
Swarm: inactive
Runtimes: runc
Default Runtime: runc
Init Binary: /usr/libexec/docker/docker-init
containerd version: 
runc version: fbdbaf85ecbc0e077f336c03062710435607dbf1
init version: 
Security Options:
 seccomp
  Profile: default
 selinux
Kernel Version: 5.6.8-300.fc32.x86_64
Operating System: Fedora 32 (Thirty Two)
OSType: linux
Architecture: x86_64
CPUs: 8
Total Memory: 62.27GiB
Name: mars
ID: FPGA:3ODP:AUFU:MPTP:K6AO:2X4Q:Q4JU:5YEA:ZIXZ:JXZH:THS6:Y77V
Docker Root Dir: /var/lib/docker
Debug Mode: false
Registry: https://index.docker.io/v1/
Labels:
Experimental: false
Insecure Registries:
 127.0.0.0/8
Live Restore Enabled: true
   
   ```
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [camel-quarkus] lburgazzoli commented on issue #1206: Kudu IT failing

[GitBox]

lburgazzoli commented on issue #1206:
URL: https://github.com/apache/camel-quarkus/issues/1206#issuecomment-626504795


   /cc @aldettinger 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel-karaf] branch release/3.3.0 updated: [maven-release-plugin] prepare release camel-karaf-3.3.0

[gzurowski]

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

gzurowski pushed a commit to branch release/3.3.0
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/release/3.3.0 by this push:
 new af79dac  [maven-release-plugin] prepare release camel-karaf-3.3.0
af79dac is described below

commit af79dac553ce97bb6920a557a2648509b8a31a20
Author: Gregor Zurowski 
AuthorDate: Sun May 10 23:42:43 2020 -0700

[maven-release-plugin] prepare release camel-karaf-3.3.0
---
 bom/camel-karaf-bom/pom.xml|  2 +-
 bom/pom.xml|  2 +-
 catalog/camel-catalog-provider-karaf/pom.xml   |  5 +-
 catalog/pom.xml|  2 +-
 components/camel-blueprint-main/pom.xml|  2 +-
 components/camel-blueprint/pom.xml | 60 ++
 components/camel-cxf-blueprint/pom.xml |  2 +-
 components/camel-cxf-transport-blueprint/pom.xml   |  2 +-
 components/camel-eventadmin/pom.xml|  2 +-
 components/camel-kura/pom.xml  |  2 +-
 components/camel-osgi-activator/pom.xml|  6 +--
 components/camel-paxlogging/pom.xml|  2 +-
 components/camel-servlet-osgi/pom.xml  |  2 +-
 components/camel-test-blueprint/pom.xml|  2 +-
 components/camel-test-karaf/pom.xml|  2 +-
 components/pom.xml |  5 +-
 core/camel-core-osgi/pom.xml   |  2 +-
 core/pom.xml   |  2 +-
 platforms/commands/commands-core/pom.xml   |  2 +-
 platforms/commands/pom.xml |  2 +-
 platforms/karaf/commands/pom.xml   |  2 +-
 platforms/karaf/features/pom.xml   |  2 +-
 platforms/karaf/pom.xml|  2 +-
 platforms/pom.xml  |  2 +-
 pom.xml|  4 +-
 tests/camel-blueprint-cxf-test/pom.xml |  2 +-
 tests/camel-blueprint-test/pom.xml |  2 +-
 tests/camel-itest-osgi/pom.xml |  2 +-
 tests/pom.xml  |  2 +-
 .../pom.xml|  2 +-
 tooling/camel-karaf-docs-maven-plugin/pom.xml  |  2 +-
 tooling/pom.xml|  2 +-
 32 files changed, 62 insertions(+), 72 deletions(-)

diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml
index 58ea824..027c7af 100644
--- a/bom/camel-karaf-bom/pom.xml
+++ b/bom/camel-karaf-bom/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel.karaf
 karaf
-3.3.0-SNAPSHOT
+3.3.0
 ../../
   
   camel-karaf-bom
diff --git a/bom/pom.xml b/bom/pom.xml
index bf8fd6a..158a24d 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel.karaf
 karaf
-3.3.0-SNAPSHOT
+3.3.0
 ..
 
 
diff --git a/catalog/camel-catalog-provider-karaf/pom.xml 
b/catalog/camel-catalog-provider-karaf/pom.xml
index dc5e2e9..fbd56cf 100644
--- a/catalog/camel-catalog-provider-karaf/pom.xml
+++ b/catalog/camel-catalog-provider-karaf/pom.xml
@@ -17,14 +17,13 @@
 limitations under the License.
 
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
 4.0.0
 
 
 org.apache.camel.karaf
 catalog
-3.3.0-SNAPSHOT
+3.3.0
 
 
 camel-catalog-provider-karaf
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 5fe7a64..880737b 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel.karaf
 karaf
-3.3.0-SNAPSHOT
+3.3.0
 ..
 
 
diff --git a/components/camel-blueprint-main/pom.xml 
b/components/camel-blueprint-main/pom.xml
index 7dab235..8b8d874 100644
--- a/components/camel-blueprint-main/pom.xml
+++ b/components/camel-blueprint-main/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel.karaf
 components
-3.3.0-SNAPSHOT
+3.3.0
 
 
 camel-blueprint-main
diff --git a/components/camel-blueprint/pom.xml 
b/components/camel-blueprint/pom.xml
index af69ab6..e4a1e1c 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -17,14 +17,13 @@
 limitations under the License.
 
 -->
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>

[camel-karaf] annotated tag camel-karaf-3.3.0 created (now 95922d5)

[gzurowski]

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

gzurowski pushed a change to annotated tag camel-karaf-3.3.0
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.


  at 95922d5  (tag)
 tagging af79dac553ce97bb6920a557a2648509b8a31a20 (commit)
  by Gregor Zurowski
  on Sun May 10 23:42:49 2020 -0700

- Log -
[maven-release-plugin]  copy for tag camel-karaf-3.3.0
---

No new revisions were added by this update.

[camel-karaf] branch release/3.3.0 updated: [maven-release-plugin] prepare for next development iteration

[gzurowski]

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

gzurowski pushed a commit to branch release/3.3.0
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


The following commit(s) were added to refs/heads/release/3.3.0 by this push:
 new a4d11fa  [maven-release-plugin] prepare for next development iteration
a4d11fa is described below

commit a4d11fa3d4b0d6418e0fa81fe84cba3d3ce40f82
Author: Gregor Zurowski 
AuthorDate: Sun May 10 23:42:55 2020 -0700

[maven-release-plugin] prepare for next development iteration
---
 bom/camel-karaf-bom/pom.xml| 2 +-
 bom/pom.xml| 2 +-
 catalog/camel-catalog-provider-karaf/pom.xml   | 2 +-
 catalog/pom.xml| 2 +-
 components/camel-blueprint-main/pom.xml| 2 +-
 components/camel-blueprint/pom.xml | 2 +-
 components/camel-cxf-blueprint/pom.xml | 2 +-
 components/camel-cxf-transport-blueprint/pom.xml   | 2 +-
 components/camel-eventadmin/pom.xml| 2 +-
 components/camel-kura/pom.xml  | 2 +-
 components/camel-osgi-activator/pom.xml| 2 +-
 components/camel-paxlogging/pom.xml| 2 +-
 components/camel-servlet-osgi/pom.xml  | 2 +-
 components/camel-test-blueprint/pom.xml| 2 +-
 components/camel-test-karaf/pom.xml| 2 +-
 components/pom.xml | 2 +-
 core/camel-core-osgi/pom.xml   | 2 +-
 core/pom.xml   | 2 +-
 platforms/commands/commands-core/pom.xml   | 2 +-
 platforms/commands/pom.xml | 2 +-
 platforms/karaf/commands/pom.xml   | 2 +-
 platforms/karaf/features/pom.xml   | 2 +-
 platforms/karaf/pom.xml| 2 +-
 platforms/pom.xml  | 2 +-
 pom.xml| 4 ++--
 tests/camel-blueprint-cxf-test/pom.xml | 2 +-
 tests/camel-blueprint-test/pom.xml | 2 +-
 tests/camel-itest-osgi/pom.xml | 2 +-
 tests/pom.xml  | 2 +-
 tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +-
 tooling/camel-karaf-docs-maven-plugin/pom.xml  | 2 +-
 tooling/pom.xml| 2 +-
 32 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml
index 027c7af..9517ed4 100644
--- a/bom/camel-karaf-bom/pom.xml
+++ b/bom/camel-karaf-bom/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel.karaf
 karaf
-3.3.0
+3.3.1-SNAPSHOT
 ../../
   
   camel-karaf-bom
diff --git a/bom/pom.xml b/bom/pom.xml
index 158a24d..de8ebb4 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel.karaf
 karaf
-3.3.0
+3.3.1-SNAPSHOT
 ..
 
 
diff --git a/catalog/camel-catalog-provider-karaf/pom.xml 
b/catalog/camel-catalog-provider-karaf/pom.xml
index fbd56cf..810bc51 100644
--- a/catalog/camel-catalog-provider-karaf/pom.xml
+++ b/catalog/camel-catalog-provider-karaf/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel.karaf
 catalog
-3.3.0
+3.3.1-SNAPSHOT
 
 
 camel-catalog-provider-karaf
diff --git a/catalog/pom.xml b/catalog/pom.xml
index 880737b..427cb42 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel.karaf
 karaf
-3.3.0
+3.3.1-SNAPSHOT
 ..
 
 
diff --git a/components/camel-blueprint-main/pom.xml 
b/components/camel-blueprint-main/pom.xml
index 8b8d874..2f4d315 100644
--- a/components/camel-blueprint-main/pom.xml
+++ b/components/camel-blueprint-main/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel.karaf
 components
-3.3.0
+3.3.1-SNAPSHOT
 
 
 camel-blueprint-main
diff --git a/components/camel-blueprint/pom.xml 
b/components/camel-blueprint/pom.xml
index e4a1e1c..28cc0ab 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel.karaf
 components
-3.3.0
+3.3.1-SNAPSHOT
 
 
 camel-blueprint
diff --git a/components/camel-cxf-blueprint/pom.xml 
b/components/camel-cxf-blueprint/pom.xml
index 0ff0d13..6263a74 100644
--- a/components/camel-cxf-blueprint/pom.xml
+++ b/components/camel-cxf-blueprint/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel.karaf
 components
-3.3.0
+3.3.1-SNAPSHOT
 
 
 

[camel-karaf] 01/01: Point to Camel 3.3.0 for release

[gzurowski]

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

gzurowski pushed a commit to branch release/3.3.0
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git

commit caddf663138eda7a53bfaadd7300d0a5eb99d5f6
Author: Gregor Zurowski 
AuthorDate: Sun May 10 23:37:41 2020 -0700

Point to Camel 3.3.0 for release
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 47ad360..ed7091c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 camel-dependencies
-3.3.0-SNAPSHOT
+3.3.0
 
 
 org.apache.camel.karaf
@@ -105,7 +105,7 @@
 false
 
 
-3.3.0-SNAPSHOT
+3.3.0
 
 1.7.0_6
 3.5.2_1
@@ -707,7 +707,7 @@
 
 dev
 
-3.3.0-SNAPSHOT
+3.3.0
 
 
 

[camel-karaf] branch release/3.3.0 created (now caddf66)

[gzurowski]

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

gzurowski pushed a change to branch release/3.3.0
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.


  at caddf66  Point to Camel 3.3.0 for release

This branch includes the following new commits:

 new caddf66  Point to Camel 3.3.0 for release

The 1 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.

[camel-karaf] branch camel-3.3.x created (now 0ba7165)

[gzurowski]

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

gzurowski pushed a change to branch camel-3.3.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git.


  at 0ba7165  Migrate Mongo GridFS component to 4.x client

No new revisions were added by this update.

[camel] branch camel-3.3.x created (now 29f8788)

[gzurowski]

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

gzurowski pushed a change to branch camel-3.3.x
in repository https://gitbox.apache.org/repos/asf/camel.git.


  at 29f8788  CAMEL-11807: Migrated camel-debezium-*/disruptor tests to 
JUnit 5

No new revisions were added by this update.

[GitHub] [camel-quarkus] galderz commented on pull request #1185: Add jaxb as dependency and allow skipping formatting

[GitBox]

galderz commented on pull request #1185:
URL: https://github.com/apache/camel-quarkus/pull/1185#issuecomment-626496746


   Thx @ppalaga. Anything else missing here? Or can it be integrated?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[camel] branch camel-2.x updated (8ecb667 -> 46d7930)

[djencks]

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

djencks pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 8ecb667  warning added before source attribute
 new f8c4685  Tooling changes, removing old table generation and adding 
attributes to partly generated docs.
 new 331e33c  Manual changes to index pages to add new tables, and other 
similar changes
 new 20de229  generated file changes
 new 46d7930  mostly manual adoc fixes

The 4 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:
 .../docs/modules/ROOT/pages/bean-component.adoc|  12 +-
 .../docs/modules/ROOT/pages/binding-component.adoc |  13 +-
 .../docs/modules/ROOT/pages/browse-component.adoc  |  12 +-
 .../docs/modules/ROOT/pages/class-component.adoc   |  12 +-
 .../modules/ROOT/pages/controlbus-component.adoc   |  18 +-
 .../modules/ROOT/pages/dataformat-component.adoc   |  12 +-
 .../docs/modules/ROOT/pages/dataset-component.adoc |  12 +-
 .../docs/modules/ROOT/pages/direct-component.adoc  |  12 +-
 .../modules/ROOT/pages/direct-vm-component.adoc|  12 +-
 .../docs/modules/ROOT/pages/file-component.adoc|  20 +-
 .../modules/ROOT/pages/language-component.adoc |  14 +-
 .../docs/modules/ROOT/pages/log-component.adoc |  16 +-
 .../docs/modules/ROOT/pages/mock-component.adoc|  22 +-
 .../modules/ROOT/pages/properties-component.adoc   |  42 +-
 .../docs/modules/ROOT/pages/ref-component.adoc |  12 +-
 .../modules/ROOT/pages/rest-api-component.adoc |  12 +-
 .../docs/modules/ROOT/pages/rest-component.adoc|  12 +-
 .../docs/modules/ROOT/pages/saga-component.adoc|  12 +-
 .../modules/ROOT/pages/scheduler-component.adoc|  12 +-
 .../docs/modules/ROOT/pages/seda-component.adoc|  16 +-
 .../docs/modules/ROOT/pages/stub-component.adoc|  12 +-
 .../docs/modules/ROOT/pages/test-component.adoc|  12 +-
 .../docs/modules/ROOT/pages/timer-component.adoc   |  16 +-
 .../modules/ROOT/pages/validator-component.adoc|  12 +-
 .../main/docs/modules/ROOT/pages/vm-component.adoc |  12 +-
 .../docs/modules/ROOT/pages/xslt-component.adoc|  16 +-
 .../modules/dataformats/pages/gzip-dataformat.adoc |   6 +-
 .../pages/serialization-dataformat.adoc|   7 +-
 .../dataformats/pages/string-dataformat.adoc   |   7 +-
 .../modules/dataformats/pages/zip-dataformat.adoc  |   6 +-
 .../modules/languages/pages/bean-language.adoc |   6 +-
 .../modules/languages/pages/constant-language.adoc |   6 +-
 .../languages/pages/exchangeProperty-language.adoc |   6 +-
 .../modules/languages/pages/file-language.adoc |   6 +-
 .../modules/languages/pages/header-language.adoc   |   6 +-
 .../docs/modules/languages/pages/ref-language.adoc |   6 +-
 .../modules/languages/pages/simple-language.adoc   |  22 +-
 .../modules/languages/pages/tokenize-language.adoc |   6 +-
 .../modules/languages/pages/xpath-language.adoc|  20 +-
 .../languages/pages/xtokenize-language.adoc|   6 +-
 .../src/main/docs/ahc-ws-component.adoc|   7 +-
 .../camel-ahc/src/main/docs/ahc-component.adoc |   7 +-
 .../camel-amqp/src/main/docs/amqp-component.adoc   |   7 +-
 .../camel-apns/src/main/docs/apns-component.adoc   |   7 +-
 .../src/main/docs/as2-component.adoc   |  11 +-
 .../camel-asn1/src/main/docs/asn1-dataformat.adoc  |   6 +-
 .../src/main/docs/asterisk-component.adoc  |   7 +-
 .../camel-atmos/src/main/docs/atmos-component.adoc |   7 +-
 .../main/docs/atmosphere-websocket-component.adoc  |   7 +-
 .../camel-atom/src/main/docs/atom-component.adoc   |   7 +-
 .../src/main/docs/atomix-map-component.adoc|   7 +-
 .../src/main/docs/atomix-messaging-component.adoc  |   7 +-
 .../src/main/docs/atomix-multimap-component.adoc   |   7 +-
 .../src/main/docs/atomix-queue-component.adoc  |   7 +-
 .../src/main/docs/atomix-set-component.adoc|   7 +-
 .../src/main/docs/atomix-value-component.adoc  |   7 +-
 .../camel-avro/src/main/docs/avro-component.adoc   |   7 +-
 .../camel-avro/src/main/docs/avro-dataformat.adoc  |   8 +-
 .../camel-aws-xray/src/main/docs/aws-xray.adoc |  12 +-
 .../camel-aws/src/main/docs/aws-cw-component.adoc  |   9 +-
 .../camel-aws/src/main/docs/aws-ddb-component.adoc |   7 +-
 .../src/main/docs/aws-ddbstream-component.adoc |   9 +-
 .../camel-aws/src/main/docs/aws-ec2-component.adoc |   9 +-
 .../camel-aws/src/main/docs/aws-iam-component.adoc |   9 +-
 .../src/main/docs/aws-kinesis-component.adoc   |   9 +-
 .../main/docs/aws-kinesis-firehose-component.adoc  |   9 +-
 .../camel-aws/src/main/docs/aws-kms-component.adoc |   9 +-
 .../src/main/docs/aws-lambda-component.adoc|   9 +-
 .../camel-aws/src/main/docs/aws-mq-component.adoc  |   9 +-
 

[camel] 01/04: Tooling changes, removing old table generation and adding attributes to partly generated docs.

[djencks]

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

djencks pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f8c468546c4ca9889c62f8929d2cb7788d037c35
Author: David Jencks 
AuthorDate: Mon May 4 21:57:38 2020 -0700

Tooling changes, removing old table generation and adding attributes to 
partly generated docs.
---
 .../camel/maven/packaging/PrepareReadmeMojo.java   | 635 ---
 .../packaging/SpringBootAutoConfigurationMojo.java |  14 +-
 .../camel/maven/packaging/UpdateReadmeMojo.java| 702 +++--
 .../camel/maven/packaging/model/ArtifactModel.java |  54 ++
 .../model/{OtherModel.java => BaseModel.java}  | 109 ++--
 .../maven/packaging/model/ComponentModel.java  | 114 +---
 .../maven/packaging/model/DataFormatModel.java | 123 +---
 .../camel/maven/packaging/model/EipModel.java  |  82 +--
 .../camel/maven/packaging/model/LanguageModel.java |  83 +--
 .../camel/maven/packaging/model/OtherModel.java| 115 +---
 .../camel/maven/packaging/model/Strings.java   | 170 +
 .../src/main/resources/dataformat-options.mvel |   8 +-
 .../src/main/resources/eip-options.mvel|   6 +-
 .../src/main/resources/language-options.mvel   |   8 +-
 .../src/main/resources/readme-components.mvel  |  14 -
 .../src/main/resources/readme-dataformats.mvel |  12 -
 .../src/main/resources/readme-languages.mvel   |  12 -
 .../src/main/resources/readme-others.mvel  |  12 -
 18 files changed, 858 insertions(+), 1415 deletions(-)

diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index b3ea3e3..7bf73a4 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -67,42 +67,12 @@ public class PrepareReadmeMojo extends AbstractMojo {
 protected File eipsDir;
 
 /**
- * The directory for components catalog
- */
-@Parameter(defaultValue = 
"${project.build.directory}/classes/org/apache/camel/catalog/components")
-protected File componentsDir;
-
-/**
- * The directory for data formats catalog
- */
-@Parameter(defaultValue = 
"${project.build.directory}/classes/org/apache/camel/catalog/dataformats")
-protected File dataFormatsDir;
-
-/**
- * The directory for languages catalog
- */
-@Parameter(defaultValue = 
"${project.build.directory}/classes/org/apache/camel/catalog/languages")
-protected File languagesDir;
-
-/**
- * The directory for others catalog
- */
-@Parameter(defaultValue = 
"${project.build.directory}/classes/org/apache/camel/catalog/others")
-protected File othersDir;
-
-/**
  * The directory for camel-core
  */
 @Parameter(defaultValue = "${project.directory}/../../../camel-core")
 protected File readmeCoreDir;
 
 /**
- * The directory for components
- */
-@Parameter(defaultValue = "${project.directory}/../../../components")
-protected File readmeComponentsDir;
-
-/**
  * Maven ProjectHelper.
  */
 @Component
@@ -118,14 +88,6 @@ public class PrepareReadmeMojo extends AbstractMojo {
 public void execute() throws MojoExecutionException, MojoFailureException {
 // update readme file in camel-core
 executeEipsReadme();
-executeComponentsReadme(true);
-executeDataFormatsReadme(true);
-executeLanguagesReadme(true);
-// update readme file in components
-executeComponentsReadme(false);
-executeOthersReadme();
-executeDataFormatsReadme(false);
-executeLanguagesReadme(false);
 }
 
 protected void executeEipsReadme() throws MojoExecutionException, 
MojoFailureException {
@@ -181,294 +143,6 @@ public class PrepareReadmeMojo extends AbstractMojo {
 }
 }
 
-protected void executeComponentsReadme(boolean coreOnly) throws 
MojoExecutionException, MojoFailureException {
-Set componentFiles = new TreeSet<>();
-
-if (componentsDir != null && componentsDir.isDirectory()) {
-File[] files = componentsDir.listFiles();
-if (files != null) {
-componentFiles.addAll(Arrays.asList(files));
-}
-}
-
-try {
-List models = new ArrayList<>();
-for (File file : componentFiles) {
-String json = loadText(new FileInputStream(file));
-ComponentModel model = generateComponentModel(json, coreOnly);
-
-// filter out alternative schemas which reuses documentation
-boolean add = true;
-if 

[camel] 02/04: Manual changes to index pages to add new tables, and other similar changes

[djencks]

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

djencks pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 331e33c25f331824c98720606a562f457ecfd084
Author: David Jencks 
AuthorDate: Mon May 4 21:59:05 2020 -0700

Manual changes to index pages to add new tables, and other similar changes
---
 docs/component-others-nav.adoc.template|   5 +
 docs/components/antora.yml |   5 +
 docs/components/modules/ROOT/pages/index.adoc  | 731 +
 .../modules/dataformats/pages/index.adoc   | 110 +---
 docs/components/modules/languages/pages/index.adoc |  59 +-
 docs/components/modules/others/pages/index.adoc|  17 +
 docs/gulpfile.js   |  48 +-
 7 files changed, 95 insertions(+), 880 deletions(-)

diff --git a/docs/component-others-nav.adoc.template 
b/docs/component-others-nav.adoc.template
new file mode 100644
index 000..eb2bb99
--- /dev/null
+++ b/docs/component-others-nav.adoc.template
@@ -0,0 +1,5 @@
+
+
+* xref:others:index.adoc[Miscellaneous Components]
+
+
diff --git a/docs/components/antora.yml b/docs/components/antora.yml
index 4376232..39c02b6 100644
--- a/docs/components/antora.yml
+++ b/docs/components/antora.yml
@@ -22,3 +22,8 @@ nav:
   - modules/ROOT/nav.adoc
   - modules/dataformats/nav.adoc
   - modules/languages/nav.adoc
+  - modules/others/nav.adoc
+asciidoc:
+  attributes:
+index-table-format: width="100%",cols="4,3,3,3,6",options="header"
+#  | Data Format | Artifact | Support Level | Since | Description
diff --git a/docs/components/modules/ROOT/pages/index.adoc 
b/docs/components/modules/ROOT/pages/index.adoc
index f49a193..541f52c 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -8,730 +8,27 @@ services that can not only resolve easy messaging and 
transferring data but also
 
 Below is the list of components that are provided by Apache Camel.
 
-== List of Components
+== Core Components
 
-// components: START
-Number of Components: 310 in 210 JAR artifacts (27 deprecated)
+Below is the list of core components that are provided by Apache Camel.
 
-[width="100%",cols="4,1,5",options="header"]
-|===
-| Component | Since | Description
-
-| xref:ahc-component.adoc[AHC] (camel-ahc) | 2.8 | To call external HTTP 
services using Async Http Client.
-
-| xref:ahc-ws-component.adoc[AHC Websocket] (camel-ahc-ws) | 2.14 | To 
exchange data with external Websocket servers using Async Http Client.
-
-| xref:amqp-component.adoc[AMQP] (camel-amqp) | 1.2 | Messaging with AMQP 
protocol using Apache QPid Client.
-
-| xref:flink-component.adoc[Apache Flink] (camel-flink) | 2.18 | The flink 
component can be used to send DataSet jobs to Apache Flink cluster.
-
-| xref:pulsar-component.adoc[Apache Pulsar] (camel-pulsar) | 2.24 | Camel 
Apache Pulsar Component
-
-| xref:spark-component.adoc[Apache Spark] (camel-spark) | 2.17 | The spark 
component can be used to send RDD or DataFrame jobs to Apache Spark cluster.
-
-| xref:apns-component.adoc[APNS] (camel-apns) | 2.8 | For sending 
notifications to Apple iOS devices.
-
-| xref:as2-component.adoc[AS2] (camel-as2) | 2.22 | Component used for 
transferring data secure and reliable over the internet using the AS2 protocol.
-
-| xref:asterisk-component.adoc[Asterisk] (camel-asterisk) | 2.18 | The 
asterisk component is used to interact with Asterisk PBX Server.
-
-| xref:atmos-component.adoc[Atmos] (camel-atmos) | 2.15 | The atmos component 
is used for integrating with EMC's Atomos Storage.
-
-| xref:atmosphere-websocket-component.adoc[Atmosphere Websocket] 
(camel-atmosphere-websocket) | 2.14 | To exchange data with external Websocket 
clients using Atmosphere.
-
-| xref:atom-component.adoc[Atom] (camel-atom) | 1.2 | The atom component is 
used for consuming Atom RSS feeds.
-
-| xref:atomix-map-component.adoc[Atomix Map] (camel-atomix) | 2.20 | The 
atomix-map component is used to access Atomix's distributed map.
-
-| xref:atomix-messaging-component.adoc[Atomix Messaging] (camel-atomix) | 2.20 
| The atomix-messaging component is used to access Atomix's group messaging.
-
-| xref:atomix-multimap-component.adoc[Atomix MultiMap] (camel-atomix) | 2.20 | 
The atomix-multimap component is used to access Atomix's distributed multi map.
-
-| xref:atomix-queue-component.adoc[Atomix Queue] (camel-atomix) | 2.20 | The 
atomix-queue component is used to access Atomix's distributed queue.
-
-| xref:atomix-set-component.adoc[Atomix Set] (camel-atomix) | 2.20 | The 
atomix-set component is used to access Atomix's distributed set.
-
-| xref:atomix-value-component.adoc[Atomix Value] (camel-atomix) | 2.20 | The 
atomix-value component is used to access Atomix's distributed value.
-
-| xref:avro-component.adoc[Avro] (camel-avro) | 2.10 | Working with Apache 
Avro for data serialization.
-
-| xref:aws-cw-component.adoc[AWS CloudWatch]