[GitHub] [camel] orpiske closed pull request #4842: Backport sensitive utils improvements

2021-01-07 Thread GitBox


orpiske closed pull request #4842:
URL: https://github.com/apache/camel/pull/4842


   



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] orpiske opened a new pull request #4842: Backport sensitive utils improvements

2021-01-07 Thread GitBox


orpiske opened a new pull request #4842:
URL: https://github.com/apache/camel/pull/4842


   Ref: #4840
   
   - [x] Make sure there is a [JIRA 
issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change 
(usually before you start working on it).  Trivial changes like typos do not 
require a JIRA issue.  Your pull request should address just this issue, 
without pulling in other changes.
   - [x] Each commit in the pull request should have a meaningful subject line 
and body.
   - [x] If you're unsure, you can format the pull request title like 
`[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` 
with the appropriate JIRA issue.
   - [x] Write a pull request description that is detailed enough to understand 
what the pull request does, how, and why.
   - [x] Run `mvn clean install -Psourcecheck` in your module with source check 
enabled to make sure basic checks pass and there are no checkstyle violations. 
A more thorough check will be performed on your pull request automatically.
   Below are the contribution guidelines:
   https://github.com/apache/camel/blob/master/CONTRIBUTING.md



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-k] tadayosi commented on issue #1547: Increase trait test coverage

2021-01-07 Thread GitBox


tadayosi commented on issue #1547:
URL: https://github.com/apache/camel-k/issues/1547#issuecomment-756608731


   Now covered all of the listed traits. Let's close it.



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-k] tadayosi closed issue #1547: Increase trait test coverage

2021-01-07 Thread GitBox


tadayosi closed issue #1547:
URL: https://github.com/apache/camel-k/issues/1547


   



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-k] astefanutti closed issue #1158: Implement install command's flags test

2021-01-07 Thread GitBox


astefanutti closed issue #1158:
URL: https://github.com/apache/camel-k/issues/1158


   



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-k] astefanutti merged pull request #1883: feat(test): install command flags unit test

2021-01-07 Thread GitBox


astefanutti merged pull request #1883:
URL: https://github.com/apache/camel-k/pull/1883


   



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-k] branch master updated: feat(test): install command flags unit test

2021-01-07 Thread astefanutti
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new dede785  feat(test): install command flags unit test
dede785 is described below

commit dede785d5522bbedf62a71338a5c783fda88e254
Author: Pasquale Congiusti 
AuthorDate: Thu Jan 7 16:03:47 2021 +0100

feat(test): install command flags unit test

Added a suite of testcases to verify default and user provided flags

Closes #1158
---
 pkg/cmd/install_test.go | 291 +++-
 1 file changed, 289 insertions(+), 2 deletions(-)

diff --git a/pkg/cmd/install_test.go b/pkg/cmd/install_test.go
index 59dc8d6..5228170 100644
--- a/pkg/cmd/install_test.go
+++ b/pkg/cmd/install_test.go
@@ -20,6 +20,7 @@ package cmd
 import (
"testing"
 
+   "github.com/apache/camel-k/pkg/util/olm"
"github.com/apache/camel-k/pkg/util/test"
"github.com/spf13/cobra"
 
@@ -28,19 +29,305 @@ import (
"github.com/stretchr/testify/assert"
 )
 
-//nolint:deadcode,unused
+const cmdInstall = "install"
+
+func initializeRunCmdOptions(t *testing.T) (*installCmdOptions, 
*cobra.Command, RootCmdOptions) {
+   options, rootCmd := kamelTestPreAddCommandInit()
+   runCmdOptions := addTestInstallCmd(*options, rootCmd)
+   kamelTestPostAddCommandInit(t, rootCmd)
+
+   return runCmdOptions, rootCmd, *options
+}
+
 func addTestInstallCmd(options RootCmdOptions, rootCmd *cobra.Command) 
*installCmdOptions {
//add a testing version of install Command
installCmd, installOptions := newCmdInstall(&options)
installCmd.RunE = func(c *cobra.Command, args []string) error {
return nil
}
+   installCmd.PostRunE = func(c *cobra.Command, args []string) error {
+   return nil
+   }
installCmd.Args = test.ArbitraryArgs
rootCmd.AddCommand(installCmd)
return installOptions
 }
 
-//TODO: add a proper command flags test, take inspiration by run_test.go
+func TestInstallNoFlag(t *testing.T) {
+   runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+   _, err := test.ExecuteCommand(rootCmd, cmdInstall)
+   assert.Nil(t, err)
+   //Check default expected values
+   assert.Equal(t, false, runCmdOptions.Wait)
+   assert.Equal(t, false, runCmdOptions.ClusterSetupOnly)
+   assert.Equal(t, false, runCmdOptions.SkipOperatorSetup)
+   assert.Equal(t, false, runCmdOptions.SkipClusterSetup)
+   assert.Equal(t, false, runCmdOptions.ExampleSetup)
+   assert.Equal(t, false, runCmdOptions.Global)
+   assert.Equal(t, false, runCmdOptions.KanikoBuildCache)
+   assert.Equal(t, false, runCmdOptions.Save)
+   assert.Equal(t, false, runCmdOptions.Force)
+   assert.Equal(t, true, runCmdOptions.Olm)
+   assert.Equal(t, olm.DefaultOperatorName, 
runCmdOptions.olmOptions.OperatorName)
+   assert.Equal(t, olm.DefaultPackage, runCmdOptions.olmOptions.Package)
+   assert.Equal(t, olm.DefaultChannel, runCmdOptions.olmOptions.Channel)
+   assert.Equal(t, olm.DefaultSource, runCmdOptions.olmOptions.Source)
+   assert.Equal(t, olm.DefaultSourceNamespace, 
runCmdOptions.olmOptions.SourceNamespace)
+   assert.Equal(t, olm.DefaultGlobalNamespace, 
runCmdOptions.olmOptions.GlobalNamespace)
+   assert.Equal(t, int32(8081), runCmdOptions.HealthPort)
+   assert.Equal(t, false, runCmdOptions.Monitoring)
+   assert.Equal(t, int32(8080), runCmdOptions.MonitoringPort)
+}
+
+func TestInstallNonExistingFlag(t *testing.T) {
+   _, rootCmd, _ := initializeRunCmdOptions(t)
+   _, err := test.ExecuteCommand(rootCmd, cmdInstall, "--nonExistingFlag")
+   assert.NotNil(t, err)
+}
+
+func TestInstallBaseImageFlag(t *testing.T) {
+   runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+   _, err := test.ExecuteCommand(rootCmd, cmdInstall, "--base-image", 
"someString")
+   assert.Nil(t, err)
+   assert.Equal(t, "someString", runCmdOptions.BaseImage)
+}
+
+func TestInstallBuildPublishStrategyFlag(t *testing.T) {
+   runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+   _, err := test.ExecuteCommand(rootCmd, cmdInstall, 
"--build-publish-strategy", "someString")
+   assert.Nil(t, err)
+   assert.Equal(t, "someString", runCmdOptions.BuildPublishStrategy)
+}
+
+func TestInstallBuildStrategyFlag(t *testing.T) {
+   runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+   _, err := test.ExecuteCommand(rootCmd, cmdInstall, "--build-strategy", 
"someString")
+   assert.Nil(t, err)
+   assert.Equal(t, "someString", runCmdOptions.BuildStrategy)
+}
+
+func TestInstallBuildTimeoutFlag(t *testing.T) {
+   runCmdOptions, rootCmd, _ := initializeRunCmdOptions(t)
+   _, err := test.ExecuteCommand(rootCmd, cmdInstall, "--bu

[GitHub] [camel-k] astefanutti merged pull request #1885: chore(e2e): add test for Istio trait #1547

2021-01-07 Thread GitBox


astefanutti merged pull request #1885:
URL: https://github.com/apache/camel-k/pull/1885


   



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-k] branch master updated: chore(e2e): add test for Istio trait #1547

2021-01-07 Thread astefanutti
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
 new 4259404  chore(e2e): add test for Istio trait #1547
4259404 is described below

commit 425940456ea12ec9c2bed123392e3e9b1a9ad68f
Author: Tadayoshi Sato 
AuthorDate: Fri Jan 8 11:20:11 2021 +0900

chore(e2e): add test for Istio trait #1547
---
 e2e/common/istio_test.go | 55 
 1 file changed, 55 insertions(+)

diff --git a/e2e/common/istio_test.go b/e2e/common/istio_test.go
new file mode 100644
index 000..7737b1c
--- /dev/null
+++ b/e2e/common/istio_test.go
@@ -0,0 +1,55 @@
+// +build integration
+
+// To enable compilation of this file in Goland, go to "Settings -> Go -> 
Vendoring & Build Tags -> Custom Tags" and add "integration"
+
+/*
+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 common
+
+import (
+   "testing"
+
+   . "github.com/apache/camel-k/e2e/support"
+   camelv1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+
+   . "github.com/onsi/gomega"
+
+   v1 "k8s.io/api/core/v1"
+)
+
+func TestIstioTrait(t *testing.T) {
+   WithNewTestNamespace(t, func(ns string) {
+   Expect(Kamel("install", "-n", ns).Execute()).Should(BeNil())
+
+   t.Run("Run Java with Istio", func(t *testing.T) {
+   Expect(Kamel("run", "-n", ns, "files/Java.java",
+   "-t", 
"istio.enabled=true").Execute()).Should(BeNil())
+   Eventually(IntegrationPodPhase(ns, "java"), 
TestTimeoutLong).Should(Equal(v1.PodRunning))
+   Eventually(IntegrationCondition(ns, "java", 
camelv1.IntegrationConditionReady), 
TestTimeoutShort).Should(Equal(v1.ConditionTrue))
+   Eventually(IntegrationLogs(ns, "java"), 
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+   pod := IntegrationPod(ns, "java")()
+   Expect(pod.ObjectMeta.Annotations).ShouldNot(BeNil())
+   annotations := pod.ObjectMeta.Annotations
+   
Expect(annotations["sidecar.istio.io/inject"]).Should(Equal("true"))
+   
Expect(annotations["traffic.sidecar.istio.io/includeOutboundIPRanges"]).Should(Equal("10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"))
+
+   Expect(Kamel("delete", "--all", "-n", 
ns).Execute()).Should(BeNil())
+   })
+   })
+}



[GitHub] [camel-k] astefanutti commented on pull request #1885: chore(e2e): add test for Istio trait #1547

2021-01-07 Thread GitBox


astefanutti commented on pull request #1885:
URL: https://github.com/apache/camel-k/pull/1885#issuecomment-756603288


   Thanks!



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] jamesnetherton commented on a change in pull request #2116: Minio native support #2040

2021-01-07 Thread GitBox


jamesnetherton commented on a change in pull request #2116:
URL: https://github.com/apache/camel-quarkus/pull/2116#discussion_r553785888



##
File path: 
integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java
##
@@ -0,0 +1,59 @@
+/*
+ * 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.quarkus.component.minio.it;
+
+import java.time.Duration;
+import java.util.Map;
+
+import 
org.apache.camel.quarkus.testcontainers.ContainerResourceLifecycleManager;
+import org.apache.camel.util.CollectionHelper;
+import org.testcontainers.containers.GenericContainer;
+import org.testcontainers.containers.wait.strategy.HttpWaitStrategy;
+
+public class MinioTestResource implements ContainerResourceLifecycleManager {
+
+public static final String CONTAINER_ACCESS_KEY = "MINIO_ACCESS_KEY";
+public static final String CONTAINER_SECRET_KEY = "MINIO_SECRET_KEY";
+private final String CONTAINER_IMAGE = "minio/minio:latest";

Review comment:
   Can we avoid the `latest` tag and pin to something else?





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: Update README.md

2021-01-07 Thread 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 a54f389  Update README.md
a54f389 is described below

commit a54f3894ae2b031b22e9bf3bfec7f46f87aefdfb
Author: Shubham Karwasara <68113233+shubham0...@users.noreply.github.com>
AuthorDate: Fri Jan 8 11:41:34 2021 +0530

Update README.md
---
 README.md | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 79f99b2..bb54254 100644
--- a/README.md
+++ b/README.md
@@ -135,17 +135,17 @@ code and source code.
 The following provides more details on the included cryptographic
 software:
 
-* **camel-ahc** can be configured to use https
-* **camel-atmosphere-websocket** can be used for secure communications
-* **camel-crypto** can be used for secure communications
-* **camel-cxf** can be configured for secure communications
-* **camel-ftp** can be configured for secure communications
-* **camel-http** can be configured to use https
-* **camel-infinispan** can be configured for secure communications
-* **camel-jasypt** can be used for secure communications
-* **camel-jetty** can be configured to use https
-* **camel-mail** can be configured for secure communications
-* **camel-nagios** can be configured for secure communications
-* **camel-netty-http** can be configured to use https
-* **camel-undertow** can be configured to use https
-* **camel-xmlsecurity** can be configured for secure communications
+* **camel-ahc** can be configured to use https.
+* **camel-atmosphere-websocket** can be used for secure communications.
+* **camel-crypto** can be used for secure communications.
+* **camel-cxf** can be configured for secure communications.
+* **camel-ftp** can be configured for secure communications.
+* **camel-http** can be configured to use https.
+* **camel-infinispan** can be configured for secure communications.
+* **camel-jasypt** can be used for secure communications.
+* **camel-jetty** can be configured to use https.
+* **camel-mail** can be configured for secure communications.
+* **camel-nagios** can be configured for secure communications.
+* **camel-netty-http** can be configured to use https.
+* **camel-undertow** can be configured to use https.
+* **camel-xmlsecurity** can be configured for secure communications.



[GitHub] [camel] oscerd merged pull request #4841: Update README.md

2021-01-07 Thread GitBox


oscerd merged pull request #4841:
URL: https://github.com/apache/camel/pull/4841


   



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 regen_bot updated (517fa5f -> e87598e)

2021-01-07 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 517fa5f  Sync deps
 add e87598e  add more asserts

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java  |  4 ++--
 .../test/java/org/apache/camel/util/SensitiveUtilsTest.java  | 12 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)



[camel] branch master updated: add more asserts

2021-01-07 Thread bvahdat
This is an automated email from the ASF dual-hosted git repository.

bvahdat 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 e87598e  add more asserts
e87598e is described below

commit e87598effcc947f127fccdbfa4aa49bc5468be07
Author: Babak Vahdat 
AuthorDate: Fri Jan 8 07:14:52 2021 +0100

add more asserts
---
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java  |  4 ++--
 .../test/java/org/apache/camel/util/SensitiveUtilsTest.java  | 12 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git 
a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java 
b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 89923ba..2484907 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -24,8 +24,8 @@ import java.util.Set;
 
 public final class SensitiveUtils {
 private static final Set SENSITIVE_KEYS = new HashSet<>(
-Arrays.asList("passphrase", "password", "secretkey", 
"accesstoken", "clientsecret", "authorizationtoken",
-"sasljaasconfig", "accesskey"));
+Arrays.asList("accesskey", "accesstoken", "authorizationtoken", 
"clientsecret", "passphrase", "password",
+"sasljaasconfig", "secretkey"));
 
 private SensitiveUtils() {
 }
diff --git 
a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java 
b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
index 90ace7f..9a8a46d 100644
--- 
a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
+++ 
b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
@@ -19,14 +19,24 @@ package org.apache.camel.util;
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class SensitiveUtilsTest {
 
 @Test
 void testContainsSensitive() {
 assertTrue(SensitiveUtils.containsSensitive("accessKey"));
+assertTrue(SensitiveUtils.containsSensitive("accesstoken"));
+assertTrue(SensitiveUtils.containsSensitive("authorizationtoken"));
+assertTrue(SensitiveUtils.containsSensitive("clientsecret"));
 assertTrue(SensitiveUtils.containsSensitive("passphrase"));
+assertTrue(SensitiveUtils.containsSensitive("password"));
+assertTrue(SensitiveUtils.containsSensitive("sasljaasconfig"));
+assertTrue(SensitiveUtils.containsSensitive("secretkey"));
+
+assertFalse(SensitiveUtils.containsSensitive("foo"));
+assertFalse(SensitiveUtils.containsSensitive("bar"));
 }
 
 }



[GitHub] [camel] shubham0824 opened a new pull request #4841: Update README.md

2021-01-07 Thread GitBox


shubham0824 opened a new pull request #4841:
URL: https://github.com/apache/camel/pull/4841


   - [ ] Make sure there is a [JIRA 
issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change 
(usually before you start working on it).  Trivial changes like typos do not 
require a JIRA issue.  Your pull request should address just this issue, 
without pulling in other changes.
   - [ ] Each commit in the pull request should have a meaningful subject line 
and body.
   - [ ] If you're unsure, you can format the pull request title like 
`[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` 
with the appropriate JIRA issue.
   - [ ] Write a pull request description that is detailed enough to understand 
what the pull request does, how, and why.
   - [ ] Run `mvn clean install -Psourcecheck` in your module with source check 
enabled to make sure basic checks pass and there are no checkstyle violations. 
A more thorough check will be performed on your pull request automatically.
   Below are the contribution guidelines:
   https://github.com/apache/camel/blob/master/CONTRIBUTING.md



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] github-actions[bot] commented on issue #2065: [CI] - Quarkus Master Branch Build Failure

2021-01-07 Thread GitBox


github-actions[bot] commented on issue #2065:
URL: https://github.com/apache/camel-quarkus/issues/2065#issuecomment-756550069


   The 
[quarkus-master](https://github.com/apache/camel-quarkus/tree/quarkus-master) 
branch build is still failing:
   
   * Build ID: 470631376-260-c29a74eb-0132-4fd0-b942-90525afe1da8
   * Camel Quarkus Commit: 232a4e46c03e6ae0ae43c80613e62d00c9419bfd
   
   * Quarkus Master Commit: 4b47002a08db117ef02223e87d8d8af73b98dfbc
   * Link to build: 
https://github.com/apache/camel-quarkus/actions/runs/470631376



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-k] tadayosi opened a new pull request #1885: chore(e2e): add test for Istio trait #1547

2021-01-07 Thread GitBox


tadayosi opened a new pull request #1885:
URL: https://github.com/apache/camel-k/pull/1885


   
   
   A very basic e2e test for Istio trait to serve as a testbed for later 
enhancements. We can enhance it later if need be.
   
   
   
   
   **Release Note**
   ```release-note
   NONE
   ```
   



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] ruchirvaninasdaq edited a comment on issue #834: Question: S3 file get moved on failure also

2021-01-07 Thread GitBox


ruchirvaninasdaq edited a comment on issue #834:
URL: 
https://github.com/apache/camel-kafka-connector/issues/834#issuecomment-756419315


   Thanks for the feedback. I will update my config. 
   
   I have seen that if Kafka-cluster went down it marked as exchange completed. 
What is a better way to handle the Kafka exception with Kafka connector? (My 
cluster was up, it was processing but when the cluster went down for first 
messages it marked as Exchange completed and later it started failing but for 
the first message, it didn't fail and it never went to kafka topic)
   
   Thanks



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] ruchirvaninasdaq commented on issue #834: Question: S3 file get moved on failure also

2021-01-07 Thread GitBox


ruchirvaninasdaq commented on issue #834:
URL: 
https://github.com/apache/camel-kafka-connector/issues/834#issuecomment-756419315


   Thanks for the feedback. I will update my config. 
   
   I have seen that if Kafka-cluster went down it marked as exchange completed. 
What is a better way to handle the Kafka exception with Kafka connector? 
   
   Thanks



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 issue #834: Question: S3 file get moved on failure also

2021-01-07 Thread GitBox


oscerd commented on issue #834:
URL: 
https://github.com/apache/camel-kafka-connector/issues/834#issuecomment-756412993


   The failure in serialization happens at kafka level, so it is expected to
   find the file in the destination bucket. In terms of pure camel the
   exchange is complete. The error should be managed at kafka level. Also you
   should use single options and not camel.source.url. just one or the other.
   Camel.source.url is not the usual suggested apptoach
   
   Il gio 7 gen 2021, 22:25 Ruchir Vani  ha scritto:
   
   > I expected this behavior based on this:
   > 
https://github.com/apache/camel-kafka-connector/blob/dd9ccfa5dc2a0740ef1ed636cf999da41e6bbbcb/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java#L270
   >
   > —
   > You are receiving this because you are subscribed to this thread.
   > Reply to this email directly, view it on GitHub
   > 
,
   > or unsubscribe
   > 

   > .
   >
   



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] ruchirvaninasdaq commented on issue #834: Question: S3 file get moved on failure also

2021-01-07 Thread GitBox


ruchirvaninasdaq commented on issue #834:
URL: 
https://github.com/apache/camel-kafka-connector/issues/834#issuecomment-756394830


   I expected this behavior based on this: 
https://github.com/apache/camel-kafka-connector/blob/dd9ccfa5dc2a0740ef1ed636cf999da41e6bbbcb/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/CamelAws2s3SourceConnectorConfig.java#L270



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] ruchirvaninasdaq commented on issue #834: Question: S3 file get moved on failure also

2021-01-07 Thread GitBox


ruchirvaninasdaq commented on issue #834:
URL: 
https://github.com/apache/camel-kafka-connector/issues/834#issuecomment-756393630


   Adding Serializer code also if that helps: 
   ```
   public class S3ObjectAvroSerializer implements 
Serializer> {
   
   private static final Logger LOG = 
LoggerFactory.getLogger(S3ObjectAvroSerializer.class);
   private Schema schema;
   private GenericRecordSerializer recordSerializer;
   private MessageFactory MessageFactory;
   
   public S3ObjectAvroSerializer(Schema schema){
   this.schema=schema;
   this.recordSerializer = new GenericRecordSerializer(this.schema);
   this.MessageFactory = new MessageFactory();
   }
   
   public S3ObjectAvroSerializer() throws IOException {
   Schema.Parser parser = new Schema.Parser();
   this.schema= 
parser.parse(getClass().getResourceAsStream("/avro/schema.avsc"));
   this.recordSerializer = new GenericRecordSerializer(this.schema);
   this.MessageFactory = new MessageFactory();
   }
   
   /**
* Create a Kafka serializer for control schema messages.
*/
   public Serializer getSerializer() {
   return new GenericRecordSerializer(this.schema);
   }
   
   @Override
   public void configure(Map configs, boolean isKey) {
   }
   
   @Override
   public byte[] serialize(String topic, 
ResponseInputStream inputStream) {
   GenericRecord record = null;
   try{
  record = MessageFactory.parseMessage(inputStream);
   }
   catch (Exception e){
   LOG.error("Error in Serializer: "+ e );
   e.printStackTrace();
   }
   return recordSerializer.doSerialize(topic, record);
   }
   
   @Override
   public void close() {
   
   }
   }
   ```



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] ruchirvaninasdaq opened a new issue #834: Question: S3 file get moved on failure also

2021-01-07 Thread GitBox


ruchirvaninasdaq opened a new issue #834:
URL: https://github.com/apache/camel-kafka-connector/issues/834


   Hello, 
   
   I am using the `aws2-s3-kafka-source-connector` connector 
(https://github.com/apache/camel-kafka-connector/tree/camel-kafka-connector-0.7.x/connectors/camel-aws2-s3-kafka-connector)
 with the following configs.
   
   ```
   apiVersion: kafka.strimzi.io/v1alpha1
   kind: KafkaConnector
   metadata:
 name: name-connector
 labels:
   strimzi.io/cluster: benzinga-kafka-connect-cluster
   spec:
 tasksMax: 1
 class: org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SourceConnector
 config:
   client.id: client
   topics: topic
   connector.class: 
org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SourceConnector
   key.converter: org.apache.kafka.connect.storage.StringConverter
   value.converter: 
org.apache.camel.kafkaconnector.aws2s3.converters.S3ObjectConverter
   camel.source.kafka.topic: topic
   camel.source.url: 
aws2-s3://source-bucket?useDefaultCredentialsProvider=true&moveAfterRead=true&destinationBucket=destination-bucket
   camel.source.maxPollDuration: 10
   camel.source.maxBatchPollSize: 1000
   camel.component.aws2-s3.includeBody: false
   camel.source.endpoint.useDefaultCredentialsProvider : true
   camel.component.aws2-s3.autocloseBody : true
   ```
   
   I have updated the S3objectConverter for my customization for searlizer. 
Code is as follows: 
   ```
   public class S3ObjectConverter implements Converter {
   
   private static final Logger LOG = 
LoggerFactory.getLogger(S3ObjectConverter.class);
   //private final S3ObjectSerializer serializer = new S3ObjectSerializer();
   private final S3ObjectAvroSerializer serializer;
   
   public S3ObjectConverter() throws IOException {
   serializer = new S3ObjectAvroSerializer();
   }
   
   @Override
   public void configure(Map configs, boolean isKey) {
   }
   
   @Override
   public byte[] fromConnectData(String topic, Schema schema, Object value) 
{
   return serializer.serialize(topic, 
(ResponseInputStream)value);
   }
   
   @Override
   public SchemaAndValue toConnectData(String arg0, byte[] arg1) {
   return null;
   }
   
   }
   ```
   
   This works as expected and the object gets serialize as expected and added 
to Kafka topic and files get moved to destination-bucket also. 
   
   I have problem with on failure cases: 
   When the object fail on seralization, even after that it moves to 
destinationbucket (I expect it to stay in source bucket), Is there any config 
am I using wrong? 
   
   Thank you. 
   
   



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 a change in pull request #2116: Minio native support #2040

2021-01-07 Thread GitBox


aldettinger commented on a change in pull request #2116:
URL: https://github.com/apache/camel-quarkus/pull/2116#discussion_r553497247



##
File path: docs/modules/ROOT/pages/reference/extensions/minio.adoc
##
@@ -31,3 +31,11 @@ Please refer to the above link for usage and configuration 
details.
 
 
 Check the xref:user-guide/index.adoc[User guide] for more information about 
writing Camel Quarkus applications.
+
+== Camel Quarkus limitations
+
+This extension leverages the Quarkiverse Minio. Standard 
application.properties mechanism is used to define connection (see 
http://github.com/quarkiverse/quarkiverse-minio#configuration-reference[documentation]).
+
+It is mandatory to configure the Minio client in properties and Camel will 
autowire client into the Mino component.

Review comment:
   Small typo here Mino => Minio ?





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 pull request #2105: Remove hystrix from test-categories.yaml

2021-01-07 Thread GitBox


aldettinger commented on pull request #2105:
URL: https://github.com/apache/camel-quarkus/pull/2105#issuecomment-756285162


   @llowinge May you please rebase on master and force push as the CI should be 
fixed now.



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 regen_bot updated (48282b1 -> 517fa5f)

2021-01-07 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 48282b1  polish
 add 0fd780a  Upgrade AWS SDK v2 to version 2.15.60
 add 517fa5f  Sync deps

No new revisions were added by this update.

Summary of changes:
 camel-dependencies/pom.xml | 2 +-
 parent/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



[camel] branch regen_bot updated (285c6d3 -> 48282b1)

2021-01-07 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 285c6d3  make use of HashSet#contains instead of streaming + regex 
which is slower
 add 48282b1  polish

No new revisions were added by this update.

Summary of changes:
 .../camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)



[camel] branch regen_bot updated (566c16f -> 285c6d3)

2021-01-07 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 566c16f  Regen for commit 767e963e2084899ed4043f22cc8ed5346342dfaf
 add 285c6d3  make use of HashSet#contains instead of streaming + regex 
which is slower

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java  | 9 ++---
 .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)



[camel] branch master updated (48282b1 -> 517fa5f)

2021-01-07 Thread 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 48282b1  polish
 new 0fd780a  Upgrade AWS SDK v2 to version 2.15.60
 new 517fa5f  Sync deps

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] 02/02: Sync deps

2021-01-07 Thread 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 517fa5ff10b4de3c596b0a789a97e7fccb0ef81c
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 18:24:05 2021 +0100

Sync deps
---
 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 dd146e1..b2f6499 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -71,7 +71,7 @@
 4.0.3
 1.11.22
 1.11.714
-2.15.58
+2.15.60
 2.6.1
 1.2.14
 
1.3.1



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

2021-01-07 Thread 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 0fd780a2bc20d5489fa12d054ab4ee99540c7d43
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:37:48 2021 +0100

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

diff --git a/parent/pom.xml b/parent/pom.xml
index c531b3a..2589060 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,7 @@
 1.10.0
 4.0.3
 1.11.714
-2.15.58
+2.15.60
 1.11.22
 2.6.1
 1.2.14



[GitHub] [camel] orpiske commented on pull request #4840: make use of HashSet#contains instead of streaming + regex which is slower

2021-01-07 Thread GitBox


orpiske commented on pull request #4840:
URL: https://github.com/apache/camel/pull/4840#issuecomment-756259099


   > cc @orpiske, I believe we should backport this new stuff to 3.7.x too.
   
   +1. I'll do that tomorrow.



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: polish

2021-01-07 Thread bvahdat
This is an automated email from the ASF dual-hosted git repository.

bvahdat 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 48282b1  polish
48282b1 is described below

commit 48282b1b29908a04736137879418f3245d421033
Author: Babak Vahdat 
AuthorDate: Thu Jan 7 18:10:21 2021 +0100

polish
---
 .../camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java 
b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index ae7691f..89923ba 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -23,12 +23,11 @@ import java.util.Locale;
 import java.util.Set;
 
 public final class SensitiveUtils {
-public static final Set SENSITIVE_KEYS = new HashSet<>(
+private static final Set SENSITIVE_KEYS = new HashSet<>(
 Arrays.asList("passphrase", "password", "secretkey", 
"accesstoken", "clientsecret", "authorizationtoken",
 "sasljaasconfig", "accesskey"));
 
 private SensitiveUtils() {
-
 }
 
 public static boolean containsSensitive(String text) {



[camel] branch sensitive-utils deleted (was 285c6d3)

2021-01-07 Thread bvahdat
This is an automated email from the ASF dual-hosted git repository.

bvahdat pushed a change to branch sensitive-utils
in repository https://gitbox.apache.org/repos/asf/camel.git.


 was 285c6d3  make use of HashSet#contains instead of streaming + regex 
which is slower

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.



[GitHub] [camel] asfgit merged pull request #4840: make use of HashSet#contains instead of streaming + regex which is slower

2021-01-07 Thread GitBox


asfgit merged pull request #4840:
URL: https://github.com/apache/camel/pull/4840


   



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 (566c16f -> 285c6d3)

2021-01-07 Thread bvahdat
This is an automated email from the ASF dual-hosted git repository.

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


from 566c16f  Regen for commit 767e963e2084899ed4043f22cc8ed5346342dfaf
 add 285c6d3  make use of HashSet#contains instead of streaming + regex 
which is slower

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java  | 9 ++---
 .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)



[camel] branch regen_bot updated (7191c38 -> 566c16f)

2021-01-07 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.


omit 7191c38  Regen for commit 767e963e2084899ed4043f22cc8ed5346342dfaf
 add 566c16f  Regen for commit 767e963e2084899ed4043f22cc8ed5346342dfaf

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (7191c38)
\
 N -- N -- N   refs/heads/regen_bot (566c16f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:



[camel] 01/01: make use of HashSet#contains instead of streaming + regex which is slower

2021-01-07 Thread bvahdat
This is an automated email from the ASF dual-hosted git repository.

bvahdat pushed a commit to branch sensitive-utils
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 285c6d3bc49b5edea6a9b39b4ff742c780b1c74b
Author: Babak Vahdat 
AuthorDate: Thu Jan 7 17:45:42 2021 +0100

make use of HashSet#contains instead of streaming + regex which is slower
---
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java  | 9 ++---
 .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java 
b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 9854fec..ae7691f 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -18,17 +18,20 @@
 package org.apache.camel.util;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Locale;
+import java.util.Set;
 
 public final class SensitiveUtils {
-public static final String SENSITIVE_KEYS
-= 
"passphrase|password|secretkey|accesstoken|clientsecret|authorizationtoken|sasljaasconfig|accesskey";
+public static final Set SENSITIVE_KEYS = new HashSet<>(
+Arrays.asList("passphrase", "password", "secretkey", 
"accesstoken", "clientsecret", "authorizationtoken",
+"sasljaasconfig", "accesskey"));
 
 private SensitiveUtils() {
 
 }
 
 public static boolean containsSensitive(String text) {
-return Arrays.stream(SENSITIVE_KEYS.split("\\|")).anyMatch(s -> 
text.toLowerCase(Locale.ENGLISH).contains(s));
+return SENSITIVE_KEYS.contains(text.toLowerCase(Locale.ENGLISH));
 }
 }
diff --git 
a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java 
b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
index 08fd28e..90ace7f 100644
--- 
a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
+++ 
b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
@@ -26,7 +26,7 @@ class SensitiveUtilsTest {
 @Test
 void testContainsSensitive() {
 assertTrue(SensitiveUtils.containsSensitive("accessKey"));
-assertTrue(SensitiveUtils.containsSensitive("accesskey"));
+assertTrue(SensitiveUtils.containsSensitive("passphrase"));
 }
 
 }



[camel] branch sensitive-utils updated (1a539a8 -> 285c6d3)

2021-01-07 Thread bvahdat
This is an automated email from the ASF dual-hosted git repository.

bvahdat pushed a change to branch sensitive-utils
in repository https://gitbox.apache.org/repos/asf/camel.git.


 discard 1a539a8  make use of HashSet#contains instead of streaming + regex 
which is slower
 add 566c16f  Regen for commit 767e963e2084899ed4043f22cc8ed5346342dfaf
 new 285c6d3  make use of HashSet#contains instead of streaming + regex 
which is slower

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (1a539a8)
\
 N -- N -- N   refs/heads/sensitive-utils (285c6d3)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

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:
 .../resources/org/apache/camel/catalog/docs/activemq-component.adoc   | 4 ++--
 .../resources/org/apache/camel/catalog/docs/amqp-component.adoc   | 4 ++--
 .../resources/org/apache/camel/component/activemq/activemq.json   | 4 ++--
 components/camel-activemq/src/main/docs/activemq-component.adoc   | 4 ++--
 .../src/generated/resources/org/apache/camel/component/amqp/amqp.json | 4 ++--
 components/camel-amqp/src/main/docs/amqp-component.adoc   | 4 ++--
 .../camel/builder/component/dsl/ActivemqComponentBuilderFactory.java  | 2 +-
 .../camel/builder/component/dsl/AmqpComponentBuilderFactory.java  | 2 +-
 .../apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java | 4 ++--
 .../camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java| 4 ++--
 docs/components/modules/ROOT/pages/activemq-component.adoc| 4 ++--
 docs/components/modules/ROOT/pages/amqp-component.adoc| 4 ++--
 12 files changed, 22 insertions(+), 22 deletions(-)



[camel-quarkus] branch master updated: CSimple NPE even if CSimple language is not used #2103

2021-01-07 Thread ppalaga
This is an automated email from the ASF dual-hosted git repository.

ppalaga 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 4b47002  CSimple NPE even if CSimple language is not used #2103
4b47002 is described below

commit 4b47002a08db117ef02223e87d8d8af73b98dfbc
Author: Peter Palaga 
AuthorDate: Wed Jan 6 21:05:20 2021 +0100

CSimple NPE even if CSimple language is not used #2103
---
 catalog/pom.xml|  13 ++
 .../ROOT/pages/reference/extensions/core.adoc  |   1 -
 .../ROOT/pages/reference/extensions/csimple.adoc   |  56 +++
 .../ROOT/partials/reference/languages/csimple.adoc |  10 +-
 .../core/runtime/src/main/adoc/limitations.adoc|  17 ---
 extensions/csimple/deployment/pom.xml  |  63 
 .../CSimpleExpressionSourceBuildItem.java  |   2 +-
 .../csimple/deployment/CSimpleProcessor.java   |  18 ++-
 .../csimple}/deployment/CSimpleXmlProcessor.java   |  75 +-
 extensions/csimple/pom.xml |  39 +
 extensions/csimple/runtime/pom.xml | 110 ++
 .../csimple/runtime/src/main/doc/limitations.adoc  |  19 +++
 .../csimple}/CSimpleLanguageRecorder.java  |   2 +-
 .../resources/META-INF}/quarkus-extension.yaml |  23 +--
 extensions/pom.xml |   1 +
 .../apache/camel/quarkus/core/CoreResource.java|   9 --
 .../org/apache/camel/quarkus/core/CoreRoutes.java  |   3 -
 .../org/apache/camel/quarkus/core/CoreTest.java|  11 --
 integration-tests/csimple/pom.xml  | 166 +
 .../component/csimple/it/CSimpleResource.java  |  51 +++
 .../component/csimple/it/CSimpleRoute.java}|  12 +-
 .../src/main/resources/application.properties  |  18 +++
 .../src/main/resources/routes/my-routes.xml|  17 ---
 .../quarkus/component/csimple/it/CSimpleIT.java}   |  19 +--
 .../quarkus/component/csimple/it/CSimpleTest.java} |  36 +++--
 .../camel/quarkus/main/CoreMainXmlIoResource.java  |   7 -
 .../src/main/resources/routes/my-routes.xml|   7 -
 .../camel/quarkus/main/CoreMainXmlIoTest.java  |  10 --
 .../apache/camel/quarkus/main/CoreMainTest.java|   3 +-
 integration-tests/pom.xml  |   1 +
 pom.xml|   2 +-
 poms/bom/pom.xml   |  10 ++
 .../quarkus-extension.yaml |   2 +-
 .../org/apache/camel/quarkus/maven/CqCatalog.java  |  22 ++-
 tooling/scripts/test-categories.yaml   |   1 +
 35 files changed, 659 insertions(+), 197 deletions(-)

diff --git a/catalog/pom.xml b/catalog/pom.xml
index beddd47..feaa238 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -1141,6 +1141,19 @@
 
 
 org.apache.camel.quarkus
+camel-quarkus-csimple
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
 camel-quarkus-csv
 ${project.version}
 pom
diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc 
b/docs/modules/ROOT/pages/reference/extensions/core.adoc
index 5ce8699..ae0138b 100644
--- a/docs/modules/ROOT/pages/reference/extensions/core.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc
@@ -18,7 +18,6 @@ Camel core functionality and basic Camel languages: Constant, 
ExchangeProperty,
 == What's inside
 
 * xref:{cq-camel-components}:languages:constant-language.adoc[Constant 
language]
-* xref:{cq-camel-components}:languages:csimple-language.adoc[CSimple language]
 * 
xref:{cq-camel-components}:languages:exchangeProperty-language.adoc[ExchangeProperty
 language]
 * xref:{cq-camel-components}:languages:file-language.adoc[File language]
 * xref:{cq-camel-components}:languages:header-language.adoc[Header language]
diff --git a/docs/modules/ROOT/pages/reference/extensions/csimple.adoc 
b/docs/modules/ROOT/pages/reference/extensions/csimple.adoc
new file mode 100644
index 000..26cbff3
--- /dev/null
+++ b/docs/modules/ROOT/pages/reference/extensions/csimple.adoc
@@ -0,0 +1,56 @@
+// Do not edit directly!
+// This file was generated by 
camel-quarkus-maven-plugin:update-extension-doc-page
+= CSimple
+:cq-artifact-id: camel-quarkus-csimple
+:cq-native-supported: true
+:cq-status: Stable
+:cq-description: Compiled Simple language
+:cq-deprecated: false
+:cq-jvm-since: 1.5.0
+:cq-native-since: 1.5.0
+
+[.badges]
+[.badge-key]##JVM since##[.badge-supported]##1.5.0## [.badge-key]##Native 
since##[.badge-supported]##1.5.0##
+
+Compiled Simple language
+
+== What's inside
+
+* xref:{cq-camel-components}:languages:csimple-language.adoc[CSimple language]
+
+Plea

[GitHub] [camel-quarkus] ppalaga merged pull request #2108: CSimple NPE even if CSimple language is not used

2021-01-07 Thread GitBox


ppalaga merged pull request #2108:
URL: https://github.com/apache/camel-quarkus/pull/2108


   



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] ppalaga closed pull request #2103: CSimple NPE even if CSimple language is not used

2021-01-07 Thread GitBox


ppalaga closed pull request #2103:
URL: https://github.com/apache/camel-quarkus/pull/2103


   



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] bvahdat commented on pull request #4840: make use of HashSet#contains instead of streaming + regex which is slower

2021-01-07 Thread GitBox


bvahdat commented on pull request #4840:
URL: https://github.com/apache/camel/pull/4840#issuecomment-756237163


   Also corrected the typo in the class `SensitiveUtilsTest`.



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] bvahdat opened a new pull request #4840: make use of HashSet#contains instead of streaming + regex which is slower

2021-01-07 Thread GitBox


bvahdat opened a new pull request #4840:
URL: https://github.com/apache/camel/pull/4840


   - [x] Make sure there is a [JIRA 
issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change 
(usually before you start working on it).  Trivial changes like typos do not 
require a JIRA issue.  Your pull request should address just this issue, 
without pulling in other changes.
   - [x] Each commit in the pull request should have a meaningful subject line 
and body.
   - [x] If you're unsure, you can format the pull request title like 
`[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` 
with the appropriate JIRA issue.
   - [x] Write a pull request description that is detailed enough to understand 
what the pull request does, how, and why.
   - [x] Run `mvn clean install -Psourcecheck` in your module with source check 
enabled to make sure basic checks pass and there are no checkstyle violations. 
A more thorough check will be performed on your pull request automatically.
   Below are the contribution guidelines:
   https://github.com/apache/camel/blob/master/CONTRIBUTING.md



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] 03/03: Jenkinsfile.jdk16: Point to Camel-3.7.x branch

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

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

commit 0689956dbe98c41db132766f09c517ef8c12557f
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:45:06 2021 +0100

Jenkinsfile.jdk16: Point to Camel-3.7.x branch
---
 Jenkinsfile.jdk16 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.jdk16 b/Jenkinsfile.jdk16
index 4b95f71..801c01d 100644
--- a/Jenkinsfile.jdk16
+++ b/Jenkinsfile.jdk16
@@ -60,7 +60,7 @@ pipeline {
 
 stage('Build & Deploy') {
 when {
-branch 'master'
+branch 'camel-3.7.x'
 }
 steps {
 sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean 
install"



[camel] branch sensitive-utils created (now 1a539a8)

2021-01-07 Thread bvahdat
This is an automated email from the ASF dual-hosted git repository.

bvahdat pushed a change to branch sensitive-utils
in repository https://gitbox.apache.org/repos/asf/camel.git.


  at 1a539a8  make use of HashSet#contains instead of streaming + regex 
which is slower

This branch includes the following new commits:

 new 1a539a8  make use of HashSet#contains instead of streaming + regex 
which is slower

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] 01/01: make use of HashSet#contains instead of streaming + regex which is slower

2021-01-07 Thread bvahdat
This is an automated email from the ASF dual-hosted git repository.

bvahdat pushed a commit to branch sensitive-utils
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 1a539a8cf5093788d9e38cdab4273452483f8cb3
Author: Babak Vahdat 
AuthorDate: Thu Jan 7 17:45:42 2021 +0100

make use of HashSet#contains instead of streaming + regex which is slower
---
 .../src/main/java/org/apache/camel/util/SensitiveUtils.java  | 9 ++---
 .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java 
b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 9854fec..ae7691f 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -18,17 +18,20 @@
 package org.apache.camel.util;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Locale;
+import java.util.Set;
 
 public final class SensitiveUtils {
-public static final String SENSITIVE_KEYS
-= 
"passphrase|password|secretkey|accesstoken|clientsecret|authorizationtoken|sasljaasconfig|accesskey";
+public static final Set SENSITIVE_KEYS = new HashSet<>(
+Arrays.asList("passphrase", "password", "secretkey", 
"accesstoken", "clientsecret", "authorizationtoken",
+"sasljaasconfig", "accesskey"));
 
 private SensitiveUtils() {
 
 }
 
 public static boolean containsSensitive(String text) {
-return Arrays.stream(SENSITIVE_KEYS.split("\\|")).anyMatch(s -> 
text.toLowerCase(Locale.ENGLISH).contains(s));
+return SENSITIVE_KEYS.contains(text.toLowerCase(Locale.ENGLISH));
 }
 }
diff --git 
a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java 
b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
index 08fd28e..90ace7f 100644
--- 
a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
+++ 
b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java
@@ -26,7 +26,7 @@ class SensitiveUtilsTest {
 @Test
 void testContainsSensitive() {
 assertTrue(SensitiveUtils.containsSensitive("accessKey"));
-assertTrue(SensitiveUtils.containsSensitive("accesskey"));
+assertTrue(SensitiveUtils.containsSensitive("passphrase"));
 }
 
 }



[camel] branch camel-3.7.x updated (16048da -> 0689956)

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

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


from 16048da  Jenkinsfile.deploy: Point to camel-3.7.x branch
 new 1506cf4  Jenkinsfile.jdk11: Point to Camel-3.7.x branch
 new 32b5e23  Jenkinsfile.jdk14: Point to Camel-3.7.x branch
 new 0689956  Jenkinsfile.jdk16: Point to Camel-3.7.x branch

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:
 Jenkinsfile.jdk11 | 2 +-
 Jenkinsfile.jdk14 | 2 +-
 Jenkinsfile.jdk16 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



[camel] 01/03: Jenkinsfile.jdk11: Point to Camel-3.7.x branch

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

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

commit 1506cf4592859641fb7970d3f5f4b022faafb491
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:43:47 2021 +0100

Jenkinsfile.jdk11: Point to Camel-3.7.x branch
---
 Jenkinsfile.jdk11 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.jdk11 b/Jenkinsfile.jdk11
index 87c7391..e67d886 100644
--- a/Jenkinsfile.jdk11
+++ b/Jenkinsfile.jdk11
@@ -60,7 +60,7 @@ pipeline {
 
 stage('Build & Deploy') {
 when {
-branch 'master'
+branch 'camel-3.7.x'
 }
 steps {
 sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean 
install"



[camel] 02/03: Jenkinsfile.jdk14: Point to Camel-3.7.x branch

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

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

commit 32b5e23ee3d07732a194970fe68b0c79de39d1cb
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:44:30 2021 +0100

Jenkinsfile.jdk14: Point to Camel-3.7.x branch
---
 Jenkinsfile.jdk14 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.jdk14 b/Jenkinsfile.jdk14
index ad8f8a9..93f243c 100644
--- a/Jenkinsfile.jdk14
+++ b/Jenkinsfile.jdk14
@@ -60,7 +60,7 @@ pipeline {
 
 stage('Build & Deploy') {
 when {
-branch 'master'
+branch 'camel-3.7.x'
 }
 steps {
 sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean 
install"



[GitHub] [camel] oscerd merged pull request #4839: Oscerd patch 1

2021-01-07 Thread GitBox


oscerd merged pull request #4839:
URL: https://github.com/apache/camel/pull/4839


   



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] oscerd opened a new pull request #4839: Oscerd patch 1

2021-01-07 Thread GitBox


oscerd opened a new pull request #4839:
URL: https://github.com/apache/camel/pull/4839


   - [ ] Make sure there is a [JIRA 
issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change 
(usually before you start working on it).  Trivial changes like typos do not 
require a JIRA issue.  Your pull request should address just this issue, 
without pulling in other changes.
   - [ ] Each commit in the pull request should have a meaningful subject line 
and body.
   - [ ] If you're unsure, you can format the pull request title like 
`[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` 
with the appropriate JIRA issue.
   - [ ] Write a pull request description that is detailed enough to understand 
what the pull request does, how, and why.
   - [ ] Run `mvn clean install -Psourcecheck` in your module with source check 
enabled to make sure basic checks pass and there are no checkstyle violations. 
A more thorough check will be performed on your pull request automatically.
   Below are the contribution guidelines:
   https://github.com/apache/camel/blob/master/CONTRIBUTING.md



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 oscerd-patch-1 updated: Jenkinsfile.jdk16: Point to Camel-3.7.x branch

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch oscerd-patch-1
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/oscerd-patch-1 by this push:
 new d0d8614  Jenkinsfile.jdk16: Point to Camel-3.7.x branch
d0d8614 is described below

commit d0d8614455b25a295e5292c2a143fd6eb729605a
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:45:06 2021 +0100

Jenkinsfile.jdk16: Point to Camel-3.7.x branch
---
 Jenkinsfile.jdk16 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.jdk16 b/Jenkinsfile.jdk16
index 4b95f71..801c01d 100644
--- a/Jenkinsfile.jdk16
+++ b/Jenkinsfile.jdk16
@@ -60,7 +60,7 @@ pipeline {
 
 stage('Build & Deploy') {
 when {
-branch 'master'
+branch 'camel-3.7.x'
 }
 steps {
 sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean 
install"



[camel] branch oscerd-patch-1 updated: Jenkinsfile.jdk14: Point to Camel-3.7.x branch

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch oscerd-patch-1
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/oscerd-patch-1 by this push:
 new 389e23b  Jenkinsfile.jdk14: Point to Camel-3.7.x branch
389e23b is described below

commit 389e23bbbd87ad1026003194af7a5e2feeb6faed
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:44:30 2021 +0100

Jenkinsfile.jdk14: Point to Camel-3.7.x branch
---
 Jenkinsfile.jdk14 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.jdk14 b/Jenkinsfile.jdk14
index ad8f8a9..93f243c 100644
--- a/Jenkinsfile.jdk14
+++ b/Jenkinsfile.jdk14
@@ -60,7 +60,7 @@ pipeline {
 
 stage('Build & Deploy') {
 when {
-branch 'master'
+branch 'camel-3.7.x'
 }
 steps {
 sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean 
install"



[camel] 01/01: Jenkinsfile.jdk11: Point to Camel-3.7.x branch

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch oscerd-patch-1
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a4442f05c3387115b4cd58d37f6b8c7622c9edcb
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:43:47 2021 +0100

Jenkinsfile.jdk11: Point to Camel-3.7.x branch
---
 Jenkinsfile.jdk11 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.jdk11 b/Jenkinsfile.jdk11
index 87c7391..e67d886 100644
--- a/Jenkinsfile.jdk11
+++ b/Jenkinsfile.jdk11
@@ -60,7 +60,7 @@ pipeline {
 
 stage('Build & Deploy') {
 when {
-branch 'master'
+branch 'camel-3.7.x'
 }
 steps {
 sh "./mvnw $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean 
install"



[camel] branch oscerd-patch-1 created (now a4442f0)

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch oscerd-patch-1
in repository https://gitbox.apache.org/repos/asf/camel.git.


  at a4442f0  Jenkinsfile.jdk11: Point to Camel-3.7.x branch

This branch includes the following new commits:

 new a4442f0  Jenkinsfile.jdk11: Point to Camel-3.7.x branch

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] branch camel-3.7.x updated: Jenkinsfile.deploy: Point to camel-3.7.x branch

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/camel-3.7.x by this push:
 new 16048da  Jenkinsfile.deploy: Point to camel-3.7.x branch
16048da is described below

commit 16048daf9a028842ea57a87dcba2df09a55df0dd
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:42:24 2021 +0100

Jenkinsfile.deploy: Point to camel-3.7.x branch
---
 Jenkinsfile.deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile.deploy b/Jenkinsfile.deploy
index 4153a50..3f0b9f5 100644
--- a/Jenkinsfile.deploy
+++ b/Jenkinsfile.deploy
@@ -60,7 +60,7 @@ pipeline {
 
 stage('Build & Deploy') {
 when {
-branch 'master'
+branch 'camel-3.7.x'
 }
 steps {
 sh "./mvnw $MAVEN_PARAMS -Pdeploy -Dmaven.test.skip.exec=true 
clean deploy"



[GitHub] [camel] oscerd merged pull request #4838: Jenkinsfile.deploy: Point to camel-3.7.x branch

2021-01-07 Thread GitBox


oscerd merged pull request #4838:
URL: https://github.com/apache/camel/pull/4838


   



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 3.7.x-deploy created (now aa053c9)

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

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


  at aa053c9  Jenkinsfile.deploy: Point to camel-3.7.x branch

No new revisions were added by this update.



[GitHub] [camel] oscerd opened a new pull request #4838: Jenkinsfile.deploy: Point to camel-3.7.x branch

2021-01-07 Thread GitBox


oscerd opened a new pull request #4838:
URL: https://github.com/apache/camel/pull/4838


   - [ ] Make sure there is a [JIRA 
issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change 
(usually before you start working on it).  Trivial changes like typos do not 
require a JIRA issue.  Your pull request should address just this issue, 
without pulling in other changes.
   - [ ] Each commit in the pull request should have a meaningful subject line 
and body.
   - [ ] If you're unsure, you can format the pull request title like 
`[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` 
with the appropriate JIRA issue.
   - [ ] Write a pull request description that is detailed enough to understand 
what the pull request does, how, and why.
   - [ ] Run `mvn clean install -Psourcecheck` in your module with source check 
enabled to make sure basic checks pass and there are no checkstyle violations. 
A more thorough check will be performed on your pull request automatically.
   Below are the contribution guidelines:
   https://github.com/apache/camel/blob/master/CONTRIBUTING.md



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-3.7.x updated: Jenkinsfile build: Point to branch camel-3.7.x

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/camel-3.7.x by this push:
 new a459355  Jenkinsfile build: Point to branch camel-3.7.x
a459355 is described below

commit a4593559044701f4fe2b6db766681c06f4130880
Author: Andrea Cosentino 
AuthorDate: Thu Jan 7 17:40:21 2021 +0100

Jenkinsfile build: Point to branch camel-3.7.x
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 641735f..95d85c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -60,7 +60,7 @@ pipeline {
 
 stage('Build & Deploy') {
 when {
-branch 'master'
+branch 'camel-3.7.x'
 }
 steps {
 sh "./mvnw $MAVEN_PARAMS -Pdeploy -Dmaven.test.skip.exec=true 
clean deploy"



[camel] branch 3.7.x-jenkinsfile created (now b626744)

2021-01-07 Thread acosentino
This is an automated email from the ASF dual-hosted git repository.

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


  at b626744  Jenkinsfile build: Point to branch camel-3.7.x

No new revisions were added by this update.



[GitHub] [camel] oscerd merged pull request #4837: Jenkinsfile build: Point to branch camel-3.7.x

2021-01-07 Thread GitBox


oscerd merged pull request #4837:
URL: https://github.com/apache/camel/pull/4837


   



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] oscerd opened a new pull request #4837: Jenkinsfile build: Point to branch camel-3.7.x

2021-01-07 Thread GitBox


oscerd opened a new pull request #4837:
URL: https://github.com/apache/camel/pull/4837


   - [ ] Make sure there is a [JIRA 
issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change 
(usually before you start working on it).  Trivial changes like typos do not 
require a JIRA issue.  Your pull request should address just this issue, 
without pulling in other changes.
   - [ ] Each commit in the pull request should have a meaningful subject line 
and body.
   - [ ] If you're unsure, you can format the pull request title like 
`[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` 
with the appropriate JIRA issue.
   - [ ] Write a pull request description that is detailed enough to understand 
what the pull request does, how, and why.
   - [ ] Run `mvn clean install -Psourcecheck` in your module with source check 
enabled to make sure basic checks pass and there are no checkstyle violations. 
A more thorough check will be performed on your pull request automatically.
   Below are the contribution guidelines:
   https://github.com/apache/camel/blob/master/CONTRIBUTING.md



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] zbendhiba commented on pull request #2115: Add more integration tests for camel-hazelcast extension #2094

2021-01-07 Thread GitBox


zbendhiba commented on pull request #2115:
URL: https://github.com/apache/camel-quarkus/pull/2115#issuecomment-756221918


   I have a test failing on "integration-tests-alternative-jvm"



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 for commit 767e963e2084899ed4043f22cc8ed5346342dfaf

2021-01-07 Thread 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 566c16f  Regen for commit 767e963e2084899ed4043f22cc8ed5346342dfaf
566c16f is described below

commit 566c16fe6a166d76b9093e9594db892f0b8b9983
Author: johnpoth 
AuthorDate: Thu Jan 7 16:08:43 2021 +

Regen for commit 767e963e2084899ed4043f22cc8ed5346342dfaf

Signed-off-by: GitHub 
---
 .../resources/org/apache/camel/catalog/docs/activemq-component.adoc   | 4 ++--
 .../resources/org/apache/camel/catalog/docs/amqp-component.adoc   | 4 ++--
 .../resources/org/apache/camel/component/activemq/activemq.json   | 4 ++--
 components/camel-activemq/src/main/docs/activemq-component.adoc   | 4 ++--
 .../src/generated/resources/org/apache/camel/component/amqp/amqp.json | 4 ++--
 components/camel-amqp/src/main/docs/amqp-component.adoc   | 4 ++--
 .../camel/builder/component/dsl/ActivemqComponentBuilderFactory.java  | 2 +-
 .../camel/builder/component/dsl/AmqpComponentBuilderFactory.java  | 2 +-
 .../apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java | 4 ++--
 .../camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java| 4 ++--
 docs/components/modules/ROOT/pages/activemq-component.adoc| 4 ++--
 docs/components/modules/ROOT/pages/amqp-component.adoc| 4 ++--
 12 files changed, 22 insertions(+), 22 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/activemq-component.adoc
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/activemq-component.adoc
index 187dc90..6fe0630 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/activemq-component.adoc
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/activemq-component.adoc
@@ -98,7 +98,7 @@ The ActiveMQ component supports 100 options, which are listed 
below.
 | *formatDateHeadersToIso8601* (producer) | Sets whether JMS date properties 
should be formatted according to the ISO 8601 standard. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy 
(on the first message). By starting lazy you can use this to allow CamelContext 
and routes to startup in situations where a producer may otherwise fail during 
starting and cause the route to fail being started. By deferring this startup 
to be lazy then the startup failure can be handled during routing messages via 
Camel's routing error handlers. Beware that when the first message is processed 
then creating and [...]
 | *preserveMessageQos* (producer) | Set to true, if you want to send message 
using the QoS settings specified on the message, instead of the QoS settings on 
the JMS endpoint. The following three headers are considered JMSPriority, 
JMSDeliveryMode, and JMSExpiration. You can provide all or only some of them. 
If not provided, Camel will fall back to use the values from the endpoint 
instead. So, when using this option, the headers override the values from the 
endpoint. The explicitQosEnable [...]
-| *priority* (producer) | Values greater than 1 specify the message priority 
when sending (where 0 is the lowest priority and 9 is the highest). The 
explicitQosEnabled option must also be enabled in order for this option to have 
any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 
8, 9 | 4 | int
+| *priority* (producer) | Values greater than 1 specify the message priority 
when sending (where 1 is the lowest priority and 9 is the highest). The 
explicitQosEnabled option must also be enabled in order for this option to have 
any effect. There are 9 enums and the value can be one of: 1, 2, 3, 4, 5, 6, 7, 
8, 9 | 4 | int
 | *replyToConcurrentConsumers* (producer) | Specifies the default number of 
concurrent consumers when doing request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads. | 1 | 
int
 | *replyToMaxConcurrentConsumers* (producer) | Specifies the maximum number of 
concurrent consumers when using request/reply over JMS. See also the 
maxMessagesPerTask option to control dynamic scaling up/down of threads. |  | 
int
 | *replyToOnTimeoutMaxConcurrent{zwsp}Consumers* (producer) | Specifies the 
maximum number of concurrent consumers for continue routing when timeout 
occurred when using request/reply over JMS. | 1 | int
@@ -229,7 +229,7 @@ with the following path and query parameters:
 | *formatDateHeadersToIso8601* (producer) | Sets whether JMS date properties 
should be formatted according to the ISO 8601 standard. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy 
(on the first message). By starting lazy you can use this to allow CamelContext 
and rou

[GitHub] [camel] oscerd merged pull request #4836: Generated sources regen

2021-01-07 Thread GitBox


oscerd merged pull request #4836:
URL: https://github.com/apache/camel/pull/4836


   



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 regen_bot updated (38ba0ee -> 7191c38)

2021-01-07 Thread github-bot
This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.


from 38ba0ee  (chores) cross component logging fixes (#4832)
 add 73cd7d6  CAMEL-15990: camel-sjms - Support regular connection pool. 
CAMEL-15995: camel-sjms - Make it more feature compatible with camel-jms 
(producer)
 add a2896cf  polished code
 add 6bec00f  CAMEL-15995: camel-sjms - Make it more feature compatible 
with camel-jms (consumer)
 add 5369203  CAMEL-15995: camel-sjms - Make it more feature compatible 
with camel-jms (producer)
 add 8709742  camel-main - Remove option that was removed
 add 8c741e2  CAMEL-15995: camel-sjms - Make it more feature compatible 
with camel-jms (producer)
 add b204308  CAMEL-15995: camel-sjms - Make it more feature compatible 
with camel-jms (migrate)
 add 5667e51  Remove not used JAR
 add d877c47  Update ResourceBasedSSHKeyVerifier.java
 add f7b12e8  Make the sensitive string check easier to reuse so that we 
can eval and filter them (#4834)
 add 5d587f3  Regen
 add d734f80  CAMEL-16000: Add type converter for Map to Collection (set) 
as previously the slower type converter was able to do this. The new optimize 
converters requires more specific converter pairs to be really fast.
 add c8bc29c  CAMEL-16004: migrate camel-fhir to the new test infra
 add c4de4ed   CAMEL-16004: cleanup
 add 767e963  CAMEL-15995: fix checkstyle
 add 7191c38  Regen for commit 767e963e2084899ed4043f22cc8ed5346342dfaf

No new revisions were added by this update.

Summary of changes:
 .../org/apache/camel/catalog/components.properties |1 -
 .../org/apache/camel/catalog/components/jms.json   |4 +-
 .../camel/catalog/components/sjms-batch.json   |   58 -
 .../org/apache/camel/catalog/components/sjms.json  |   67 +-
 .../org/apache/camel/catalog/components/sjms2.json |   67 +-
 .../org/apache/camel/catalog/docs.properties   |1 -
 .../camel/catalog/docs/activemq-component.adoc |4 +-
 .../apache/camel/catalog/docs/amqp-component.adoc  |4 +-
 .../apache/camel/catalog/docs/jms-component.adoc   |4 +-
 .../camel/catalog/docs/sjms-batch-component.adoc   |  207 --
 .../apache/camel/catalog/docs/sjms-component.adoc  |  362 +---
 .../apache/camel/catalog/docs/sjms2-component.adoc |  513 ++---
 .../main/camel-main-configuration-metadata.json|1 -
 .../apache/camel/component/activemq/activemq.json  |4 +-
 .../src/main/docs/activemq-component.adoc  |4 +-
 .../org/apache/camel/component/amqp/amqp.json  |4 +-
 .../camel-amqp/src/main/docs/amqp-component.adoc   |4 +-
 components/camel-fhir/camel-fhir-component/pom.xml |   57 +-
 .../component/fhir/AbstractFhirTestSupport.java|   58 +-
 .../src/test/resources/test-options.properties |   20 -
 .../org/apache/camel/component/jms/jms.json|4 +-
 .../camel-jms/src/main/docs/jms-component.adoc |4 +-
 .../camel/component/jms/JmsConfiguration.java  |2 +-
 .../apache/camel/component/jms/JmsProducer.java|   20 +-
 components/camel-sjms/pom.xml  |   17 +-
 .../component/sjms/SjmsComponentConfigurer.java|   84 +-
 .../component/sjms/SjmsEndpointConfigurer.java |  249 ++-
 .../component/sjms/SjmsEndpointUriFactory.java |   45 +-
 .../sjms/batch/SjmsBatchComponentConfigurer.java   |   79 -
 .../sjms/batch/SjmsBatchEndpointConfigurer.java|  178 --
 .../sjms/batch/SjmsBatchEndpointUriFactory.java|   84 -
 .../services/org/apache/camel/component.properties |2 +-
 .../services/org/apache/camel/component/sjms-batch |2 -
 .../apache/camel/configurer/sjms-batch-component   |2 -
 .../apache/camel/configurer/sjms-batch-endpoint|2 -
 .../apache/camel/urifactory/sjms-batch-endpoint|2 -
 .../camel/component/sjms/batch/sjms-batch.json |   58 -
 .../org/apache/camel/component/sjms/sjms.json  |   67 +-
 .../src/main/docs/sjms-batch-component.adoc|  207 --
 .../camel-sjms/src/main/docs/sjms-component.adoc   |  362 +---
 .../sjms/AggregatedExceptionListener.java  |   53 -
 .../component/sjms/MessageConsumerResources.java   |   54 -
 ...onstants.java => MessageListenerContainer.java} |   16 +-
 .../camel/component/sjms/MessageProducerPool.java  |   75 -
 .../component/sjms/MessageProducerResources.java   |   69 -
 .../sjms/{SjmsConstants.java => ReplyToType.java}  |   10 +-
 .../{SjmsConstants.java => SessionCallback.java}   |   16 +-
 ...sConstants.java => SessionMessageListener.java} |   10 +-
 .../apache/camel/component/sjms/SjmsComponent.java |  258 +--
 .../apache/camel/component/sjms/SjmsConstants.java |2 +
 .../apache/camel/component/sjms/SjmsConsumer.java  |  433 +---
 .../apache/camel/component/sjms/SjmsEndpoint.java  |  829 
 .../apache/camel/component/sjms/SjmsHelper.java|  112 ++
 .../sjms/SjmsLoggingExceptionListener.java

[GitHub] [camel] github-actions[bot] opened a new pull request #4836: Generated sources regen

2021-01-07 Thread GitBox


github-actions[bot] opened a new pull request #4836:
URL: https://github.com/apache/camel/pull/4836


   Regen bot :robot: found some uncommited changes after running build on 
:camel: master.
   Please do not delete `regen_bot` branch after merge/rebase.



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] JiriOndrusek opened a new pull request #2116: Minio native support #2040

2021-01-07 Thread GitBox


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


   fixes https://github.com/apache/camel-quarkus/issues/2040
   
   supersedes https://github.com/apache/camel-quarkus/pull/2102
   
   Extension leverages quarkiverse-minio. There are several 
problems/limitations:
   
   - It seems that there is a bug in quarkiverse-minio - it misses some 
reflection registrations (which are probably not needed in simpler scenario) - 
I'll try to report/fix it in quarkiverse-minio extension and then remove 
registration from camel-quarkus extension.
   - There is a limitation because of quiarkiverse-minio which prevents to use 
more different minio endpoint at once. (minio client has to be defined in 
application.properties). Limitation is described in doc. I see an option in 
update of camel-minio component to allow overriding of autowired client by 
endpoint's configuration. @jamesnetherton , @ppalaga WDYT? Should I prepare an 
upgrade in camel-minio component?
   
] 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




[GitHub] [camel-quarkus] ppalaga commented on issue #2113: FOP integration tests fail in native mode with GraalVM 20.3.0

2021-01-07 Thread GitBox


ppalaga commented on issue #2113:
URL: https://github.com/apache/camel-quarkus/issues/2113#issuecomment-756184599


   I dared to `s/2.3.0/20.3.0/` in the above messages.



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] jamesnetherton edited a comment on issue #2113: FOP integration tests fail in native mode with GraalVM 20.3.0

2021-01-07 Thread GitBox


jamesnetherton edited a comment on issue #2113:
URL: https://github.com/apache/camel-quarkus/issues/2113#issuecomment-756164365


   > @jamesnetherton I can look into it tomorrow. Would that be ok? Which 
branch is it, camel-master?
   
   Yes, tomorrow is fine. Thanks!
   
   You can use the master branch. Bump the Quarkus version to 1.11.0.CR1 and 
use GraalVM 20.3.0 to reproduce the error.



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: CAMEL-15995: fix checkstyle

2021-01-07 Thread jpoth
This is an automated email from the ASF dual-hosted git repository.

jpoth 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 767e963  CAMEL-15995: fix checkstyle
767e963 is described below

commit 767e963e2084899ed4043f22cc8ed5346342dfaf
Author: John Poth 
AuthorDate: Thu Jan 7 16:19:36 2021 +0100

CAMEL-15995: fix checkstyle
---
 .../org/apache/camel/component/sjms/TransactionOnCompletion.java| 6 ++
 1 file changed, 6 insertions(+)

diff --git 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
index c4b9489..1bb5f78 100644
--- 
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
+++ 
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/TransactionOnCompletion.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.sjms;
 
+import java.util.Objects;
+
 import javax.jms.Message;
 import javax.jms.Session;
 
@@ -61,4 +63,8 @@ class TransactionOnCompletion extends SynchronizationAdapter {
 return session == that.session && message == that.message;
 }
 
+@Override
+public int hashCode() {
+return Objects.hash(super.hashCode(), session, message);
+}
 }



[GitHub] [camel-k] squakez opened a new issue #1884: kamel install camel-version flag not used

2021-01-07 Thread GitBox


squakez opened a new issue #1884:
URL: https://github.com/apache/camel-k/issues/1884


   While working on #1158 I realized we are providing a flag `camel-version` 
that apparently is used nowhere. If that's no longer used we can remove from 
the flag list.



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 (c3db032 -> 4e534de)

2021-01-07 Thread aldettinger
This is an automated email from the ASF dual-hosted git repository.

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


from c3db032  Auto-update Camel major.minor in Antora config files
 add 4e534de  Removed redis itests from test-categories as it is JVM only

No new revisions were added by this update.

Summary of changes:
 tooling/scripts/test-categories.yaml | 1 -
 1 file changed, 1 deletion(-)



[GitHub] [camel-k] squakez opened a new pull request #1883: feat(test): install command flags unit test

2021-01-07 Thread GitBox


squakez opened a new pull request #1883:
URL: https://github.com/apache/camel-k/pull/1883


   Added a suite of testcases to verify default and user provided flags
   
   Closes #1158
   
   
   
   
   
   
   
   
   **Release Note**
   ```release-note
   kind/feature
   ```
   



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 (4c4493b -> c3db032)

2021-01-07 Thread ppalaga
This is an automated email from the ASF dual-hosted git repository.

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


from 4c4493b  Added Redis Aggregation Repository support in JVM mode only 
#2085
 new 6fe9474  antora/xref-validator failure after a component was removed 
from Camel
 new c3db032  Auto-update Camel major.minor in Antora config files

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:
 docs/antora-playbook-dev.yml   | 11 
 docs/antora-playbook.yml   |  5 ++
 docs/antora.yml|  2 +-
 docs/modules/ROOT/pages/index.adoc |  2 +-
 .../ROOT/pages/reference/extensions/activemq.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/ahc-ws.adoc|  4 +-
 .../ROOT/pages/reference/extensions/ahc.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/amqp.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/apns.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/arangodb.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/as2.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/asn1.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/asterisk.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/atlasmap.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/atmos.adoc |  2 +-
 .../ROOT/pages/reference/extensions/atom.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/atomix.adoc| 12 ++--
 .../pages/reference/extensions/attachments.adoc|  2 +-
 .../ROOT/pages/reference/extensions/avro-rpc.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/avro.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/aws-ec2.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws-ecs.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws-eks.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws-iam.adoc   |  2 +-
 .../pages/reference/extensions/aws-kinesis.adoc|  4 +-
 .../ROOT/pages/reference/extensions/aws-kms.adoc   |  2 +-
 .../pages/reference/extensions/aws-lambda.adoc |  2 +-
 .../ROOT/pages/reference/extensions/aws-s3.adoc|  2 +-
 .../ROOT/pages/reference/extensions/aws-sdb.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws-sns.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws-sqs.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws-swf.adoc   |  2 +-
 .../pages/reference/extensions/aws-translate.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/aws-xray.adoc  |  2 +-
 .../pages/reference/extensions/aws2-athena.adoc|  2 +-
 .../ROOT/pages/reference/extensions/aws2-cw.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws2-ddb.adoc  |  4 +-
 .../ROOT/pages/reference/extensions/aws2-ec2.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/aws2-ecs.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/aws2-eks.adoc  |  2 +-
 .../reference/extensions/aws2-eventbridge.adoc |  2 +-
 .../ROOT/pages/reference/extensions/aws2-iam.adoc  |  2 +-
 .../pages/reference/extensions/aws2-kinesis.adoc   |  4 +-
 .../ROOT/pages/reference/extensions/aws2-kms.adoc  |  2 +-
 .../pages/reference/extensions/aws2-lambda.adoc|  2 +-
 .../ROOT/pages/reference/extensions/aws2-mq.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws2-msk.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/aws2-s3.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/aws2-ses.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/aws2-sns.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/aws2-sqs.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/aws2-sts.adoc  |  2 +-
 .../pages/reference/extensions/aws2-translate.adoc |  2 +-
 .../reference/extensions/azure-storage-blob.adoc   |  2 +-
 .../reference/extensions/azure-storage-queue.adoc  |  2 +-
 .../ROOT/pages/reference/extensions/azure.adoc |  4 +-
 .../ROOT/pages/reference/extensions/barcode.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/base64.adoc|  2 +-
 .../pages/reference/extensions/bean-validator.adoc |  2 +-
 .../ROOT/pages/reference/extensions/bean.adoc  |  6 +-
 .../ROOT/pages/reference/extensions/beanio.adoc|  2 +-
 .../ROOT/pages/reference/extensions/beanstalk.adoc |  2 +-
 .../ROOT/pages/reference/extensions/bindy.adoc |  6 +-
 .../ROOT/pages/reference/extensions/bonita.adoc|  2 +-
 .../ROOT/pages/reference/extensions/box.adoc   |  2 +-
 .../ROOT/pages/reference/extensions/braintree.adoc |  2 +-
 .../ROOT/pages/reference/extensions/browse.adoc|  2 +-
 .../ROOT/pages/reference/extensions/caffeine.adoc  |  4 +-
 .../pages/reference/extensions/cassandraql.adoc|  2 +-
 .../ROOT/pages/reference/extensions/cbor.adoc  |  2 +-
 .../pages/reference/extensions/chatscript.adoc |  2 +-
 .../ROOT/pages/reference/extensions/chunk.adoc |  

[camel-quarkus] 02/02: Auto-update Camel major.minor in Antora config files

2021-01-07 Thread ppalaga
This is an automated email from the ASF dual-hosted git repository.

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

commit c3db032e5ef55d05d59aca8f1bb90a33a25ec8fa
Author: Peter Palaga 
AuthorDate: Thu Jan 7 15:11:27 2021 +0100

Auto-update Camel major.minor in Antora config files
---
 docs/pom.xml| 19 +++
 pom.xml |  4 +++-
 tooling/scripts/update-antora-config.groovy | 24 
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/docs/pom.xml b/docs/pom.xml
index 4c7665f..b89eaa1 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -34,6 +34,25 @@
 
 
 
+org.codehaus.gmaven
+groovy-maven-plugin
+
+
+update-antora-config
+
+execute
+
+validate
+
+
file://${maven.multiModuleProjectDirectory}/tooling/scripts/update-antora-config.groovy
+
+
${maven.multiModuleProjectDirectory}
+
+
+
+
+
+
 org.apache.maven.plugins
 maven-enforcer-plugin
 
diff --git a/pom.xml b/pom.xml
index 16a863a..a50124f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,10 +44,12 @@
 1.10.0
 1.11.22
 
${bouncycastle-version}
-3.7
+
+3.7 
 ${camel.major.minor}.0
 
${camel.major.minor}.x@components
 
camel-${camel.major.minor}.x
+
 
${commons-beanutils-version}
 1.4
 3.2.2
diff --git a/tooling/scripts/update-antora-config.groovy 
b/tooling/scripts/update-antora-config.groovy
index 81d00bd..9533d9c 100644
--- a/tooling/scripts/update-antora-config.groovy
+++ b/tooling/scripts/update-antora-config.groovy
@@ -16,17 +16,20 @@
  */
 
 /**
- * Makes sure that each itest is executed by the CI
+ * Replace property values (defined in pom.xml files) in Antora yaml config
  */
 import java.nio.file.Path
+import java.nio.file.Paths
 import java.nio.file.Files
 import java.util.stream.Stream
+import java.util.stream.Collectors
 import java.util.regex.Pattern
+import java.util.regex.Matcher
 
 
 final Path treeRootDir = 
Paths.get(properties['maven.multiModuleProjectDirectory'])
 
-final final List replaceInFiles = [
+final List replaceInFiles = [
 treeRootDir.resolve('docs/antora-playbook.yml'),
 treeRootDir.resolve('docs/antora-playbook-dev.yml'),
 treeRootDir.resolve('docs/antora.yml')
@@ -39,21 +42,26 @@ if (!missingFiles.isEmpty()) {
 throw new IllegalStateException("Files expected to exist: " + missingFiles)
 }
 
-final Pattern replacementPattern = Pattern.compile("([\\-\\:]) *([^ ]+) *# * 
replace ${([^}]+)}")
 
-replaceInFiles.stream()
-.forEach { path ->
+final Pattern replacementPattern = ~'([\\-\\:]) *([^ ]+) *# * replace 
\\$\\{([^}]+)\\}'
+
+replaceInFiles.each { path ->
+println 'Updating ' + path
 final String content = path.getText('UTF-8')
 final Matcher m = replacementPattern.matcher(content)
 final StringBuffer newContent = new StringBuffer(content.length())
 while (m.find()) {
 final String property = m.group(3)
-final String newValue = properties.get(property)
-m.appendReplacement(newContent, '$1 ' + 
Matcher.quoteReplacement(newValue) + ' # replace '" + 
Matcher.quoteReplacement('${' + property + '}'))
+final String newValue = project.properties.get(property)
+println " - replacing ${property} '" + m.group(2) +"' -> 
'${newValue}'"
+m.appendReplacement(newContent, '$1 ' + 
Matcher.quoteReplacement(newValue) + ' # replace ' + 
Matcher.quoteReplacement('${' + property + '}'))
 }
 m.appendTail(newContent)
 final String newContentString = newContent.toString()
 if (!newContentString.equals(content)) {
+println 'Updated ' + path
 Files.write(path, newContentString.getBytes('UTF-8'))
+} else {
+println 'No change in ' + path
 }
-}
+}



[GitHub] [camel-quarkus] ppalaga closed issue #2109: antora/xref-validator failure after a component was removed from Camel

2021-01-07 Thread GitBox


ppalaga closed issue #2109:
URL: https://github.com/apache/camel-quarkus/issues/2109


   



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] ppalaga merged pull request #2114: antora/xref-validator failure after a component was removed from Camel

2021-01-07 Thread GitBox


ppalaga merged pull request #2114:
URL: https://github.com/apache/camel-quarkus/pull/2114


   



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] ppalaga commented on pull request #2114: antora/xref-validator failure after a component was removed from Camel

2021-01-07 Thread GitBox


ppalaga commented on pull request #2114:
URL: https://github.com/apache/camel-quarkus/pull/2114#issuecomment-756168117


   initial-mvn-install passed, thus merging



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] jamesnetherton commented on issue #2113: FOP integration tests fail in native mode with GraalVM 2.3.0

2021-01-07 Thread GitBox


jamesnetherton commented on issue #2113:
URL: https://github.com/apache/camel-quarkus/issues/2113#issuecomment-756164365


   > @jamesnetherton I can look into it tomorrow. Would that be ok? Which 
branch is it, camel-master?
   
   Yes, tomorrow is fine. Thanks!
   
   You can use the master branch. Bump the Quarkus version to 1.11.0.CR1 and 
use GraalVM 2.3.0 to reproduce the error.



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] JiriOndrusek commented on issue #2113: FOP integration tests fail in native mode with GraalVM 2.3.0

2021-01-07 Thread GitBox


JiriOndrusek commented on issue #2113:
URL: https://github.com/apache/camel-quarkus/issues/2113#issuecomment-756162684


   @jamesnetherton I can look into it tomorrow. Would that be ok? Which branch 
is it, camel-master?



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] orpiske merged pull request #829: Fix issue #159: camel components secret options are showed in logs

2021-01-07 Thread GitBox


orpiske merged pull request #829:
URL: https://github.com/apache/camel-kafka-connector/pull/829


   



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-master updated: Fix issue #159: camel components secret options are showed in logs

2021-01-07 Thread orpiske
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/camel-master by this push:
 new a2185b7  Fix issue #159: camel components secret options are showed in 
logs
a2185b7 is described below

commit a2185b76a2adc85b8093b1ed8a296a19e4c0b976
Author: Otavio Rodolfo Piske 
AuthorDate: Thu Jan 7 11:06:19 2021 +0100

Fix issue #159: camel components secret options are showed in logs
---
 .../kafkaconnector/utils/CamelKafkaConnectMain.java  | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
 
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 5eb0df5..d031b20 100644
--- 
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ 
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -17,8 +17,10 @@
 package org.apache.camel.kafkaconnector.utils;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.apache.camel.AggregationStrategy;
 import org.apache.camel.CamelContext;
@@ -33,6 +35,7 @@ import org.apache.camel.spi.IdempotentRepository;
 import 
org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.SensitiveUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -203,6 +206,15 @@ public class CamelKafkaConnectMain extends SimpleMain {
 return this;
 }
 
+private String filterSensitive(Map.Entry entry) {
+
+if (SensitiveUtils.containsSensitive((String) entry.getKey())) {
+return entry.getKey() + "=xxx";
+}
+return entry.getKey() + "=" + entry.getValue();
+}
+
+
 public CamelKafkaConnectMain build(CamelContext camelContext) {
 CamelKafkaConnectMain camelMain = new 
CamelKafkaConnectMain(camelContext);
 camelMain.configure().setAutoConfigurationLogSummary(false);
@@ -210,7 +222,9 @@ public class CamelKafkaConnectMain extends SimpleMain {
 Properties camelProperties = new Properties();
 camelProperties.putAll(props);
 
-LOG.info("Setting initial properties in Camel context: [{}]", 
camelProperties);
+List filteredProps = 
camelProperties.entrySet().stream().map(this::filterSensitive).collect(Collectors.toList());
+
+LOG.info("Setting initial properties in Camel context: [{}]", 
filteredProps);
 camelMain.setInitialProperties(camelProperties);
 
 // Instantianting the idempotent Repository here and inject it in 
registry to be referenced



[GitHub] [camel-kafka-connector] orpiske commented on pull request #829: Fix issue #159: camel components secret options are showed in logs

2021-01-07 Thread GitBox


orpiske commented on pull request #829:
URL: 
https://github.com/apache/camel-kafka-connector/pull/829#issuecomment-756150923


   So, all maters sorted out ... merging this one. Thanks for the reviews 
@oscerd 
   



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] orpiske commented on pull request #829: Fix issue #159: camel components secret options are showed in logs

2021-01-07 Thread GitBox


orpiske commented on pull request #829:
URL: 
https://github.com/apache/camel-kafka-connector/pull/829#issuecomment-756150684


   > Sorry
   
   No worries. After going through the process w/ 0.7.x I noticed it's a bit 
tricky and easy to miss stuff.



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] ppalaga commented on pull request #2114: antora/xref-validator failure after a component was removed from Camel

2021-01-07 Thread GitBox


ppalaga commented on pull request #2114:
URL: https://github.com/apache/camel-quarkus/pull/2114#issuecomment-756148234


   In 7433dec I have added a piece of groovy to keep the Antora config Camel 
major.minor in sync with what we have in the top pom.xml



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] orpiske merged pull request #833: Bump camel dependency to use the latest 3.8.0-SNAPSHOT

2021-01-07 Thread GitBox


orpiske merged pull request #833:
URL: https://github.com/apache/camel-kafka-connector/pull/833


   



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-master updated: Bump camel dependency to use the latest 3.8.0-SNAPSHOT

2021-01-07 Thread orpiske
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/camel-master by this push:
 new 360df65  Bump camel dependency to use the latest 3.8.0-SNAPSHOT
360df65 is described below

commit 360df65899d34b3adf15d9e0401b01fc6527
Author: Otavio Rodolfo Piske 
AuthorDate: Thu Jan 7 11:18:38 2021 +0100

Bump camel dependency to use the latest 3.8.0-SNAPSHOT
---
 parent/pom.xml | 2 +-
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 8e9f7e2..863440f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
 UTF-8
 
 2.6.0
-3.7.0
+3.8.0-SNAPSHOT
 1.3.1.Final
 4.5.6.Final
 1.8
diff --git a/pom.xml b/pom.xml
index c561d21..63a729c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 camel-dependencies
-3.7.0
+3.8.0-SNAPSHOT
 
 
 org.apache.camel.kafkaconnector



[GitHub] [camel-quarkus] zbendhiba opened a new pull request #2115: Add more integration tests for camel-hazelcast extension #2094

2021-01-07 Thread GitBox


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


   This PR add integration tests for :
   - HazelcastQueueComponent
   - HazelcastRingBufferComponent
   - HazelcastInstanceComponent
   - HazelcastSedaComponent
   - HazelcastIdempotentRepository
   - HazelcastRoutePolicy
   



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] jamesnetherton edited a comment on issue #2113: FOP integration tests fail in native mode with GraalVM 2.3.0

2021-01-07 Thread GitBox


jamesnetherton edited a comment on issue #2113:
URL: https://github.com/apache/camel-quarkus/issues/2113#issuecomment-756127985


   @JiriOndrusek maybe you know the FOP internals better than me. Do you have 
some time to look into this?



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] jamesnetherton commented on issue #2113: FOP integration tests fail in native mode with GraalVM 2.3.0

2021-01-07 Thread GitBox


jamesnetherton commented on issue #2113:
URL: https://github.com/apache/camel-quarkus/issues/2113#issuecomment-756127985


   @JiriOndrusek maybe you know the FOP internals better than me. Do you some 
time to look into this?



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: CAMEL-16004: cleanup

2021-01-07 Thread jpoth
This is an automated email from the ASF dual-hosted git repository.

jpoth 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 c4de4ed   CAMEL-16004: cleanup
c4de4ed is described below

commit c4de4ed3b31558d6e038a9d64b3bdcb3640d4e47
Author: John Poth 
AuthorDate: Thu Jan 7 14:48:23 2021 +0100

 CAMEL-16004: cleanup
---
 test-infra/camel-test-infra-fhir/pom.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/test-infra/camel-test-infra-fhir/pom.xml 
b/test-infra/camel-test-infra-fhir/pom.xml
index 825d566..20d1fff 100644
--- a/test-infra/camel-test-infra-fhir/pom.xml
+++ b/test-infra/camel-test-infra-fhir/pom.xml
@@ -47,10 +47,6 @@
 testcontainers
 
 
-
-org.testcontainers
-kafka
-
 
 
 



[camel] branch master updated: CAMEL-16004: migrate camel-fhir to the new test infra

2021-01-07 Thread jpoth
This is an automated email from the ASF dual-hosted git repository.

jpoth 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 c8bc29c  CAMEL-16004: migrate camel-fhir to the new test infra
c8bc29c is described below

commit c8bc29cf425c5f2444b7dd5df408855c815a0275
Author: John Poth 
AuthorDate: Wed Jan 6 10:54:11 2021 +0100

CAMEL-16004: migrate camel-fhir to the new test infra
---
 components/camel-fhir/camel-fhir-component/pom.xml | 57 -
 .../component/fhir/AbstractFhirTestSupport.java| 58 +
 .../src/test/resources/test-options.properties | 20 -
 test-infra/camel-test-infra-fhir/pom.xml   | 64 ++
 .../src/main/resources/META-INF/MANIFEST.MF|  0
 .../test/infra/fhir/common/FhirProperties.java | 30 +++
 .../fhir/services/FhirLocalContainerService.java   | 99 ++
 .../infra/fhir/services/FhirRemoteService.java | 53 
 .../test/infra/fhir/services/FhirService.java  | 44 ++
 .../infra/fhir/services/FhirServiceFactory.java| 43 ++
 test-infra/pom.xml |  1 +
 11 files changed, 411 insertions(+), 58 deletions(-)

diff --git a/components/camel-fhir/camel-fhir-component/pom.xml 
b/components/camel-fhir/camel-fhir-component/pom.xml
index acae915..3a9b2ee 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -136,6 +136,23 @@
 log4j-slf4j-impl
 test
 
+
+
+
+org.apache.camel
+camel-test-infra-common
+${project.version}
+test-jar
+test
+
+
+
+org.apache.camel
+camel-test-infra-fhir
+${project.version}
+test-jar
+test
+
 
 
 
@@ -322,13 +339,51 @@
 
 
 
+
 
-it-fhir
+fhir-tests-docker-file
+
+
+/var/run/docker.sock
+
+
 
 
 
 org.apache.maven.plugins
 maven-failsafe-plugin
+
+${skipTests}
+
+
+
+
+integration-test
+verify
+
+
+
+
+
+
+
+
+
+
+fhir-tests-docker-env
+
+
+env.DOCKER_HOST
+
+
+
+
+
+org.apache.maven.plugins
+maven-failsafe-plugin
+
+${skipTests}
+
 
 
 
diff --git 
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
 
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
index 7a08abb..a981acd 100644
--- 
a/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
+++ 
b/components/camel-fhir/camel-fhir-component/src/test/java/org/apache/camel/component/fhir/AbstractFhirTestSupport.java
@@ -16,10 +16,7 @@
  */
 package org.apache.camel.component.fhir;
 
-import java.io.IOException;
-import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
@@ -27,7 +24,8 @@ import ca.uhn.fhir.rest.client.api.IGenericClient;
 import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
 import org.apache.camel.CamelContext;
 import org.apache.camel.CamelExecutionException;
-import org.apache.camel.support.PropertyBindingSupport;
+import org.apache.camel.test.infra.fhir.services.FhirService;
+import org.apache.camel.test.infra.fhir.services.FhirServiceFactory;
 import org.apache.camel.test.junit5.CamelTestSupport;
 import org.hl7.fhir.dstu3.model.Bundle;
 import org.hl7.fhir.dstu3.model.HumanName;
@@ -35,25 +33,36 @@ import org.hl7.fhir.dstu3.model.Patient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 /**
  * Abstract base class for Fhir Integration tests generated by Camel API 

[GitHub] [camel-kafka-connector] orpiske merged pull request #830: (backport 0.7.x) Fix issue #159: camel components secret options are showed in logs

2021-01-07 Thread GitBox


orpiske merged pull request #830:
URL: https://github.com/apache/camel-kafka-connector/pull/830


   



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-kafka-connector-0.7.x updated: Fix issue #159: camel components secret options are showed in logs

2021-01-07 Thread orpiske
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/camel-kafka-connector-0.7.x by 
this push:
 new dd9ccfa  Fix issue #159: camel components secret options are showed in 
logs
dd9ccfa is described below

commit dd9ccfa5dc2a0740ef1ed636cf999da41e6bbbcb
Author: Otavio Rodolfo Piske 
AuthorDate: Thu Jan 7 11:06:19 2021 +0100

Fix issue #159: camel components secret options are showed in logs
---
 .../kafkaconnector/utils/CamelKafkaConnectMain.java  | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
 
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
index 5eb0df5..d031b20 100644
--- 
a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
+++ 
b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelKafkaConnectMain.java
@@ -17,8 +17,10 @@
 package org.apache.camel.kafkaconnector.utils;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.apache.camel.AggregationStrategy;
 import org.apache.camel.CamelContext;
@@ -33,6 +35,7 @@ import org.apache.camel.spi.IdempotentRepository;
 import 
org.apache.camel.support.processor.idempotent.MemoryIdempotentRepository;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.SensitiveUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -203,6 +206,15 @@ public class CamelKafkaConnectMain extends SimpleMain {
 return this;
 }
 
+private String filterSensitive(Map.Entry entry) {
+
+if (SensitiveUtils.containsSensitive((String) entry.getKey())) {
+return entry.getKey() + "=xxx";
+}
+return entry.getKey() + "=" + entry.getValue();
+}
+
+
 public CamelKafkaConnectMain build(CamelContext camelContext) {
 CamelKafkaConnectMain camelMain = new 
CamelKafkaConnectMain(camelContext);
 camelMain.configure().setAutoConfigurationLogSummary(false);
@@ -210,7 +222,9 @@ public class CamelKafkaConnectMain extends SimpleMain {
 Properties camelProperties = new Properties();
 camelProperties.putAll(props);
 
-LOG.info("Setting initial properties in Camel context: [{}]", 
camelProperties);
+List filteredProps = 
camelProperties.entrySet().stream().map(this::filterSensitive).collect(Collectors.toList());
+
+LOG.info("Setting initial properties in Camel context: [{}]", 
filteredProps);
 camelMain.setInitialProperties(camelProperties);
 
 // Instantianting the idempotent Repository here and inject it in 
registry to be referenced



[GitHub] [camel-kafka-connector] orpiske commented on pull request #830: (backport 0.7.x) Fix issue #159: camel components secret options are showed in logs

2021-01-07 Thread GitBox


orpiske commented on pull request #830:
URL: 
https://github.com/apache/camel-kafka-connector/pull/830#issuecomment-756124131


   Ok, this one is done and we should be good to go. Merging and starting the 
work on fixing the other 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




[camel-kafka-connector] branch camel-kafka-connector-0.7.x updated: Bump camel dependency to use camel 3.7.1-SNAPSHOT

2021-01-07 Thread orpiske
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/camel-kafka-connector-0.7.x by 
this push:
 new aa2c945  Bump camel dependency to use camel 3.7.1-SNAPSHOT
aa2c945 is described below

commit aa2c945fa40b3dce5b4b68f1e5b1cfab3e743d9e
Author: Otavio Rodolfo Piske 
AuthorDate: Thu Jan 7 11:44:12 2021 +0100

Bump camel dependency to use camel 3.7.1-SNAPSHOT
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 05ec7fd..fb470b0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
 UTF-8
 
 2.6.0
-3.7.0
+3.7.1-SNAPSHOT
 1.3.1.Final
 4.5.6.Final
 1.8



  1   2   >