[camel] 02/05: CAMEL-15836 - Camel-AWS2-S3: enable autowire on the s3 client, removed the autodiscoverClient option, useless now
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 66912ba6874a8335b9e30f16a53e37bff5328337
Author: Andrea Cosentino
AuthorDate: Fri Nov 13 08:21:41 2020 +0100
CAMEL-15836 - Camel-AWS2-S3: enable autowire on the s3 client, removed the
autodiscoverClient option, useless now
---
.../camel/component/aws2/s3/AWS2S3Component.java | 18 --
.../camel/component/aws2/s3/AWS2S3Configuration.java | 14 --
.../aws2/s3/S3ComponentConfigurationTest.java | 4 ++--
3 files changed, 2 insertions(+), 34 deletions(-)
diff --git
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
index 9120405..eac0103 100644
---
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
+++
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Component.java
@@ -61,9 +61,6 @@ public class AWS2S3Component extends DefaultComponent {
configuration.setBucketName(remaining);
AWS2S3Endpoint endpoint = new AWS2S3Endpoint(uri, this, configuration);
setProperties(endpoint, parameters);
-if (endpoint.getConfiguration().isAutoDiscoverClient()) {
-checkAndSetRegistryClient(configuration, endpoint);
-}
if (!configuration.isUseIAMCredentials() &&
configuration.getAmazonS3Client() == null
&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
throw new IllegalArgumentException(
@@ -83,19 +80,4 @@ public class AWS2S3Component extends DefaultComponent {
public void setConfiguration(AWS2S3Configuration configuration) {
this.configuration = configuration;
}
-
-private void checkAndSetRegistryClient(AWS2S3Configuration configuration,
AWS2S3Endpoint endpoint) {
-if
(ObjectHelper.isEmpty(endpoint.getConfiguration().getAmazonS3Client())) {
-LOG.debug("Looking for an S3Client instance in the registry");
-Set clients =
getCamelContext().getRegistry().findByType(S3Client.class);
-if (clients.size() == 1) {
-LOG.debug("Found exactly one S3Client instance in the
registry");
-
configuration.setAmazonS3Client(clients.stream().findFirst().get());
-} else {
-LOG.debug("No S3Client instance in the registry");
-}
-} else {
-LOG.debug("S3Client instance is already set at endpoint level:
skipping the check in the registry");
-}
-}
}
diff --git
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
index 36e6ace..eedddbc 100644
---
a/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
+++
b/components/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/AWS2S3Configuration.java
@@ -104,8 +104,6 @@ public class AWS2S3Configuration implements Cloneable {
private String uriEndpointOverride;
@UriParam(defaultValue = "false")
private boolean pojoRequest;
-@UriParam(label = "common", defaultValue = "true")
-private boolean autoDiscoverClient = true;
public long getPartSize() {
return partSize;
@@ -549,18 +547,6 @@ public class AWS2S3Configuration implements Cloneable {
this.trustAllCertificates = trustAllCertificates;
}
-public boolean isAutoDiscoverClient() {
-return autoDiscoverClient;
-}
-
-/**
- * Setting the autoDiscoverClient mechanism, if true, the component will
look for a client instance in the registry
- * automatically otherwise it will skip that checking.
- */
-public void setAutoDiscoverClient(boolean autoDiscoverClient) {
-this.autoDiscoverClient = autoDiscoverClient;
-}
-
public AWS2S3Configuration copy() {
try {
return (AWS2S3Configuration) super.clone();
diff --git
a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
index cf978ce..1ef6d76 100644
---
a/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
+++
b/components/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/S3ComponentConfigurationTest.java
@@ -44,14 +44,14 @@ public class S3ComponentConfigurationTest extends
CamelTestSupport {
context.getRegistry().bind("amazonS3Client", client);
AWS2S3Component component = context.getComponent(
[camel-spring-boot] 02/02: Camel-Infinispan: Re-enable the integration test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit c7bb08d3077351d7922101bbff51c176c912e00e
Author: Andrea Cosentino
AuthorDate: Thu Nov 12 08:56:42 2020 +0100
Camel-Infinispan: Re-enable the integration test
---
.../apache/camel/itest/springboot/CamelInfinispanTest.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
index fe4b62a..59b3d08 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
@@ -26,7 +26,6 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
-@Ignore("Still doesn't work with infinispan 10.x")
public class CamelInfinispanTest extends AbstractSpringBootTestSupport {
@Deployment
@@ -37,12 +36,12 @@ public class CamelInfinispanTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelInfinispanTest.class))
-
.dependency("org.infinispan:infinispan-client-hotrod:10.1.1.Final")
-.dependency("org.infinispan:infinispan-commons:10.1.1.Final")
-
.dependency("org.infinispan:infinispan-component-annotations:10.1.1.Final")
-.dependency("org.infinispan:infinispan-core:10.1.1.Final")
-.dependency("org.infinispan:infinispan-query-dsl:10.1.1.Final")
-
.dependency("org.infinispan:infinispan-remote-query-client:10.1.1.Final")
+
.dependency("org.infinispan:infinispan-client-hotrod:11.0.5.Final")
+.dependency("org.infinispan:infinispan-commons:11.0.5.Final")
+
.dependency("org.infinispan:infinispan-component-annotations:11.0.5.Final")
+.dependency("org.infinispan:infinispan-core:11.0.5.Final")
+.dependency("org.infinispan:infinispan-query-dsl:11.0.5.Final")
+
.dependency("org.infinispan:infinispan-remote-query-client:11.0.5.Final")
.disableJmx("org.infinispan:*")
.build();
}
[camel-spring-boot] 01/02: Upgrade Infinispan Spring Boot to version 2.3.4.Final
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 9fe8c11be96054a692f4108f91bd671af96f3600
Author: Andrea Cosentino
AuthorDate: Thu Nov 12 08:50:58 2020 +0100
Upgrade Infinispan Spring Boot to version 2.3.4.Final
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bf4a694..ec475d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
${jakarta-jaxb-version}
3.0.4
2.7.4
-
2.2.4.Final
+
2.3.4.Final
2.3.2
2.3.0
9.4.22.v20191022
[camel-spring-boot] branch master updated (8366266 -> c7bb08d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 8366266 [create-pull-request] automated change new 9fe8c11 Upgrade Infinispan Spring Boot to version 2.3.4.Final new c7bb08d Camel-Infinispan: Re-enable the integration test 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: pom.xml | 2 +- .../apache/camel/itest/springboot/CamelInfinispanTest.java | 13 ++--- 2 files changed, 7 insertions(+), 8 deletions(-)
[GitHub] [camel-k] astefanutti commented on a change in pull request #1787: Create PodDisruptionBudget for every integration
astefanutti commented on a change in pull request #1787:
URL: https://github.com/apache/camel-k/pull/1787#discussion_r521901045
##
File path: deploy/operator-role-kubernetes.yaml
##
@@ -47,6 +47,17 @@ rules:
- patch
- update
- watch
+- apiGroups:
+ - "policy"
Review comment:
Are the double quotes necessary?
##
File path: pkg/trait/pdb.go
##
@@ -0,0 +1,107 @@
+/*
+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 trait
+
+import (
+ "fmt"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "k8s.io/api/policy/v1beta1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// The Pod trait allows to configure the PodDisruptionBudget resource.
Review comment:
`Pod` -> `PDB`
##
File path: pkg/trait/pdb.go
##
@@ -0,0 +1,107 @@
+/*
+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 trait
+
+import (
+ "fmt"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "k8s.io/api/policy/v1beta1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// The Pod trait allows to configure the PodDisruptionBudget resource.
+//
+// +camel-k:trait=pod
+type podTrait struct {
Review comment:
`pod` -> `pdb`
##
File path: pkg/trait/pdb.go
##
@@ -0,0 +1,107 @@
+/*
+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 trait
+
+import (
+ "fmt"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "k8s.io/api/policy/v1beta1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// The Pod trait allows to configure the PodDisruptionBudget resource.
+//
+// +camel-k:trait=pod
+type podTrait struct {
+ BaseTrait `property:",squash"`
+ MaxUnavailable string `property:"max-unavailable"
json:"maxUnavailable,omitempty"`
+ MinAvailable string `property:"min-available"
json:"minAvailable,omitempty"`
+}
+
+func newPodTrait() Trait {
Review comment:
`pod` -> `pdb`
##
File path: pkg/trait/pdb.go
##
@@ -0,0 +1,107 @@
+/*
+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 O
[camel-spring-boot] 02/02: Camel-Infinispan: Re-enable the integration test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit c7bb08d3077351d7922101bbff51c176c912e00e
Author: Andrea Cosentino
AuthorDate: Thu Nov 12 08:56:42 2020 +0100
Camel-Infinispan: Re-enable the integration test
---
.../apache/camel/itest/springboot/CamelInfinispanTest.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
index fe4b62a..59b3d08 100644
---
a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
+++
b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelInfinispanTest.java
@@ -26,7 +26,6 @@ import org.junit.runner.RunWith;
@RunWith(Arquillian.class)
-@Ignore("Still doesn't work with infinispan 10.x")
public class CamelInfinispanTest extends AbstractSpringBootTestSupport {
@Deployment
@@ -37,12 +36,12 @@ public class CamelInfinispanTest extends
AbstractSpringBootTestSupport {
public static ITestConfig createTestConfig() {
return new ITestConfigBuilder()
.module(inferModuleName(CamelInfinispanTest.class))
-
.dependency("org.infinispan:infinispan-client-hotrod:10.1.1.Final")
-.dependency("org.infinispan:infinispan-commons:10.1.1.Final")
-
.dependency("org.infinispan:infinispan-component-annotations:10.1.1.Final")
-.dependency("org.infinispan:infinispan-core:10.1.1.Final")
-.dependency("org.infinispan:infinispan-query-dsl:10.1.1.Final")
-
.dependency("org.infinispan:infinispan-remote-query-client:10.1.1.Final")
+
.dependency("org.infinispan:infinispan-client-hotrod:11.0.5.Final")
+.dependency("org.infinispan:infinispan-commons:11.0.5.Final")
+
.dependency("org.infinispan:infinispan-component-annotations:11.0.5.Final")
+.dependency("org.infinispan:infinispan-core:11.0.5.Final")
+.dependency("org.infinispan:infinispan-query-dsl:11.0.5.Final")
+
.dependency("org.infinispan:infinispan-remote-query-client:11.0.5.Final")
.disableJmx("org.infinispan:*")
.build();
}
[camel-spring-boot] 01/02: Upgrade Infinispan Spring Boot to version 2.3.4.Final
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 9fe8c11be96054a692f4108f91bd671af96f3600
Author: Andrea Cosentino
AuthorDate: Thu Nov 12 08:50:58 2020 +0100
Upgrade Infinispan Spring Boot to version 2.3.4.Final
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bf4a694..ec475d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
${jakarta-jaxb-version}
3.0.4
2.7.4
-
2.2.4.Final
+
2.3.4.Final
2.3.2
2.3.0
9.4.22.v20191022
[camel-spring-boot] branch master updated (8366266 -> c7bb08d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 8366266 [create-pull-request] automated change new 9fe8c11 Upgrade Infinispan Spring Boot to version 2.3.4.Final new c7bb08d Camel-Infinispan: Re-enable the integration test 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: pom.xml | 2 +- .../apache/camel/itest/springboot/CamelInfinispanTest.java | 13 ++--- 2 files changed, 7 insertions(+), 8 deletions(-)
[camel] 01/03: Upgrade Pulsar to version 2.6.2
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 93bbe3574621313708513932e32fc8a3503ed0e7 Author: Andrea Cosentino AuthorDate: Thu Nov 12 08:53:04 2020 +0100 Upgrade Pulsar to version 2.6.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index ee45c26..ea9ac03 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -466,7 +466,7 @@ 0.6.1 1.8 4.25.0 -2.6.1 +2.6.2 8.0.2 0.33.6 0.54.0
[camel] branch master updated (15c51d2 -> b10bd2d)
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 15c51d2 Sync deps new 93bbe35 Upgrade Pulsar to version 2.6.2 new a769888 Camel-Pulsar: Use 2.6.2 docker image for testing new b10bd2d Sync deps 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: camel-dependencies/pom.xml | 2 +- .../test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java | 2 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[camel] 03/03: Sync deps
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 b10bd2d80e0dc5249201bca41d9347fa4d226cc6 Author: Andrea Cosentino AuthorDate: Thu Nov 12 09:08:49 2020 +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 dc69ab0..6d48900 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -478,7 +478,7 @@ 3.11.1 1.8 4.25.0 -2.6.1 +2.6.2 8.0.2 0.54.0 0.33.6
[camel] 02/03: Camel-Pulsar: Use 2.6.2 docker image for testing
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 a7692f98fcebc2ab198cf9a403440fa05324
Author: Andrea Cosentino
AuthorDate: Thu Nov 12 08:54:13 2020 +0100
Camel-Pulsar: Use 2.6.2 docker image for testing
---
.../test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java
index 4add4b8..c11da4f 100644
---
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java
+++
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java
@@ -24,7 +24,7 @@ import org.testcontainers.containers.GenericContainer;
public class PulsarTestSupport extends ContainerAwareTestSupport {
-public static final String CONTAINER_IMAGE = "apachepulsar/pulsar:2.6.1";
+public static final String CONTAINER_IMAGE = "apachepulsar/pulsar:2.6.2";
public static final String CONTAINER_NAME = "pulsar";
public static final int BROKER_PORT = 6650;
public static final int BROKER_HTTP_PORT = 8080;
[camel] branch regen_bot updated (e43696c -> 15c51d2)
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 e43696c Sync deps add f7f95f9 Upgrade Infinispan to version 11.0.5.Final add b6f6001 Camel-Infinispan: Use 11.0.5.Final-1 docker image for testing add 15c51d2 Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml| 2 +- .../infinispan/testcontainers/InfinispanTestContainerSupport.java | 4 ++-- parent/pom.xml| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (15c51d2 -> b10bd2d)
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 15c51d2 Sync deps add 93bbe35 Upgrade Pulsar to version 2.6.2 add a769888 Camel-Pulsar: Use 2.6.2 docker image for testing add b10bd2d Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java | 2 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[camel] branch regen_bot updated (15c51d2 -> b10bd2d)
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 15c51d2 Sync deps add 93bbe35 Upgrade Pulsar to version 2.6.2 add a769888 Camel-Pulsar: Use 2.6.2 docker image for testing add b10bd2d Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../test/java/org/apache/camel/component/pulsar/PulsarTestSupport.java | 2 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[GitHub] [camel] orpiske opened a new pull request #4595: Added test infra for Azure services
orpiske opened a new pull request #4595: URL: https://github.com/apache/camel/pull/4595 Includes: - service for Azure storage queue - service for Azure storage blob - [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-quarkus] jamesnetherton commented on issue #1978: NATS integration test failure - Unable to connect to NATS servers
jamesnetherton commented on issue #1978: URL: https://github.com/apache/camel-quarkus/issues/1978#issuecomment-725958901 Failed CI run on the `camel-master` branch yesterday: https://github.com/apache/camel-quarkus/runs/1384548575?check_suite_focus=true This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] jamesnetherton opened a new pull request #4596: CAMEL-15845: Add events consumer to GitHub component
jamesnetherton opened a new pull request #4596: URL: https://github.com/apache/camel/pull/4596 - [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-kafka-connector] orpiske merged pull request #704: Decouple the Azure clients from the service to simplify using the test infra from Camel
orpiske merged pull request #704: URL: https://github.com/apache/camel-kafka-connector/pull/704 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 master updated: Decouple the Azure clients from the service to simplify using the test infra from Camel
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 90d1cc0 Decouple the Azure clients from the service to simplify using
the test infra from Camel
90d1cc0 is described below
commit 90d1cc0aa3ade0c67ae467cb55c7e2fc696843af
Author: Otavio Rodolfo Piske
AuthorDate: Wed Nov 11 17:13:29 2020 +0100
Decouple the Azure clients from the service to simplify using the test
infra from Camel
---
.../camel/kafkaconnector/azure/common/services/AzureService.java | 4 +---
.../kafkaconnector/azure/common/services/AzureStorageService.java | 2 +-
.../azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java | 5 +++--
.../storage/services/AzureStorageBlobLocalContainerService.java | 8 +---
.../azure/storage/services/AzureStorageBlobRemoteService.java | 8 +---
.../azure/storage/services/AzureStorageBlobServiceFactory.java| 3 +--
.../storage/queue/sink/CamelSinkAzureStorageQueueITCase.java | 5 +++--
.../storage/services/AzureStorageQueueLocalContainerService.java | 8 +---
.../azure/storage/services/AzureStorageQueueRemoteService.java| 8 +---
.../azure/storage/services/AzureStorageQueueServiceFactory.java | 3 +--
10 files changed, 14 insertions(+), 40 deletions(-)
diff --git
a/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureService.java
b/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureService.java
index 5f43f10..2baa290 100644
---
a/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureService.java
+++
b/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureService.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
-public interface AzureService extends BeforeAllCallback, AfterAllCallback {
+public interface AzureService extends BeforeAllCallback, AfterAllCallback {
/**
* Gets the credentials for the test service
@@ -31,8 +31,6 @@ public interface AzureService extends BeforeAllCallback,
AfterAllCallback {
AzureCredentialsHolder azureCredentials();
-T getClient();
-
/**
* Perform any initialization necessary
*/
diff --git
a/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureStorageService.java
b/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureStorageService.java
index 8005285..0d2db5e 100644
---
a/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureStorageService.java
+++
b/tests/itests-azure-common/src/test/java/org/apache/camel/kafkaconnector/azure/common/services/AzureStorageService.java
@@ -20,7 +20,7 @@ package org.apache.camel.kafkaconnector.azure.common.services;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public abstract class AzureStorageService implements AzureService {
+public abstract class AzureStorageService implements AzureService {
private static final Logger LOG =
LoggerFactory.getLogger(AzureStorageService.class);
private final AzuriteContainer container = new AzuriteContainer();
diff --git
a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
index 6066e71..c50b6bc 100644
---
a/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
+++
b/tests/itests-azure-storage-blob/src/test/java/org/apache/camel/kafkaconnector/azure/storage/blob/sink/CamelSinkAzureStorageBlobITCase.java
@@ -30,6 +30,7 @@ import com.azure.storage.blob.models.BlobItem;
import org.apache.camel.kafkaconnector.CamelSinkTask;
import org.apache.camel.kafkaconnector.azure.common.AzureCredentialsHolder;
import org.apache.camel.kafkaconnector.azure.common.services.AzureService;
+import
org.apache.camel.kafkaconnector.azure.storage.services.AzureStorageBlobClientUtils;
import
org.apache.camel.kafkaconnector.azure.storage.services.AzureStorageBlobServiceFactory;
import org.apache.camel.kafkaconnector.common.AbstractKafkaTest;
import org.apache.camel.kafkaconnector.common.ConnectorPropertyFactory;
@@ -47,7 +48,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
public class CamelSinkAzureStorageBlobITCase extends AbstractKafkaTest {
@RegisterExtension
-public static AzureSe
[GitHub] [camel-k] astefanutti commented on a change in pull request #1787: Create PodDisruptionBudget for every integration
astefanutti commented on a change in pull request #1787:
URL: https://github.com/apache/camel-k/pull/1787#discussion_r521990911
##
File path: pkg/trait/pdb.go
##
@@ -0,0 +1,111 @@
+/*
+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 trait
+
+import (
+ "fmt"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "k8s.io/api/policy/v1beta1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// The Pbd trait allows to configure the PodDisruptionBudget resource.
+//
+// +camel-k:trait=pbd
+type pdbTrait struct {
+ BaseTrait `property:",squash"`
+ MaxUnavailable string `property:"max-unavailable"
json:"maxUnavailable,omitempty"`
+ MinAvailable string `property:"min-available"
json:"minAvailable,omitempty"`
+}
+
+func newPdbTrait() Trait {
+ return &pdbTrait{
+ BaseTrait: NewBaseTrait("pdb", 900),
+ }
+}
+
+func (t *pdbTrait) Configure(e *Environment) (bool, error) {
+ if t.Enabled != nil && *t.Enabled {
+ strategy, err := e.DetermineControllerStrategy()
+ if err != nil {
+ return false, fmt.Errorf("unable to determine the
controller stratedy")
+ }
+
+ if strategy == ControllerStrategyCronJob {
+ return false, fmt.Errorf("poddisruptionbudget isn't
supported with cron-job controller strategy")
+ }
+
+ if t.MaxUnavailable != "" && t.MinAvailable != "" {
+ return false, fmt.Errorf("both minAvailable and
maxUnavailable can't be set simultaneously")
+ }
+
+ return e.IntegrationInPhase(
+ v1.IntegrationPhaseDeploying,
+ v1.IntegrationPhaseRunning,
+ ), nil
+ }
+ return false, nil
+}
+
+func (t *pdbTrait) Apply(e *Environment) error {
+ pdb, err := t.generatePodDisruptionBudget(e)
+ if err != nil {
+ return err
+ }
+ if pdb != nil {
Review comment:
I think we can remove that check as the `pdb` is never `nil`.
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] mmelko commented on a change in pull request #1787: Create PodDisruptionBudget for every integration
mmelko commented on a change in pull request #1787:
URL: https://github.com/apache/camel-k/pull/1787#discussion_r522002158
##
File path: pkg/trait/pdb.go
##
@@ -0,0 +1,111 @@
+/*
+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 trait
+
+import (
+ "fmt"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "k8s.io/api/policy/v1beta1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// The Pbd trait allows to configure the PodDisruptionBudget resource.
+//
+// +camel-k:trait=pbd
+type pdbTrait struct {
+ BaseTrait `property:",squash"`
+ MaxUnavailable string `property:"max-unavailable"
json:"maxUnavailable,omitempty"`
+ MinAvailable string `property:"min-available"
json:"minAvailable,omitempty"`
+}
+
+func newPdbTrait() Trait {
+ return &pdbTrait{
+ BaseTrait: NewBaseTrait("pdb", 900),
+ }
+}
+
+func (t *pdbTrait) Configure(e *Environment) (bool, error) {
+ if t.Enabled != nil && *t.Enabled {
+ strategy, err := e.DetermineControllerStrategy()
+ if err != nil {
+ return false, fmt.Errorf("unable to determine the
controller stratedy")
+ }
+
+ if strategy == ControllerStrategyCronJob {
+ return false, fmt.Errorf("poddisruptionbudget isn't
supported with cron-job controller strategy")
+ }
+
+ if t.MaxUnavailable != "" && t.MinAvailable != "" {
+ return false, fmt.Errorf("both minAvailable and
maxUnavailable can't be set simultaneously")
+ }
+
+ return e.IntegrationInPhase(
+ v1.IntegrationPhaseDeploying,
+ v1.IntegrationPhaseRunning,
+ ), nil
+ }
+ return false, nil
+}
+
+func (t *pdbTrait) Apply(e *Environment) error {
+ pdb, err := t.generatePodDisruptionBudget(e)
+ if err != nil {
+ return err
+ }
+ if pdb != nil {
Review comment:
done
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 commented on a change in pull request #1787: Create PodDisruptionBudget for every integration
astefanutti commented on a change in pull request #1787:
URL: https://github.com/apache/camel-k/pull/1787#discussion_r522005278
##
File path: pkg/trait/pdb.go
##
@@ -0,0 +1,108 @@
+/*
+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 trait
+
+import (
+ "fmt"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "k8s.io/api/policy/v1beta1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/util/intstr"
+)
+
+// The Pbd trait allows to configure the PodDisruptionBudget resource.
+//
+// +camel-k:trait=pbd
+type pdbTrait struct {
+ BaseTrait `property:",squash"`
+ MaxUnavailable string `property:"max-unavailable"
json:"maxUnavailable,omitempty"`
+ MinAvailable string `property:"min-available"
json:"minAvailable,omitempty"`
+}
+
+func newPdbTrait() Trait {
+ return &pdbTrait{
+ BaseTrait: NewBaseTrait("pdb", 900),
+ }
+}
+
+func (t *pdbTrait) Configure(e *Environment) (bool, error) {
+ if t.Enabled != nil && *t.Enabled {
Review comment:
Do you mind inverting the logic so that the bulk of the method is not in
an `if` block?
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 commented on a change in pull request #1787: Create PodDisruptionBudget for every integration
astefanutti commented on a change in pull request #1787: URL: https://github.com/apache/camel-k/pull/1787#discussion_r522004680 ## File path: pkg/trait/pdb.go ## @@ -0,0 +1,108 @@ +/* +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 trait + +import ( + "fmt" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "k8s.io/api/policy/v1beta1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" +) + +// The Pbd trait allows to configure the PodDisruptionBudget resource. +// +// +camel-k:trait=pbd Review comment: `pbd` -> `pdb`:) 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 commented on a change in pull request #1787: Create PodDisruptionBudget for every integration
astefanutti commented on a change in pull request #1787:
URL: https://github.com/apache/camel-k/pull/1787#discussion_r522005803
##
File path: pkg/trait/pdb_test.go
##
@@ -0,0 +1,124 @@
+/*
+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 trait
+
+import (
+ "testing"
+
+ "github.com/stretchr/testify/assert"
+
+ appsv1 "k8s.io/api/apps/v1"
+ corev1 "k8s.io/api/core/v1"
+ "k8s.io/api/policy/v1beta1"
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/pkg/util/kubernetes"
+)
+
+func TestConfigurePdbTraitDoesSucceed(t *testing.T) {
+ pdbTrait, environment, _ := createPdbTest()
+ configured, err := pdbTrait.Configure(environment)
+
+ assert.True(t, configured)
+ assert.Nil(t, err)
+}
+
+func TestConfigurePdbTraitDoesNotSucceed(t *testing.T) {
+ pdbTrait, environment, _ := createPdbTest()
+ //err := pdbTrait.Apply(environment)
Review comment:
Can be removed.
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 merged pull request #4595: Added test infra for Azure services
orpiske merged pull request #4595: URL: https://github.com/apache/camel/pull/4595 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: Added test infra for Azure services (#4595)
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 e9ca967 Added test infra for Azure services (#4595)
e9ca967 is described below
commit e9ca96760358f29219e6f2a8b0e1f92166a4e906
Author: Otavio Rodolfo Piske
AuthorDate: Thu Nov 12 11:49:38 2020 +0100
Added test infra for Azure services (#4595)
Includes:
- service for Azure storage queue
- service for Azure storage blob
---
test-infra/camel-test-infra-azure-common/pom.xml | 53 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../test/infra/azure/common/AzureConfigs.java | 29 ++
.../infra/azure/common/AzureCredentialsHolder.java | 24
.../infra/azure/common/services/AzureService.java | 44 +++
.../infra/azure/common/services/AzureServices.java | 26 +
.../azure/common/services/AzureStorageService.java | 57 +++
.../azure/common/services/AzuriteContainer.java| 57 +++
.../camel-test-infra-azure-storage-blob/pom.xml| 65 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../AzureStorageBlobLocalContainerService.java | 38 +
.../services/AzureStorageBlobRemoteService.java| 51 +
.../services/AzureStorageBlobServiceFactory.java | 45 +++
.../camel-test-infra-azure-storage-queue/pom.xml | 65 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../AzureStorageQueueLocalContainerService.java| 38 +
.../services/AzureStorageQueueRemoteService.java | 51 +
.../services/AzureStorageQueueServiceFactory.java | 45 +++
test-infra/pom.xml | 3 +
19 files changed, 691 insertions(+)
diff --git a/test-infra/camel-test-infra-azure-common/pom.xml
b/test-infra/camel-test-infra-azure-common/pom.xml
new file mode 100644
index 000..6ec336b
--- /dev/null
+++ b/test-infra/camel-test-infra-azure-common/pom.xml
@@ -0,0 +1,53 @@
+
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+camel-test-infra-parent
+org.apache.camel
+../camel-test-infra-parent/pom.xml
+3.7.0-SNAPSHOT
+
+4.0.0
+
+Camel :: Test Infra :: Azure Common
+camel-test-infra-azure-common
+
+
+
+org.apache.camel
+camel-test-infra-common
+${project.version}
+test-jar
+test
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
+
+
+
\ No newline at end of file
diff --git
a/test-infra/camel-test-infra-azure-common/src/main/resources/META-INF/MANIFEST.MF
b/test-infra/camel-test-infra-azure-common/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 000..e69de29
diff --git
a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/AzureConfigs.java
b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/AzureConfigs.java
new file mode 100644
index 000..8398e5a
--- /dev/null
+++
b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/AzureConfigs.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.test.infra.azure.common;
+
+public final class AzureConfigs {
+public static final String HOST = "azure.storage.host";
+public static final String PORT = "azure.storage.port";
+public static final String ACCOUNT_NAME = "azure.storage.account.name";
+public static final String ACCOUNT_KEY = "azure.storage.account.key";
+
+private AzureConfigs() {
+
+}
+}
diff --git
a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/az
[GitHub] [camel] orpiske opened a new pull request #4597: Ensure that test-infra properties are registered and accessible outside of test
orpiske opened a new pull request #4597: URL: https://github.com/apache/camel/pull/4597 - [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] mmelko commented on a change in pull request #1787: Create PodDisruptionBudget for every integration
mmelko commented on a change in pull request #1787: URL: https://github.com/apache/camel-k/pull/1787#discussion_r522021882 ## File path: pkg/trait/pdb.go ## @@ -0,0 +1,108 @@ +/* +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 trait + +import ( + "fmt" + v1 "github.com/apache/camel-k/pkg/apis/camel/v1" + "k8s.io/api/policy/v1beta1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" +) + +// The Pbd trait allows to configure the PodDisruptionBudget resource. +// +// +camel-k:trait=pbd Review comment: aaah nice catch 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-runtime] lburgazzoli commented on pull request #551: knative: split producer and consumer
lburgazzoli commented on pull request #551: URL: https://github.com/apache/camel-k-runtime/pull/551#issuecomment-726011000 I've added the `prodcuer` and `consumer` entries as part of the `scheme` ```yaml camel-k-knative: groupId: org.apache.camel.k artifactId: camel-k-knative schemes: - id: knative http: true passive: false producer: dependencies: - groupId: org.apache.camel.k artifactId: camel-k-knative-producer consumer: dependencies: - groupId: org.apache.camel.k artifactId: camel-k-knative-consumer ``` 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-runtime] lburgazzoli edited a comment on pull request #551: knative: split producer and consumer
lburgazzoli edited a comment on pull request #551: URL: https://github.com/apache/camel-k-runtime/pull/551#issuecomment-726011000 I've added the `prodcuer` and `consumer` entries as part of the `scheme` ```yaml camel-k-knative: groupId: org.apache.camel.k artifactId: camel-k-knative schemes: - id: knative http: true passive: false producer: dependencies: - groupId: org.apache.camel.k artifactId: camel-k-knative-producer consumer: dependencies: - groupId: org.apache.camel.k artifactId: camel-k-knative-consumer ``` At the moment, only dependencies are added but we can revisit it to include also capabilities This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] aldettinger commented on issue #1978: NATS integration test failure - Unable to connect to NATS servers
aldettinger commented on issue #1978: URL: https://github.com/apache/camel-quarkus/issues/1978#issuecomment-726014953 Thanks for reporting occurrences @jamesnetherton, it provides a lot of information. So this intermittent issue could be reproduced locally by running nats tests under a bit of O/S stressing using `stress --cpu 8 --io 10 --timeout 200`. The most likely explanation at this stage is intermittent TLS handshake timeout occurring under stressed O/S condition. Raising the timeout seems to be a reasonable option but I'm facing a [nats issue](https://github.com/nats-io/nats-server/issues/1704). Let's see whether the nats guys could help. 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 (b10bd2d -> e9ca967)
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 b10bd2d Sync deps
add e9ca967 Added test infra for Azure services (#4595)
No new revisions were added by this update.
Summary of changes:
test-infra/camel-test-infra-azure-common/pom.xml | 53 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../test/infra/azure/common/AzureConfigs.java | 29 ++
.../infra/azure/common/AzureCredentialsHolder.java | 24
.../infra/azure/common/services/AzureService.java | 44 +++
.../infra/azure/common/services/AzureServices.java | 26 +
.../azure/common/services/AzureStorageService.java | 57 +++
.../azure/common/services/AzuriteContainer.java| 57 +++
.../camel-test-infra-azure-storage-blob/pom.xml| 65 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../AzureStorageBlobLocalContainerService.java | 38 +
.../services/AzureStorageBlobRemoteService.java| 51 +
.../services/AzureStorageBlobServiceFactory.java | 45 +++
.../camel-test-infra-azure-storage-queue/pom.xml | 65 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../AzureStorageQueueLocalContainerService.java| 38 +
.../services/AzureStorageQueueRemoteService.java | 51 +
.../services/AzureStorageQueueServiceFactory.java | 45 +++
test-infra/pom.xml | 3 +
19 files changed, 691 insertions(+)
create mode 100644 test-infra/camel-test-infra-azure-common/pom.xml
copy {tooling/maven/camel-resources-plugin =>
test-infra/camel-test-infra-azure-common}/src/main/resources/META-INF/MANIFEST.MF
(100%)
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/AzureConfigs.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/AzureCredentialsHolder.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureService.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureServices.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureStorageService.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
create mode 100644 test-infra/camel-test-infra-azure-storage-blob/pom.xml
copy {tooling/maven/camel-resources-plugin =>
test-infra/camel-test-infra-azure-storage-blob}/src/main/resources/META-INF/MANIFEST.MF
(100%)
create mode 100644
test-infra/camel-test-infra-azure-storage-blob/src/test/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobLocalContainerService.java
create mode 100644
test-infra/camel-test-infra-azure-storage-blob/src/test/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobRemoteService.java
create mode 100644
test-infra/camel-test-infra-azure-storage-blob/src/test/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java
create mode 100644 test-infra/camel-test-infra-azure-storage-queue/pom.xml
copy {tooling/maven/camel-resources-plugin =>
test-infra/camel-test-infra-azure-storage-queue}/src/main/resources/META-INF/MANIFEST.MF
(100%)
create mode 100644
test-infra/camel-test-infra-azure-storage-queue/src/test/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueLocalContainerService.java
create mode 100644
test-infra/camel-test-infra-azure-storage-queue/src/test/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueRemoteService.java
create mode 100644
test-infra/camel-test-infra-azure-storage-queue/src/test/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java
[camel] branch regen_bot updated (b10bd2d -> e9ca967)
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 b10bd2d Sync deps
add e9ca967 Added test infra for Azure services (#4595)
No new revisions were added by this update.
Summary of changes:
test-infra/camel-test-infra-azure-common/pom.xml | 53 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../test/infra/azure/common/AzureConfigs.java | 29 ++
.../infra/azure/common/AzureCredentialsHolder.java | 24
.../infra/azure/common/services/AzureService.java | 44 +++
.../infra/azure/common/services/AzureServices.java | 26 +
.../azure/common/services/AzureStorageService.java | 57 +++
.../azure/common/services/AzuriteContainer.java| 57 +++
.../camel-test-infra-azure-storage-blob/pom.xml| 65 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../AzureStorageBlobLocalContainerService.java | 38 +
.../services/AzureStorageBlobRemoteService.java| 51 +
.../services/AzureStorageBlobServiceFactory.java | 45 +++
.../camel-test-infra-azure-storage-queue/pom.xml | 65 ++
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../AzureStorageQueueLocalContainerService.java| 38 +
.../services/AzureStorageQueueRemoteService.java | 51 +
.../services/AzureStorageQueueServiceFactory.java | 45 +++
test-infra/pom.xml | 3 +
19 files changed, 691 insertions(+)
create mode 100644 test-infra/camel-test-infra-azure-common/pom.xml
copy {tooling/maven/camel-resources-plugin =>
test-infra/camel-test-infra-azure-common}/src/main/resources/META-INF/MANIFEST.MF
(100%)
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/AzureConfigs.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/AzureCredentialsHolder.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureService.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureServices.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzureStorageService.java
create mode 100644
test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
create mode 100644 test-infra/camel-test-infra-azure-storage-blob/pom.xml
copy {tooling/maven/camel-resources-plugin =>
test-infra/camel-test-infra-azure-storage-blob}/src/main/resources/META-INF/MANIFEST.MF
(100%)
create mode 100644
test-infra/camel-test-infra-azure-storage-blob/src/test/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobLocalContainerService.java
create mode 100644
test-infra/camel-test-infra-azure-storage-blob/src/test/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobRemoteService.java
create mode 100644
test-infra/camel-test-infra-azure-storage-blob/src/test/java/org/apache/camel/test/infra/azure/storage/blob/services/AzureStorageBlobServiceFactory.java
create mode 100644 test-infra/camel-test-infra-azure-storage-queue/pom.xml
copy {tooling/maven/camel-resources-plugin =>
test-infra/camel-test-infra-azure-storage-queue}/src/main/resources/META-INF/MANIFEST.MF
(100%)
create mode 100644
test-infra/camel-test-infra-azure-storage-queue/src/test/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueLocalContainerService.java
create mode 100644
test-infra/camel-test-infra-azure-storage-queue/src/test/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueRemoteService.java
create mode 100644
test-infra/camel-test-infra-azure-storage-queue/src/test/java/org/apache/camel/test/infra/azure/storage/queue/services/AzureStorageQueueServiceFactory.java
[camel-kafka-connector] branch master updated: Added missing dependency causing Strimzi tests to fail
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 480eec2 Added missing dependency causing Strimzi tests to fail
480eec2 is described below
commit 480eec2adaf57202ba3afd243fc6066d97451bb7
Author: Otavio Rodolfo Piske
AuthorDate: Thu Nov 12 12:17:18 2020 +0100
Added missing dependency causing Strimzi tests to fail
---
tests/itests-parent/pom.xml | 8
1 file changed, 8 insertions(+)
diff --git a/tests/itests-parent/pom.xml b/tests/itests-parent/pom.xml
index 65e47c4..7765f27 100644
--- a/tests/itests-parent/pom.xml
+++ b/tests/itests-parent/pom.xml
@@ -59,6 +59,14 @@
org.apache.camel
+camel-test-infra-common
+${camel.version}
+test-jar
+test
+
+
+
+org.apache.camel
camel-test-infra-kafka
${camel.version}
test-jar
[GitHub] [camel-kafka-connector] orpiske merged pull request #706: Added missing dependency causing Strimzi tests to fail
orpiske merged pull request #706: URL: https://github.com/apache/camel-kafka-connector/pull/706 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] bthj commented on issue #1376: MicroK8s' built-in registry declared for the Camel K installation, but not used - integration installations fail
bthj commented on issue #1376: URL: https://github.com/apache/camel-k/issues/1376#issuecomment-726043259 Hi - haven't had an opportunity to look further 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 (e9ca967 -> 6ab49a8)
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 e9ca967 Added test infra for Azure services (#4595) add 6d37f52 Upgrade Jandex to version 2.2.2.Final add 6ab49a8 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 (e9ca967 -> 6ab49a8)
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 e9ca967 Added test infra for Azure services (#4595) add 6d37f52 Upgrade Jandex to version 2.2.2.Final add 6ab49a8 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 (e9ca967 -> 6ab49a8)
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 e9ca967 Added test infra for Azure services (#4595) add 6d37f52 Upgrade Jandex to version 2.2.2.Final add 6ab49a8 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(-)
[GitHub] [camel] orpiske merged pull request #4597: Ensure that test-infra properties are registered and accessible outside of test
orpiske merged pull request #4597: URL: https://github.com/apache/camel/pull/4597 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 (6ab49a8 -> f86639e)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 6ab49a8 Sync deps add f86639e Ensure that test-infra properties are registered and accessible outside of test (#4597) No new revisions were added by this update. Summary of changes: .../test/infra/services/QpidEmbeddedService.java | 5 .../aws/services/AWSLocalContainerService.java | 35 -- .../test/infra/aws/services/AWSRemoteService.java | 7 - .../aws2/services/AWSLocalContainerService.java| 19 +++- .../test/infra/aws2/services/AWSRemoteService.java | 7 - .../azure/common/services/AzureStorageService.java | 2 +- .../AzureStorageBlobLocalContainerService.java | 2 +- .../services/AzureStorageBlobRemoteService.java| 7 - .../AzureStorageQueueLocalContainerService.java| 2 +- .../services/AzureStorageQueueRemoteService.java | 7 - .../cassandra/common/CassandraProperties.java | 20 - .../services/CassandraLocalContainerService.java | 8 + .../cassandra/services/RemoteCassandraService.java | 12 ++-- .../test/infra/common/services/TestService.java| 8 + .../couchbase/common/CouchbaseProperties.java | 15 +- .../services/CouchbaseLocalContainerService.java | 10 +++ .../couchbase/services/CouchbaseRemoteService.java | 17 +++ .../common/ElasticSearchProperties.java| 13 .../ElasticSearchLocalContainerService.java| 9 ++ .../services/RemoteElasticSearchService.java | 13 ++-- .../test/infra/kafka/common/KafkaProperties.java | 13 .../kafka/services/ContainerLocalKafkaService.java | 7 + .../infra/kafka/services/RemoteKafkaService.java | 9 +- .../test/infra/kafka/services/StrimziService.java | 7 + .../infra/mongodb/common/MongoDBProperties.java| 13 .../services/MongoDBLocalContainerService.java | 8 + .../mongodb/services/MongoDBRemoteService.java | 13 ++-- .../services/RabbitMQLocalContainerService.java| 1 + .../rabbitmq/services/RabbitMQRemoteService.java | 7 - .../infra/rabbitmq/services/RabbitMQService.java | 3 +- 30 files changed, 208 insertions(+), 91 deletions(-) copy core/camel-core-model/src/main/java/org/apache/camel/model/ClaimCheckOperation.java => test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/common/CassandraProperties.java (77%) copy components/camel-apns/src/main/java/org/apache/camel/component/apns/model/ApnsConstants.java => test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/common/CouchbaseProperties.java (66%) copy components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java => test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/common/ElasticSearchProperties.java (73%) copy components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java => test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/common/KafkaProperties.java (73%) copy components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java => test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/common/MongoDBProperties.java (74%)
[GitHub] [camel-k] astefanutti closed issue #1760: Ability to configure PodDisruptionBudget for integrations
astefanutti closed issue #1760: URL: https://github.com/apache/camel-k/issues/1760 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: Create pdbTrait that adds PodDisruptionBudget for every integration
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 e4f52eb Create pdbTrait that adds PodDisruptionBudget for every
integration
e4f52eb is described below
commit e4f52eb45ce9374dd2067bf5f628b4a40f7b3e87
Author: mmelko
AuthorDate: Thu Oct 22 13:49:16 2020 +0200
Create pdbTrait that adds PodDisruptionBudget for every integration
---
deploy/operator-role-kubernetes.yaml | 11
deploy/operator-role-olm.yaml| 11
deploy/operator-role-openshift.yaml | 11
deploy/resources.go | 12 ++--
pkg/trait/pdb.go | 109 +++
pkg/trait/pdb_test.go| 122 +++
pkg/trait/trait_register.go | 1 +
7 files changed, 271 insertions(+), 6 deletions(-)
diff --git a/deploy/operator-role-kubernetes.yaml
b/deploy/operator-role-kubernetes.yaml
index 26c4c48..f194602 100644
--- a/deploy/operator-role-kubernetes.yaml
+++ b/deploy/operator-role-kubernetes.yaml
@@ -48,6 +48,17 @@ rules:
- update
- watch
- apiGroups:
+ - policy
+ resources:
+ - poddisruptionbudgets
+ verbs:
+ - create
+ - delete
+ - get
+ - update
+ - list
+ - patch
+- apiGroups:
- rbac.authorization.k8s.io
resources:
- roles
diff --git a/deploy/operator-role-olm.yaml b/deploy/operator-role-olm.yaml
index 53fa59f..d488dd1 100644
--- a/deploy/operator-role-olm.yaml
+++ b/deploy/operator-role-olm.yaml
@@ -48,6 +48,17 @@ rules:
- update
- watch
- apiGroups:
+ - policy
+ resources:
+ - poddisruptionbudgets
+ verbs:
+ - create
+ - delete
+ - get
+ - update
+ - patch
+ - list
+- apiGroups:
- rbac.authorization.k8s.io
resources:
- roles
diff --git a/deploy/operator-role-openshift.yaml
b/deploy/operator-role-openshift.yaml
index 31696bc..8b20303 100644
--- a/deploy/operator-role-openshift.yaml
+++ b/deploy/operator-role-openshift.yaml
@@ -48,6 +48,17 @@ rules:
- update
- watch
- apiGroups:
+ - policy
+ resources:
+ - poddisruptionbudgets
+ verbs:
+ - create
+ - delete
+ - get
+ - update
+ - list
+ - patch
+- apiGroups:
- rbac.authorization.k8s.io
resources:
- roles
diff --git a/deploy/resources.go b/deploy/resources.go
index a47f1d4..f432da1 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -231,9 +231,9 @@ var assets = func() http.FileSystem {
"/operator-role-kubernetes.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-role-kubernetes.yaml",
modTime: time.Time{},
- uncompressedSize: 2244,
+ uncompressedSize: 2375,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x54\xc1\x6e\x1b\x37\x10\xbd\xf3\x2b\x1e\xb4\x97\xa4\xb0\xe4\xb6\xa7\x42\x3d\xa9\x8e\xdd\x0a\x0d\x24\xc0\xab\x34\xc8\x91\xe2\x8e\x56\x53\x73\x39\x2c\xc9\x95\xec\x7e\x7d\x41\xee\x2a\x91\xa3\x04\xe8\x21\x88\xf7\xa2\x21\x77\xf6\xcd\x9b\xf7\x46\x53\x61\xfa\xed\x1e\x55\xe1\x2d\x1b\x72\x91\x1a\x24\x41\xda\x13\x16\x5e\x9b\x3d\xa1\x96\x5d\x3a\xea\x40\xb8\x93\xde\x35\x3a\xb1\x38\xbc\x5a\xd4\x77\xaf\xd1\xbb\x86\x02\xc4\x11\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x54\xc1\x72\xdb\x36\x10\xbd\xf3\x2b\xde\x88\x97\xa4\x63\xc9\x6d\x4f\x1d\xf5\xa4\x26\x76\xab\x69\x46\x9a\x31\x95\x66\x72\x04\xc1\x15\xb5\x35\x88\x45\x01\x50\xb2\xfa\xf5\x1d\x40\x54\x22\x9b\xce\x8c\x0f\x9e\x86\x17\x2d\xc0\xe5\xdb\xb7\xfb\x9e\xb6\xc4\xf4\xf5\x9e\xa2\xc4\x07\xd6\x64\x03\x35\x88\x82\xb8\x23\x2c\x9c\xd2\x3b\x42\x25\xdb\x78\x50\x9e\x70\x2b\xbd\x6d\x54\x64\xb1\x78\xb3\xa8\x6e\xdf\xa2\xb7\x0d\x79\x88\x25\x
[...]
},
"/operator-role-olm-cluster.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-role-olm-cluster.yaml",
@@ -245,16 +245,16 @@ var assets = func() http.FileSystem {
"/operator-role-olm.yaml": &vfsgenÛ°CompressedFileInfo{
name: "operator-role-olm.yaml",
modTime: time.Time{},
- uncompressedSize: 3958,
+ uncompressedSize: 4089,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x41\x8f\xdb\x36\x13\xbd\xeb\x57\x0c\xec\x4b\xf2\x61\x2d\x7f\xed\xa9\x70\x4f\x6e\xb2\xdb\x1a\x0d\xbc\xc0\x7a\xd3\x20\xc7\x31\x35\x96\xa6\x26\x39\x2c\x49\xd9\x71\x7e\x7d\x41\x4a\x4e\xe4\x68\xb7\x49\x81\x00\xae\x2f\xa6\x86\xa3\x99\x37\xef\x0d\x47\x9c\xc2\xec\xfb\xfd\x8a\x29\xbc\x61\x45\x36\x50\x05\x51\x20\x36\x04\x4b\x87\xaa\x21\xd8\xc8\x2e\x1e\xd1\x13\xdc\x49\x6b\x2b\x8c\x2c\x16\x5e\x2c\x37\x77\x2f\xa1\xb5\x15\x
[...]
+ compressedConten
[GitHub] [camel-k] astefanutti merged pull request #1787: Create PodDisruptionBudget for every integration
astefanutti merged pull request #1787: URL: https://github.com/apache/camel-k/pull/1787 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 (6ab49a8 -> f86639e)
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 6ab49a8 Sync deps add f86639e Ensure that test-infra properties are registered and accessible outside of test (#4597) No new revisions were added by this update. Summary of changes: .../test/infra/services/QpidEmbeddedService.java | 5 .../aws/services/AWSLocalContainerService.java | 35 -- .../test/infra/aws/services/AWSRemoteService.java | 7 - .../aws2/services/AWSLocalContainerService.java| 19 +++- .../test/infra/aws2/services/AWSRemoteService.java | 7 - .../azure/common/services/AzureStorageService.java | 2 +- .../AzureStorageBlobLocalContainerService.java | 2 +- .../services/AzureStorageBlobRemoteService.java| 7 - .../AzureStorageQueueLocalContainerService.java| 2 +- .../services/AzureStorageQueueRemoteService.java | 7 - .../cassandra/common/CassandraProperties.java | 20 - .../services/CassandraLocalContainerService.java | 8 + .../cassandra/services/RemoteCassandraService.java | 12 ++-- .../test/infra/common/services/TestService.java| 8 + .../couchbase/common/CouchbaseProperties.java | 15 +- .../services/CouchbaseLocalContainerService.java | 10 +++ .../couchbase/services/CouchbaseRemoteService.java | 17 +++ .../common/ElasticSearchProperties.java| 13 .../ElasticSearchLocalContainerService.java| 9 ++ .../services/RemoteElasticSearchService.java | 13 ++-- .../test/infra/kafka/common/KafkaProperties.java | 13 .../kafka/services/ContainerLocalKafkaService.java | 7 + .../infra/kafka/services/RemoteKafkaService.java | 9 +- .../test/infra/kafka/services/StrimziService.java | 7 + .../infra/mongodb/common/MongoDBProperties.java| 13 .../services/MongoDBLocalContainerService.java | 8 + .../mongodb/services/MongoDBRemoteService.java | 13 ++-- .../services/RabbitMQLocalContainerService.java| 1 + .../rabbitmq/services/RabbitMQRemoteService.java | 7 - .../infra/rabbitmq/services/RabbitMQService.java | 3 +- 30 files changed, 208 insertions(+), 91 deletions(-) copy core/camel-core-model/src/main/java/org/apache/camel/model/ClaimCheckOperation.java => test-infra/camel-test-infra-cassandra/src/test/java/org/apache/camel/test/infra/cassandra/common/CassandraProperties.java (77%) copy components/camel-apns/src/main/java/org/apache/camel/component/apns/model/ApnsConstants.java => test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/common/CouchbaseProperties.java (66%) copy components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java => test-infra/camel-test-infra-elasticsearch/src/test/java/org/apache/camel/test/infra/elasticsearch/common/ElasticSearchProperties.java (73%) copy components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java => test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/common/KafkaProperties.java (73%) copy components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java => test-infra/camel-test-infra-mongodb/src/test/java/org/apache/camel/test/infra/mongodb/common/MongoDBProperties.java (74%)
[GitHub] [camel-kafka-connector] oscerd opened a new pull request #707: Add RemoteFileTransforms to the FTPS connector directly
oscerd opened a new pull request #707: URL: https://github.com/apache/camel-kafka-connector/pull/707 Fixes #702 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 ftps-transform created (now cf694e2)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch ftps-transform in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at cf694e2 Regen catalog No new revisions were added by this update.
[camel-kafka-connector] branch ftps-transform created (now cf694e2)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch ftps-transform in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. at cf694e2 Regen catalog No new revisions were added by this update.
[camel] branch master updated: CAMEL-15845: Add events consumer to GitHub component
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton 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 45af1c5 CAMEL-15845: Add events consumer to GitHub component
45af1c5 is described below
commit 45af1c538feffa2afb1b42c341eb30cd75ecf461
Author: James Netherton
AuthorDate: Thu Nov 12 09:06:21 2020 +
CAMEL-15845: Add events consumer to GitHub component
---
.../apache/camel/catalog/components/github.json| 3 +-
.../camel/catalog/docs/github-component.adoc | 5 +-
.../component/github/GitHubEndpointConfigurer.java | 6 ++
.../component/github/GitHubEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/github/github.json | 3 +-
.../src/main/docs/github-component.adoc| 5 +-
.../camel/component/github/GitHubConstants.java| 2 +
.../camel/component/github/GitHubEndpoint.java | 17
.../apache/camel/component/github/GitHubType.java | 4 +-
.../component/github/consumer/EventsConsumer.java | 105 +
.../github/event/GitHubEventFetchStrategy.java | 38
.../component/github/GitHubComponentTestBase.java | 3 +
.../github/consumer/EventConsumerTest.java | 61
.../consumer/EventConsumerWithStrategyTest.java| 82
.../github/services/MockEventService.java | 69 ++
.../github/services/MockRepositoryService.java | 5 +
.../builder/endpoint/StaticEndpointBuilders.java | 8 +-
.../endpoint/dsl/GitHubEndpointBuilderFactory.java | 36 ++-
.../modules/ROOT/pages/github-component.adoc | 5 +-
19 files changed, 441 insertions(+), 19 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/github.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/github.json
index ec31a44..4287f87 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/github.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/github.json
@@ -27,7 +27,7 @@
"basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" }
},
"properties": {
-"type": { "kind": "path", "displayName": "Type", "group": "common",
"label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.github.GitHubType", "enum": [ "CLOSEPULLREQUEST",
"PULLREQUESTCOMMENT", "COMMIT", "PULLREQUEST", "TAG", "PULLREQUESTSTATE",
"PULLREQUESTFILES", "GETCOMMITFILE", "CREATEISSUE" ], "deprecated": false,
"deprecationNote": "", "secret": false, "description": "What git operation to
execute" },
+"type": { "kind": "path", "displayName": "Type", "group": "common",
"label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.github.GitHubType", "enum": [ "CLOSEPULLREQUEST",
"PULLREQUESTCOMMENT", "COMMIT", "PULLREQUEST", "TAG", "PULLREQUESTSTATE",
"PULLREQUESTFILES", "GETCOMMITFILE", "CREATEISSUE", "EVENT" ], "deprecated":
false, "deprecationNote": "", "secret": false, "description": "What git
operation to execute" },
"branchName": { "kind": "path", "displayName": "Branch Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "Name of branch" },
"oauthToken": { "kind": "parameter", "displayName": "Oauth Token",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "GitHub OAuth token, required unless username & password are
provided" },
"password": { "kind": "parameter", "displayName": "Password", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"GitHub password, required unless oauthToken is provided" },
@@ -36,6 +36,7 @@
"username": { "kind": "parameter", "displayName": "Username", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description":
"GitHub username, required unless oauthToken is provided" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defa
[GitHub] [camel] jamesnetherton merged pull request #4596: CAMEL-15845: Add events consumer to GitHub component
jamesnetherton merged pull request #4596: URL: https://github.com/apache/camel/pull/4596 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-runtime] lburgazzoli closed issue #521: knative: split producer and consumer transport to avoid requiring platorm-http also for the producer
lburgazzoli closed issue #521: URL: https://github.com/apache/camel-k-runtime/issues/521 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-runtime] branch master updated: knative: split producer and consumer #521
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/master by this push:
new c758c1e knative: split producer and consumer #521
c758c1e is described below
commit c758c1eb252075c8b1643dc23ba4ab8c0bbb8d63
Author: Luca Burgazzoli
AuthorDate: Thu Oct 1 19:16:07 2020 +0200
knative: split producer and consumer #521
---
.github/workflows/ci-build.yml | 2 +
camel-k-knative/{ => consumer}/deployment/pom.xml | 24 +---
.../deployment/KnativeConsumerFeature.java}| 6 +-
.../deployment/KnativeConsumerProcessor.java | 40 ++
camel-k-knative/{ => consumer}/pom.xml | 5 +-
camel-k-knative/{ => consumer}/runtime/pom.xml | 16 +--
.../knative/consumer/KnativeConsumerRecorder.java} | 37 +++---
camel-k-knative/deployment/pom.xml | 17 ---
.../{Feature.java => KnativeFeature.java} | 4 +-
...loymentProcessor.java => KnativeProcessor.java} | 17 +--
camel-k-knative/pom.xml| 3 +-
camel-k-knative/{ => producer}/deployment/pom.xml | 24 +---
.../deployment/KnativeProducerFeature.java}| 6 +-
.../deployment/KnativeProducerProcessor.java | 40 ++
camel-k-knative/{ => producer}/pom.xml | 5 +-
camel-k-knative/{ => producer}/runtime/pom.xml | 22 +---
.../knative/producer/KnativeProducerRecorder.java} | 35 +++---
camel-k-knative/runtime/pom.xml| 25 +---
.../camel/k/quarkus/knative/KnativeRecorder.java | 27 +
...eTransport.java => KnativeConsumerFactory.java} | 16 +--
...eTransport.java => KnativeProducerFactory.java} | 17 +--
.../camel-knative/camel-knative-http/pom.xml | 16 ++-
.../knative/http/KnativeHttpConsumer.java | 49 +++-
...nsport.java => KnativeHttpConsumerFactory.java} | 67 +++
...nsport.java => KnativeHttpProducerFactory.java} | 60 +++--
.../knative/transport/{http => http-consumer} | 2 +-
.../knative/transport/{http => http-producer} | 2 +-
.../component/knative/http/KnativeHttpTest.java| 51 +---
.../knative/http/KnativeHttpTestSupport.java | 20 +++
.../knative/KnativeComponentConfigurer.java| 13 +-
.../apache/camel/component/knative/knative.json| 5 +-
.../src/main/docs/knative-component.adoc | 5 +-
.../camel/component/knative/KnativeComponent.java | 134 +++--
.../camel/component/knative/KnativeEndpoint.java | 12 +-
.../component/knative/KnativeComponentTest.java| 3 +-
.../component/knative/KnativeTransportNoop.java| 5 +-
examples/knative/data/env.json | 5 +-
examples/knative/data/routes.yaml | 21 ++--
examples/knative/pom.xml | 8 ++
.../pom.xml| 15 +--
.../k/quarkus/it/KnativeConsumerApplication.java | 53
.../src/main/resources/application.properties | 3 +-
.../camel/k/quarkus/it/KnativeConsumerIT.java | 16 +--
.../camel/k/quarkus/it/KnativeConsumerTest.java| 48
.../pom.xml| 15 +--
.../k/quarkus/it/KnativeProducerApplication.java | 53
.../src/main/resources/application.properties | 3 +-
.../camel/k/quarkus/it/KnativeProducerIT.java | 16 +--
.../camel/k/quarkus/it/KnativeProducerTest.java| 48
itests/camel-k-itests-knative-sinkbinding/pom.xml | 8 ++
.../camel-k-itests-knative-source-groovy/pom.xml | 8 ++
itests/camel-k-itests-knative-source-java/pom.xml | 8 ++
itests/camel-k-itests-knative-source-js/pom.xml| 8 ++
itests/camel-k-itests-knative-source-xml/pom.xml | 8 ++
itests/camel-k-itests-knative-source-yaml/pom.xml | 8 ++
itests/camel-k-itests-knative/pom.xml | 8 ++
.../camel/k/quarkus/it/KnativeApplication.java | 6 +
.../org/apache/camel/k/quarkus/it/KnativeTest.java | 8 ++
itests/camel-k-itests-runtime-yaml/pom.xml | 34 ++
.../src/main/resources/application.properties | 2 +-
itests/pom.xml | 2 +
pom.xml| 20 +++
.../camel/k/catalog/model/CamelArtifact.java | 7 ++
.../apache/camel/k/catalog/model/CamelScheme.java | 16 +++
...CamelArtifact.java => CamelScopedArtifact.java} | 37 ++
.../src/it/generate-catalog/verify.groovy | 35 --
.../maven/processors/CatalogProcessor3x.java | 10 +-
support/camel-k-runtime-bom/pom.xml| 10 ++
68 files changed, 843 insertions(+), 536 deletions(-)
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 540f857..87ec4d5 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workf
[GitHub] [camel-k-runtime] lburgazzoli merged pull request #551: knative: split producer and consumer
lburgazzoli merged pull request #551: URL: https://github.com/apache/camel-k-runtime/pull/551 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 issue #1703: Solr native support
zbendhiba commented on issue #1703: URL: https://github.com/apache/camel-quarkus/issues/1703#issuecomment-726140556 working on this one. Can you assign to me ? 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 closed issue #702: Add RemoteFileTransforms to the FTPS connector directly
oscerd closed issue #702: URL: https://github.com/apache/camel-kafka-connector/issues/702 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 merged pull request #707: Add RemoteFileTransforms to the FTPS connector directly
oscerd merged pull request #707: URL: https://github.com/apache/camel-kafka-connector/pull/707 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] 01/02: Upgrade AssertJ to version 3.18.1
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 e8c6a3955ab203d01f9aa1d8bd82e44bcb60307f Author: Andrea Cosentino AuthorDate: Thu Nov 12 15:02:59 2020 +0100 Upgrade AssertJ to version 3.18.1 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b05e579..c3f3b5d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -64,7 +64,7 @@ 2.0.0.Final 8.0.1 1.9.6 -3.18.0 +3.18.1 1.0.0-final 2.1.0 3.0.0
[camel] branch master updated (45af1c5 -> 309aef5)
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 45af1c5 CAMEL-15845: Add events consumer to GitHub component new e8c6a39 Upgrade AssertJ to version 3.18.1 new 309aef5 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
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 309aef527e10a68701f87c33355ea1d418284243 Author: Andrea Cosentino AuthorDate: Thu Nov 12 15:04:51 2020 +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 99b5b97..0137c22 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -56,7 +56,7 @@ 2.0.0.Final 8.0.1 1.9.6 -3.18.0 +3.18.1 1.0.0-final 2.1.0 3.0.0
[camel] branch regen_bot updated (f86639e -> 45af1c5)
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 f86639e Ensure that test-infra properties are registered and
accessible outside of test (#4597)
add 45af1c5 CAMEL-15845: Add events consumer to GitHub component
No new revisions were added by this update.
Summary of changes:
.../apache/camel/catalog/components/github.json| 3 +-
.../camel/catalog/docs/github-component.adoc | 5 +-
.../component/github/GitHubEndpointConfigurer.java | 6 ++
.../component/github/GitHubEndpointUriFactory.java | 3 +-
.../org/apache/camel/component/github/github.json | 3 +-
.../src/main/docs/github-component.adoc| 5 +-
.../camel/component/github/GitHubConstants.java| 2 +
.../camel/component/github/GitHubEndpoint.java | 17
.../apache/camel/component/github/GitHubType.java | 4 +-
.../component/github/consumer/EventsConsumer.java | 105 +
.../github/event/GitHubEventFetchStrategy.java}| 40
.../component/github/GitHubComponentTestBase.java | 3 +
...TagConsumerTest.java => EventConsumerTest.java} | 60 ++--
.../consumer/EventConsumerWithStrategyTest.java| 82
.../github/services/MockEventService.java | 69 ++
.../github/services/MockRepositoryService.java | 5 +
.../builder/endpoint/StaticEndpointBuilders.java | 8 +-
.../endpoint/dsl/GitHubEndpointBuilderFactory.java | 36 ++-
.../modules/ROOT/pages/github-component.adoc | 5 +-
19 files changed, 389 insertions(+), 72 deletions(-)
create mode 100644
components/camel-github/src/main/java/org/apache/camel/component/github/consumer/EventsConsumer.java
copy
components/{camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureNoKeyException.java
=>
camel-github/src/main/java/org/apache/camel/component/github/event/GitHubEventFetchStrategy.java}
(53%)
copy
components/camel-github/src/test/java/org/apache/camel/component/github/consumer/{TagConsumerTest.java
=> EventConsumerTest.java} (50%)
create mode 100644
components/camel-github/src/test/java/org/apache/camel/component/github/consumer/EventConsumerWithStrategyTest.java
create mode 100644
components/camel-github/src/test/java/org/apache/camel/component/github/services/MockEventService.java
[camel-kafka-connector] branch master updated (480eec2 -> 540b5a6)
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-kafka-connector.git.
from 480eec2 Added missing dependency causing Strimzi tests to fail
new fc9a9b3 Add RemoteFileTransforms to the FTPS connector directly
new 540b5a6 Regen catalog
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:
.../src/generated/resources/connectors/camel-ftps-sink.json | 5 -
.../src/generated/resources/connectors/camel-ftps-source.json| 5 -
.../src/generated/resources/camel-ftps-sink.json | 5 -
.../src/generated/resources/camel-ftps-source.json | 5 -
.../src/main/docs/camel-ftps-kafka-sink-connector.adoc | 9 -
.../src/main/docs/camel-ftps-kafka-source-connector.adoc | 9 -
.../ftps/transformers/FtpsRemoteFileTransforms.java} | 6 +++---
.../ROOT/pages/connectors/camel-ftps-kafka-sink-connector.adoc | 9 -
.../ROOT/pages/connectors/camel-ftps-kafka-source-connector.adoc | 9 -
9 files changed, 51 insertions(+), 11 deletions(-)
copy
connectors/{camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java
=>
camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java}
(91%)
[camel-kafka-connector] 02/02: Regen catalog
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-kafka-connector.git commit 540b5a6ab22bd4723e4adc5e7758ecf0b6159415 Author: Andrea Cosentino AuthorDate: Thu Nov 12 15:10:28 2020 +0100 Regen catalog --- .../src/generated/resources/connectors/camel-ftps-sink.json | 5 - .../src/generated/resources/connectors/camel-ftps-source.json| 5 - .../src/generated/resources/camel-ftps-sink.json | 5 - .../src/generated/resources/camel-ftps-source.json | 5 - .../src/main/docs/camel-ftps-kafka-sink-connector.adoc | 9 - .../src/main/docs/camel-ftps-kafka-source-connector.adoc | 9 - .../ROOT/pages/connectors/camel-ftps-kafka-sink-connector.adoc | 9 - .../ROOT/pages/connectors/camel-ftps-kafka-source-connector.adoc | 9 - 8 files changed, 48 insertions(+), 8 deletions(-) diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json index 1e05d4e..ee1d57e 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json @@ -395,5 +395,8 @@ "priority": "MEDIUM", "required": "false" } - } + }, + "transforms": [ + "org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms" + ] } \ No newline at end of file diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json index a56bc28..3734e61 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json @@ -728,5 +728,8 @@ "priority": "MEDIUM", "required": "false" } - } + }, + "transforms": [ + "org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms" + ] } \ No newline at end of file diff --git a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-sink.json b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-sink.json index b937946..74eba56 100644 --- a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-sink.json +++ b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-sink.json @@ -395,5 +395,8 @@ "priority": "MEDIUM", "required": "false" } - } + }, + "transforms": [ + "org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms" + ] } \ No newline at end of file diff --git a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-source.json b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-source.json index 3091da6..60cca1a 100644 --- a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-source.json +++ b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-source.json @@ -728,5 +728,8 @@ "priority": "MEDIUM", "required": "false" } - } + }, + "transforms": [ + "org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms" + ] } \ No newline at end of file diff --git a/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-sink-connector.adoc b/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-sink-connector.adoc index ae5e334..1e3bb25 100644 --- a/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-sink-connector.adoc +++ b/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-sink-connector.adoc @@ -98,10 +98,17 @@ The camel-ftps sink connector has no converters out of the box. -The camel-ftps sink connector has no transforms out of the box. +The camel-ftps sink connector supports 0 transforms out of the box, which are listed below. +[source,java] + + +org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms + + + The camel-ftps sink connector has no aggregation strategies out of the box. diff --git a/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-source-connector.adoc b/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-source-connector.adoc index 516c46b..7cd03ba 100644 --- a/connectors/camel-ftps-kafka-connector/src/ma
[camel-kafka-connector] 01/02: Add RemoteFileTransforms to the FTPS connector directly
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-kafka-connector.git
commit fc9a9b3c1ea034c29d2bce1774983876ab187eeb
Author: Andrea Cosentino
AuthorDate: Thu Nov 12 14:56:49 2020 +0100
Add RemoteFileTransforms to the FTPS connector directly
---
.../transformers/FtpsRemoteFileTransforms.java | 71 ++
1 file changed, 71 insertions(+)
diff --git
a/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
b/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
new file mode 100644
index 000..7d9d13c
--- /dev/null
+++
b/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
@@ -0,0 +1,71 @@
+/*
+ * 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.kafkaconnector.ftps.transformers;
+
+import java.util.Map;
+
+import org.apache.camel.component.file.remote.RemoteFile;
+import org.apache.camel.kafkaconnector.utils.SchemaHelper;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.ConnectRecord;
+import org.apache.kafka.connect.transforms.Transformation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FtpsRemoteFileTransforms > implements
Transformation {
+public static final String FIELD_KEY_CONFIG = "key";
+public static final ConfigDef CONFIG_DEF = new ConfigDef()
+.define(FIELD_KEY_CONFIG, ConfigDef.Type.STRING, null,
ConfigDef.Importance.MEDIUM,
+"Transforms Remote File to String");
+
+private static final Logger LOG =
LoggerFactory.getLogger(FtpsRemoteFileTransforms.class);
+
+@Override
+public R apply(R r) {
+Object value = r.value();
+
+if (r.value() instanceof RemoteFile) {
+LOG.debug("Converting record from RemoteFile to text");
+RemoteFile message = (RemoteFile) r.value();
+
+LOG.debug("Received text: {}", message.getBody());
+
+return r.newRecord(r.topic(), r.kafkaPartition(), null, r.key(),
+SchemaHelper.buildSchemaBuilderForType(message.getBody()),
message.getBody(), r.timestamp());
+
+} else {
+LOG.debug("Unexpected message type: {}", r.value().getClass());
+
+return r;
+}
+}
+
+@Override
+public ConfigDef config() {
+return CONFIG_DEF;
+}
+
+@Override
+public void close() {
+
+}
+
+@Override
+public void configure(Map map) {
+
+}
+}
[camel-kafka-connector] 01/02: Add RemoteFileTransforms to the FTPS connector directly
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-kafka-connector.git
commit fc9a9b3c1ea034c29d2bce1774983876ab187eeb
Author: Andrea Cosentino
AuthorDate: Thu Nov 12 14:56:49 2020 +0100
Add RemoteFileTransforms to the FTPS connector directly
---
.../transformers/FtpsRemoteFileTransforms.java | 71 ++
1 file changed, 71 insertions(+)
diff --git
a/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
b/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
new file mode 100644
index 000..7d9d13c
--- /dev/null
+++
b/connectors/camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java
@@ -0,0 +1,71 @@
+/*
+ * 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.kafkaconnector.ftps.transformers;
+
+import java.util.Map;
+
+import org.apache.camel.component.file.remote.RemoteFile;
+import org.apache.camel.kafkaconnector.utils.SchemaHelper;
+import org.apache.kafka.common.config.ConfigDef;
+import org.apache.kafka.connect.connector.ConnectRecord;
+import org.apache.kafka.connect.transforms.Transformation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FtpsRemoteFileTransforms > implements
Transformation {
+public static final String FIELD_KEY_CONFIG = "key";
+public static final ConfigDef CONFIG_DEF = new ConfigDef()
+.define(FIELD_KEY_CONFIG, ConfigDef.Type.STRING, null,
ConfigDef.Importance.MEDIUM,
+"Transforms Remote File to String");
+
+private static final Logger LOG =
LoggerFactory.getLogger(FtpsRemoteFileTransforms.class);
+
+@Override
+public R apply(R r) {
+Object value = r.value();
+
+if (r.value() instanceof RemoteFile) {
+LOG.debug("Converting record from RemoteFile to text");
+RemoteFile message = (RemoteFile) r.value();
+
+LOG.debug("Received text: {}", message.getBody());
+
+return r.newRecord(r.topic(), r.kafkaPartition(), null, r.key(),
+SchemaHelper.buildSchemaBuilderForType(message.getBody()),
message.getBody(), r.timestamp());
+
+} else {
+LOG.debug("Unexpected message type: {}", r.value().getClass());
+
+return r;
+}
+}
+
+@Override
+public ConfigDef config() {
+return CONFIG_DEF;
+}
+
+@Override
+public void close() {
+
+}
+
+@Override
+public void configure(Map map) {
+
+}
+}
[camel-kafka-connector] branch master updated (480eec2 -> 540b5a6)
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-kafka-connector.git.
from 480eec2 Added missing dependency causing Strimzi tests to fail
new fc9a9b3 Add RemoteFileTransforms to the FTPS connector directly
new 540b5a6 Regen catalog
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:
.../src/generated/resources/connectors/camel-ftps-sink.json | 5 -
.../src/generated/resources/connectors/camel-ftps-source.json| 5 -
.../src/generated/resources/camel-ftps-sink.json | 5 -
.../src/generated/resources/camel-ftps-source.json | 5 -
.../src/main/docs/camel-ftps-kafka-sink-connector.adoc | 9 -
.../src/main/docs/camel-ftps-kafka-source-connector.adoc | 9 -
.../ftps/transformers/FtpsRemoteFileTransforms.java} | 6 +++---
.../ROOT/pages/connectors/camel-ftps-kafka-sink-connector.adoc | 9 -
.../ROOT/pages/connectors/camel-ftps-kafka-source-connector.adoc | 9 -
9 files changed, 51 insertions(+), 11 deletions(-)
copy
connectors/{camel-sftp-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/sftp/transformers/SftpRemoteFileTransforms.java
=>
camel-ftps-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/ftps/transformers/FtpsRemoteFileTransforms.java}
(91%)
[camel-kafka-connector] 02/02: Regen catalog
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-kafka-connector.git commit 540b5a6ab22bd4723e4adc5e7758ecf0b6159415 Author: Andrea Cosentino AuthorDate: Thu Nov 12 15:10:28 2020 +0100 Regen catalog --- .../src/generated/resources/connectors/camel-ftps-sink.json | 5 - .../src/generated/resources/connectors/camel-ftps-source.json| 5 - .../src/generated/resources/camel-ftps-sink.json | 5 - .../src/generated/resources/camel-ftps-source.json | 5 - .../src/main/docs/camel-ftps-kafka-sink-connector.adoc | 9 - .../src/main/docs/camel-ftps-kafka-source-connector.adoc | 9 - .../ROOT/pages/connectors/camel-ftps-kafka-sink-connector.adoc | 9 - .../ROOT/pages/connectors/camel-ftps-kafka-source-connector.adoc | 9 - 8 files changed, 48 insertions(+), 8 deletions(-) diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json index 1e05d4e..ee1d57e 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-sink.json @@ -395,5 +395,8 @@ "priority": "MEDIUM", "required": "false" } - } + }, + "transforms": [ + "org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms" + ] } \ No newline at end of file diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json index a56bc28..3734e61 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-ftps-source.json @@ -728,5 +728,8 @@ "priority": "MEDIUM", "required": "false" } - } + }, + "transforms": [ + "org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms" + ] } \ No newline at end of file diff --git a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-sink.json b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-sink.json index b937946..74eba56 100644 --- a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-sink.json +++ b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-sink.json @@ -395,5 +395,8 @@ "priority": "MEDIUM", "required": "false" } - } + }, + "transforms": [ + "org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms" + ] } \ No newline at end of file diff --git a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-source.json b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-source.json index 3091da6..60cca1a 100644 --- a/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-source.json +++ b/connectors/camel-ftps-kafka-connector/src/generated/resources/camel-ftps-source.json @@ -728,5 +728,8 @@ "priority": "MEDIUM", "required": "false" } - } + }, + "transforms": [ + "org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms" + ] } \ No newline at end of file diff --git a/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-sink-connector.adoc b/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-sink-connector.adoc index ae5e334..1e3bb25 100644 --- a/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-sink-connector.adoc +++ b/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-sink-connector.adoc @@ -98,10 +98,17 @@ The camel-ftps sink connector has no converters out of the box. -The camel-ftps sink connector has no transforms out of the box. +The camel-ftps sink connector supports 0 transforms out of the box, which are listed below. +[source,java] + + +org.apache.camel.kafkaconnector.ftps.transformers.FtpsRemoteFileTransforms + + + The camel-ftps sink connector has no aggregation strategies out of the box. diff --git a/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-source-connector.adoc b/connectors/camel-ftps-kafka-connector/src/main/docs/camel-ftps-kafka-source-connector.adoc index 516c46b..7cd03ba 100644 --- a/connectors/camel-ftps-kafka-connector/src/ma
[camel] branch master updated: camel-nats: Upgraded nats image to 2.1.9
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 059a7a7 camel-nats: Upgraded nats image to 2.1.9
059a7a7 is described below
commit 059a7a71ba9110ddbfe415eb3315f0de98bb74b9
Author: aldettinger
AuthorDate: Thu Nov 12 16:18:15 2020 +0100
camel-nats: Upgraded nats image to 2.1.9
---
.../camel/component/nats/NatsAuthTestSupport.java | 3 ++-
.../component/nats/NatsAuthTokenTestSupport.java | 3 ++-
.../component/nats/NatsTLSAuthTestSupport.java | 3 ++-
.../camel/component/nats/NatsTestConstants.java| 26 ++
.../camel/component/nats/NatsTestSupport.java | 3 ++-
5 files changed, 34 insertions(+), 4 deletions(-)
diff --git
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTestSupport.java
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTestSupport.java
index 39409cb..382a0cd 100644
---
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTestSupport.java
+++
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTestSupport.java
@@ -21,9 +21,10 @@ import
org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
+import static
org.apache.camel.component.nats.NatsTestConstants.CONTAINER_IMAGE;
+
public class NatsAuthTestSupport extends ContainerAwareTestSupport {
-public static final String CONTAINER_IMAGE = "nats:2.1.8";
public static final String CONTAINER_NAME = "nats-auth";
public static final String USERNAME = "admin";
public static final String PASSWORD = "password";
diff --git
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenTestSupport.java
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenTestSupport.java
index a160b71..1040124 100644
---
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenTestSupport.java
+++
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsAuthTokenTestSupport.java
@@ -21,9 +21,10 @@ import
org.apache.camel.test.testcontainers.junit5.ContainerAwareTestSupport;
import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.GenericContainer;
+import static
org.apache.camel.component.nats.NatsTestConstants.CONTAINER_IMAGE;
+
public class NatsAuthTokenTestSupport extends ContainerAwareTestSupport {
-public static final String CONTAINER_IMAGE = "nats:2.1.8";
public static final String CONTAINER_NAME = "nats-auth-token";
public static final String TOKEN = "!admin23456";
diff --git
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTLSAuthTestSupport.java
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTLSAuthTestSupport.java
index 3b05742..2f9e68a 100644
---
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTLSAuthTestSupport.java
+++
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTLSAuthTestSupport.java
@@ -22,11 +22,12 @@ import org.apache.camel.test.testcontainers.junit5.Wait;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
+import static
org.apache.camel.component.nats.NatsTestConstants.CONTAINER_IMAGE;
+
/*Certificates used for tests with TLS authentication come from:
*https://github.com/nats-io/jnats/tree/master/src/test/resources */
public class NatsTLSAuthTestSupport extends ContainerAwareTestSupport {
-public static final String CONTAINER_IMAGE = "nats:2.1.8";
public static final String CONTAINER_NAME = "nats-tls";
@Override
diff --git
a/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTestConstants.java
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTestConstants.java
new file mode 100644
index 000..3f73f8a
--- /dev/null
+++
b/components/camel-nats/src/test/java/org/apache/camel/component/nats/NatsTestConstants.java
@@ -0,0 +1,26 @@
+/*
+ * 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,
+
[GitHub] [camel-k-runtime] davsclaus commented on issue #544: Kamelet component - optimize as we did for direct component
davsclaus commented on issue #544: URL: https://github.com/apache/camel-k-runtime/issues/544#issuecomment-726148425 Yeah I should have time tomorrow and this can be done on camel 3.6 (I think) 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] cherepnalkovski opened a new pull request #4598: Camel 15848 add versioning state parameter
cherepnalkovski opened a new pull request #4598: URL: https://github.com/apache/camel/pull/4598 - [ ] 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 regen_bot updated (45af1c5 -> 309aef5)
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 45af1c5 CAMEL-15845: Add events consumer to GitHub component add e8c6a39 Upgrade AssertJ to version 3.18.1 add 309aef5 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 (309aef5 -> 059a7a7)
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 309aef5 Sync deps
add 059a7a7 camel-nats: Upgraded nats image to 2.1.9
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/camel/component/nats/NatsAuthTestSupport.java | 3 ++-
.../org/apache/camel/component/nats/NatsAuthTokenTestSupport.java | 3 ++-
.../org/apache/camel/component/nats/NatsTLSAuthTestSupport.java | 3 ++-
.../java/org/apache/camel/component/nats/NatsTestConstants.java} | 8
.../java/org/apache/camel/component/nats/NatsTestSupport.java | 3 ++-
5 files changed, 12 insertions(+), 8 deletions(-)
copy
components/{camel-grape/src/main/java/org/apache/camel/component/grape/GrapeConstants.java
=>
camel-nats/src/test/java/org/apache/camel/component/nats/NatsTestConstants.java}
(82%)
[GitHub] [camel] srcarrier commented on a change in pull request #4594: CAMEL-15769: disable split default delimiter
srcarrier commented on a change in pull request #4594:
URL: https://github.com/apache/camel/pull/4594#discussion_r55839
##
File path:
core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
##
@@ -517,6 +520,14 @@ public void setExpression(ExpressionDefinition expression)
{
super.setExpression(expression);
}
+public String getDelimiter() {
+return delimiter;
+}
+
+public void setDelimiter(String delimiter) {
Review comment:
Thanks Claus - see latest commit 50d57a986c6fe748313a8d195060e74e4cb3fc51
I wasn't sure how to address the build failure reported with the previous
commit _(sorry, I didn't grab the error msg prior to pushing the latest
commit)_. A new build is in progress now. If it fails, I may need some pointers
on how to resolve.
Thanks in advance
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] aldettinger commented on issue #1978: NATS integration test failure - Unable to connect to NATS servers
aldettinger commented on issue #1978: URL: https://github.com/apache/camel-quarkus/issues/1978#issuecomment-726176234 Ok, I'm gonna push a fix that is working locally. I propose to wait a bit before removing the ultra verbose output, so that we can be sure that the fix is working meanwhile. 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 camel-master updated: nats: Raised the TLS handshake timeout to fix builds when O/S is under pressure #1978
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-master by this push:
new 015b22f nats: Raised the TLS handshake timeout to fix builds when O/S
is under pressure #1978
015b22f is described below
commit 015b22f81b4c21e2b7d34977d4a3f6b8240938fb
Author: aldettinger
AuthorDate: Thu Nov 12 16:03:39 2020 +0100
nats: Raised the TLS handshake timeout to fix builds when O/S is under
pressure #1978
---
.../component/nats/it/NatsTestResource.java| 7 +++--
.../nats/src/test/resources/conf/tls.conf | 32 ++
pom.xml| 1 +
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git
a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
index ea1fe34..829bd01 100644
---
a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
+++
b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
@@ -38,7 +38,7 @@ public class NatsTestResource implements
ContainerResourceLifecycleManager {
private static final Logger LOG =
LoggerFactory.getLogger(NatsTestResource.class);
private static final String BASIC_AUTH_USERNAME = "admin";
private static final String BASIC_AUTH_PASSWORD = "password";
-private static final String NATS_IMAGE = "nats:2.1.4";
+private static final String NATS_IMAGE = "nats:2.1.9";
private static final int NATS_SERVER_PORT = 4222;
private static final String TOKEN_AUTH_TOKEN = "!admin23456";
@@ -71,7 +71,10 @@ public class NatsTestResource implements
ContainerResourceLifecycleManager {
// Start the container needed for the TLS authentication test
tlsAuthContainer = new
GenericContainer(NATS_IMAGE).withExposedPorts(NATS_SERVER_PORT)
.withClasspathResourceMapping("certs", "/certs",
BindMode.READ_ONLY)
-.withCommand("--tls",
+.withClasspathResourceMapping("conf", "/conf",
BindMode.READ_ONLY)
+.withCommand(
+"--config", "/conf/tls.conf",
+"--tls",
"--tlscert=/certs/server.pem",
"--tlskey=/certs/key.pem",
"--tlsverify",
diff --git a/integration-tests/nats/src/test/resources/conf/tls.conf
b/integration-tests/nats/src/test/resources/conf/tls.conf
new file mode 100644
index 000..3e0914b
--- /dev/null
+++ b/integration-tests/nats/src/test/resources/conf/tls.conf
@@ -0,0 +1,32 @@
+# Client port of 4222 on all interfaces
+port: 4222
+
+# HTTP monitoring port
+monitor_port: 8222
+
+tls {
+ # TLS handshake timeout in fractional seconds. Default set to 0.5 seconds.
+ # This value has been raised up to 1.5s in order to avoid TLS handshake
error on build servers
+ timeout: 1.5
+}
+
+# This is for clustering multiple servers together.
+cluster {
+
+ # Route connections to be received on any interface on port 6222
+ port: 6222
+
+ # Routes are protected, so need to use them with --routes flag
+ # e.g. --routes=nats-route://ruser:T0pS3cr3t@otherdockerhost:6222
+ authorization {
+user: ruser
+password: T0pS3cr3t
+timeout: 6
+ }
+
+ # Routes are actively solicited and connected to from this server.
+ # This Docker image has none by default, but you can pass a
+ # flag to the gnatsd docker image to create one to an existing server.
+ routes = []
+
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 07b8a3c..3092ce9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -417,6 +417,7 @@
**/*.avsc
**/*.bin
**/*.cnf
+**/*.conf
**/*.csv
**/*.ftl
**/*.graphql
[camel-karaf] branch master updated: CAMEL-15836: Automatic autowire by type - Specify which options support this. CAMEL-15846: camel-core - Remove basicPropertyBinding
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new c2da678 CAMEL-15836: Automatic autowire by type - Specify which
options support this. CAMEL-15846: camel-core - Remove basicPropertyBinding
c2da678 is described below
commit c2da678573e0f69ddeee30ed87776961e554a243
Author: Claus Ibsen
AuthorDate: Thu Nov 12 17:25:53 2020 +0100
CAMEL-15836: Automatic autowire by type - Specify which options support
this. CAMEL-15846: camel-core - Remove basicPropertyBinding
---
.../camel/blueprint/CamelContextFactoryBean.java | 11 +++
.../eventadmin/EventAdminComponentConfigurer.java | 12 +--
.../eventadmin/EventAdminEndpointConfigurer.java | 6 --
.../eventadmin/EventAdminEndpointUriFactory.java | 3 +--
.../camel/component/eventadmin/eventadmin.json | 23 +++---
.../paxlogging/PaxLoggingComponentConfigurer.java | 12 +--
.../paxlogging/PaxLoggingEndpointConfigurer.java | 6 --
.../paxlogging/PaxLoggingEndpointUriFactory.java | 3 +--
.../camel/component/paxlogging/paxlogging.json | 17
9 files changed, 44 insertions(+), 49 deletions(-)
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index 91e3266..b63dcaa 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -135,6 +135,8 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
-case "basicpropertybinding":
-case "basicPropertyBinding": return boolean.class;
+case "autowiredenabled":
+case "autowiredEnabled": return boolean.class;
case "bridgeerrorhandler":
case "bridgeErrorHandler": return boolean.class;
case "bundlecontext":
@@ -52,8 +52,8 @@ public class EventAdminComponentConfigurer extends
PropertyConfigurerSupport imp
public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
EventAdminComponent target = (EventAdminComponent) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
-case "basicpropertybinding":
-case "basicPropertyBinding": return target.isBasicPropertyBinding();
+case "autowiredenabled":
+case "autowiredEnabled": return target.isAutowiredEnabled();
case "bridgeerrorhandler":
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
case "bundlecontext":
diff --git
a/components/camel-eventadmin/src/generated/java/org/apache/camel/component/eventadmin/EventAdminEndpointConfigurer.java
b/components/camel-eventadmin/src/generated/java/org/apache/camel/component/eventadmin/EventAdminEndpointConfigurer.java
index 6a31f13..78a529f 100644
---
a/components/camel-eventadmin/src/generated/java/org/apache/camel/component/eventadmin/EventAdminEndpointConfigurer.java
+++
b/components/camel-eventadmin/src/generated/java/org/apache/camel/component/eventadmin/EventAdminEndpointConfigurer.java
@@ -21,8 +21,6 @@ public class EventAdminEndpointConfigurer extends
PropertyConfigurerSupport impl
public boolean configure(CamelContext camelContext, Object obj, String
name, Object value, boolean ignoreCase) {
EventAdminEndpoint target = (EventAdminEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
-case "basicpropertybinding":
-case "basicPropertyBinding":
target.setBasicPropertyBinding(property(camelContext, boolean.class, value));
return true;
case "bridgeerrorhandler":
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
case "exceptionhandler":
@@ -40,8 +38,6 @@ public class EventAdminEndpointConfigurer extends
PropertyConfigurerSupport impl
@Override
public Class getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
-case "basicpropertybinding":
-case "basicPropertyBinding": return boolean.class;
case "bridgeerrorhandler":
case "bridgeErrorHandler": return boolean.class;
case "exceptionhandler":
@@ -60,8 +56,6 @@ public class EventAdminEndpointConfigurer extends
PropertyConfigurerSupport impl
public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
EventAdminEndpoint target = (EventAdminEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
-
[camel-karaf] branch master updated: CAMEL-15836: Automatic autowire by type - Specify which options support this. CAMEL-15846: camel-core - Remove basicPropertyBinding
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new c2da678 CAMEL-15836: Automatic autowire by type - Specify which
options support this. CAMEL-15846: camel-core - Remove basicPropertyBinding
c2da678 is described below
commit c2da678573e0f69ddeee30ed87776961e554a243
Author: Claus Ibsen
AuthorDate: Thu Nov 12 17:25:53 2020 +0100
CAMEL-15836: Automatic autowire by type - Specify which options support
this. CAMEL-15846: camel-core - Remove basicPropertyBinding
---
.../camel/blueprint/CamelContextFactoryBean.java | 11 +++
.../eventadmin/EventAdminComponentConfigurer.java | 12 +--
.../eventadmin/EventAdminEndpointConfigurer.java | 6 --
.../eventadmin/EventAdminEndpointUriFactory.java | 3 +--
.../camel/component/eventadmin/eventadmin.json | 23 +++---
.../paxlogging/PaxLoggingComponentConfigurer.java | 12 +--
.../paxlogging/PaxLoggingEndpointConfigurer.java | 6 --
.../paxlogging/PaxLoggingEndpointUriFactory.java | 3 +--
.../camel/component/paxlogging/paxlogging.json | 17
9 files changed, 44 insertions(+), 49 deletions(-)
diff --git
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
index 91e3266..b63dcaa 100644
---
a/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
+++
b/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/CamelContextFactoryBean.java
@@ -135,6 +135,8 @@ public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
-case "basicpropertybinding":
-case "basicPropertyBinding": return boolean.class;
+case "autowiredenabled":
+case "autowiredEnabled": return boolean.class;
case "bridgeerrorhandler":
case "bridgeErrorHandler": return boolean.class;
case "bundlecontext":
@@ -52,8 +52,8 @@ public class EventAdminComponentConfigurer extends
PropertyConfigurerSupport imp
public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
EventAdminComponent target = (EventAdminComponent) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
-case "basicpropertybinding":
-case "basicPropertyBinding": return target.isBasicPropertyBinding();
+case "autowiredenabled":
+case "autowiredEnabled": return target.isAutowiredEnabled();
case "bridgeerrorhandler":
case "bridgeErrorHandler": return target.isBridgeErrorHandler();
case "bundlecontext":
diff --git
a/components/camel-eventadmin/src/generated/java/org/apache/camel/component/eventadmin/EventAdminEndpointConfigurer.java
b/components/camel-eventadmin/src/generated/java/org/apache/camel/component/eventadmin/EventAdminEndpointConfigurer.java
index 6a31f13..78a529f 100644
---
a/components/camel-eventadmin/src/generated/java/org/apache/camel/component/eventadmin/EventAdminEndpointConfigurer.java
+++
b/components/camel-eventadmin/src/generated/java/org/apache/camel/component/eventadmin/EventAdminEndpointConfigurer.java
@@ -21,8 +21,6 @@ public class EventAdminEndpointConfigurer extends
PropertyConfigurerSupport impl
public boolean configure(CamelContext camelContext, Object obj, String
name, Object value, boolean ignoreCase) {
EventAdminEndpoint target = (EventAdminEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
-case "basicpropertybinding":
-case "basicPropertyBinding":
target.setBasicPropertyBinding(property(camelContext, boolean.class, value));
return true;
case "bridgeerrorhandler":
case "bridgeErrorHandler":
target.setBridgeErrorHandler(property(camelContext, boolean.class, value));
return true;
case "exceptionhandler":
@@ -40,8 +38,6 @@ public class EventAdminEndpointConfigurer extends
PropertyConfigurerSupport impl
@Override
public Class getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
-case "basicpropertybinding":
-case "basicPropertyBinding": return boolean.class;
case "bridgeerrorhandler":
case "bridgeErrorHandler": return boolean.class;
case "exceptionhandler":
@@ -60,8 +56,6 @@ public class EventAdminEndpointConfigurer extends
PropertyConfigurerSupport impl
public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
EventAdminEndpoint target = (EventAdminEndpoint) obj;
switch (ignoreCase ? name.toLowerCase() : name) {
-
[camel] branch master updated: CAMEL-15836: Automatic autowire by type - Specify which options support this. CAMEL-15846: camel-core - Remove basicPropertyBinding
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 97fa81a CAMEL-15836: Automatic autowire by type - Specify which options support this. CAMEL-15846: camel-core - Remove basicPropertyBinding 97fa81a is described below commit 97fa81a881b2f260f13a21250a29a648d9dd84ec Author: Claus Ibsen AuthorDate: Thu Nov 12 17:36:20 2020 +0100 CAMEL-15836: Automatic autowire by type - Specify which options support this. CAMEL-15846: camel-core - Remove basicPropertyBinding --- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc | 4 1 file changed, 4 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc index e419a26..415c35c 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_7.adoc @@ -88,6 +88,10 @@ of using methods on `org.apache.camel.builder.AdviceWith`. Support for using multiple languages in the toD EIP has been removed as it was a rare feature in use, and is causing some problems for maintenance. toD uses simple language by default, but an alternative language can still be specified. +=== Components + +The option `basicPropertyBinding` that was deprecated has been removed. + === camel-couchbase The original URI path has been changed, now the bucket part is simply a required option and it's not part of the URI anymore.
[GitHub] [camel-quarkus] ppalaga opened a new issue #2007: Figure out how we could leverage Quarkus Developer Console
ppalaga opened a new issue #2007: URL: https://github.com/apache/camel-quarkus/issues/2007 https://groups.google.com/g/quarkus-dev/c/CvEr-gkwvxI/m/tBiYH6cTCgAJ 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-runtime] lburgazzoli opened a new pull request #552: Cleanup extensions
lburgazzoli opened a new pull request #552: URL: https://github.com/apache/camel-k-runtime/pull/552 **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
[camel-spring-boot] branch master updated (c7bb08d -> 880cadb)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from c7bb08d Camel-Infinispan: Re-enable the integration test new a613081 CAMEL-15836: Automatic autowire by type - Specify which options support this. CAMEL-15846: camel-core - Remove basicPropertyBinding new 880cadb Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../springboot/catalog/components/activemq.json| 393 ++--- .../springboot/catalog/components/ahc-ws.json | 61 ++-- .../springboot/catalog/components/ahc-wss.json | 61 ++-- .../camel/springboot/catalog/components/ahc.json | 49 ++- .../camel/springboot/catalog/components/amqp.json | 387 ++-- .../camel/springboot/catalog/components/apns.json | 55 ++- .../springboot/catalog/components/arangodb.json| 49 ++- .../camel/springboot/catalog/components/as2.json | 79 ++--- .../springboot/catalog/components/asterisk.json| 27 +- .../springboot/catalog/components/atlasmap.json| 25 +- .../camel/springboot/catalog/components/atmos.json | 45 ++- .../catalog/components/atmosphere-websocket.json | 79 ++--- .../camel/springboot/catalog/components/atom.json | 63 ++-- .../springboot/catalog/components/atomix-map.json | 77 ++-- .../catalog/components/atomix-messaging.json | 81 +++-- .../catalog/components/atomix-multimap.json| 69 ++-- .../catalog/components/atomix-queue.json | 69 ++-- .../springboot/catalog/components/atomix-set.json | 73 ++-- .../catalog/components/atomix-value.json | 73 ++-- .../camel/springboot/catalog/components/avro.json | 51 ++- .../springboot/catalog/components/aws-cw.json | 61 ++-- .../springboot/catalog/components/aws-ddb.json | 69 ++-- .../catalog/components/aws-ddbstream.json | 93 +++-- .../springboot/catalog/components/aws-ec2.json | 49 ++- .../springboot/catalog/components/aws-ecs.json | 49 ++- .../springboot/catalog/components/aws-eks.json | 49 ++- .../springboot/catalog/components/aws-iam.json | 49 ++- .../catalog/components/aws-kinesis-firehose.json | 45 ++- .../springboot/catalog/components/aws-kinesis.json | 105 +++--- .../springboot/catalog/components/aws-kms.json | 49 ++- .../springboot/catalog/components/aws-lambda.json | 49 ++- .../springboot/catalog/components/aws-mq.json | 49 ++- .../springboot/catalog/components/aws-msk.json | 49 ++- .../springboot/catalog/components/aws-s3.json | 197 +-- .../springboot/catalog/components/aws-sdb.json | 31 +- .../springboot/catalog/components/aws-ses.json | 61 ++-- .../springboot/catalog/components/aws-sns.json | 83 +++-- .../springboot/catalog/components/aws-sqs.json | 197 +-- .../springboot/catalog/components/aws-swf.json | 125 --- .../catalog/components/aws-translate.json | 61 ++-- .../springboot/catalog/components/aws2-athena.json | 121 --- .../springboot/catalog/components/aws2-cw.json | 65 ++-- .../springboot/catalog/components/aws2-ddb.json| 73 ++-- .../catalog/components/aws2-ddbstream.json | 97 +++-- .../springboot/catalog/components/aws2-ec2.json| 57 ++- .../springboot/catalog/components/aws2-ecs.json| 57 ++- .../springboot/catalog/components/aws2-eks.json| 57 ++- .../catalog/components/aws2-eventbridge.json | 61 ++-- .../springboot/catalog/components/aws2-iam.json| 57 ++- .../catalog/components/aws2-kinesis-firehose.json | 57 ++- .../catalog/components/aws2-kinesis.json | 113 +++--- .../springboot/catalog/components/aws2-kms.json| 57 ++- .../springboot/catalog/components/aws2-lambda.json | 57 ++- .../springboot/catalog/components/aws2-mq.json | 57 ++- .../springboot/catalog/components/aws2-msk.json| 57 ++- .../springboot/catalog/components/aws2-s3.json | 209 ++- .../springboot/catalog/components/aws2-ses.json| 65 ++-- .../springboot/catalog/components/aws2-sns.json| 87 +++-- .../springboot/catalog/components/aws2-sqs.json| 205 ++- .../springboot/catalog/components/aws2-sts.json| 57 ++- .../catalog/components/aws2-translate.json | 69 ++-- .../springboot/catalog/components/azure-blob.json | 93 +++-- .../catalog/components/azure-eventhubs.json| 91 +++-- .../springboot/catalog/components/azure-queue.json | 57 ++- .../catalog/components/azure-storage-blob.json | 121 --- .../catalog/components/azure-storage-queue.json| 71 ++-- .../catalog/components/bean-validator.json | 37 +- .../camel/springboot/catalog/components/bean.
[camel-spring-boot] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 880cadbfe907f1b5f80f08d8d78e61c8e8857578
Author: Claus Ibsen
AuthorDate: Thu Nov 12 18:20:32 2020 +0100
Regen
---
.../org/apache/camel/springboot/catalog/components/github.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/github.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/github.json
index ffdebc8..e44cd97 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/github.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/github.json
@@ -27,7 +27,7 @@
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
},
"properties": {
-"type": { "kind": "path", "displayName": "Type", "group": "common",
"label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.github.GitHubType", "enum": [ "CLOSEPULLREQUEST",
"PULLREQUESTCOMMENT", "COMMIT", "PULLREQUEST", "TAG", "PULLREQUESTSTATE",
"PULLREQUESTFILES", "GETCOMMITFILE", "CREATEISSUE" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"What git operation to execute" },
+"type": { "kind": "path", "displayName": "Type", "group": "common",
"label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.github.GitHubType", "enum": [ "CLOSEPULLREQUEST",
"PULLREQUESTCOMMENT", "COMMIT", "PULLREQUEST", "TAG", "PULLREQUESTSTATE",
"PULLREQUESTFILES", "GETCOMMITFILE", "CREATEISSUE", "EVENT" ], "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "What git operation to execute" },
"branchName": { "kind": "path", "displayName": "Branch Name", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Name of branch" },
"oauthToken": { "kind": "parameter", "displayName": "Oauth Token",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "GitHub OAuth token, required unless username &
password are provided" },
"password": { "kind": "parameter", "displayName": "Password", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "GitHub password, required unless oauthToken is provided" },
@@ -36,6 +36,7 @@
"username": { "kind": "parameter", "displayName": "Username", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "GitHub username, required unless oauthToken is provided" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a m [...]
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send
Empty Message When Idle", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
the polling consumer did not poll any files, you can enable this option to send
an empty message (no body) instead." },
+"eventFetchStrategy": { "kind": "parameter", "displayName": "Event Fetch
Strategy", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.github.event.GitHubEventFetchStrategy",
"deprecated": false, "autowired": false, "secret": false, "descriptio
[camel] branch master updated: Fixed CS
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new ce2d6a3 Fixed CS
ce2d6a3 is described below
commit ce2d6a33aafebe94d0ad01f6dfd7a9dd80c2302b
Author: Claus Ibsen
AuthorDate: Thu Nov 12 18:22:13 2020 +0100
Fixed CS
---
.../java/org/apache/camel/component/sjms/support/JmsTestSupport.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
index cd2568d..b97df84 100644
---
a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
+++
b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/support/JmsTestSupport.java
@@ -59,12 +59,12 @@ public class JmsTestSupport extends CamelTestSupport {
protected String brokerUri;
protected boolean externalAmq;
protected Properties properties;
+protected ActiveMQConnectionFactory connectionFactory;
private BrokerService broker;
private Connection connection;
private Session session;
private DestinationCreationStrategy destinationCreationStrategy = new
DefaultDestinationCreationStrategy();
-protected ActiveMQConnectionFactory connectionFactory;
/**
* Set up the Broker
[camel-kafka-connector-examples] branch google-sheets-with-split created (now a56adc9)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch google-sheets-with-split in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git. at a56adc9 Added Google Sheets Streams Source Example with split This branch includes the following new commits: new a56adc9 Added Google Sheets Streams Source Example with split 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-kafka-connector-examples] 01/01: Added Google Sheets Streams Source Example with split
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch google-sheets-with-split in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector-examples.git commit a56adc93e59a1ea12c3f01e5a1c7b54a3f33 Author: Andrea Cosentino AuthorDate: Thu Nov 12 18:36:05 2020 +0100 Added Google Sheets Streams Source Example with split --- .../README.adoc| 114 + ...melGoogleSheetsStreamSourceConnector.properties | 35 +++ 2 files changed, 149 insertions(+) diff --git a/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc b/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc new file mode 100644 index 000..cbcfa16 --- /dev/null +++ b/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc @@ -0,0 +1,114 @@ += Camel-Kafka-connector Sheets Stream Source with Split Example + +This is an example for Camel-Kafka-connector Sheets Stream Source with Split Example + +== Standalone + +=== What is needed + +- A google account +- A google application authorized to deal with Sheets API + +=== Setting up Google Application + +The step-by-step guide is a bit long, so follow it with attention: + +1. Create a project +2. Note down clientSecret and clientId +2. Create an OAuth consent screen +3. Create OAuth Client credentials (OAuth for WebApp) +4. Add https://developers.google.com/oauthplayground to Authorized redirect URIs +5. Setup https://developers.google.com/oauthplayground using credentials from above +6. Authorize APIs for Sheets API v4 scope https://www.googleapis.com/auth/spreadsheets +7. Exchange authorization code for tokens +8. Note down Access token & Refresh token +9. Create a google sheets document and add two column in A1 and B1, named username and city +10. In A2 and B2, add "John" and "New York" +11. In A3 and B3, add "Andrea" and "Roma" +12. In A4 and B4, add "Andrea" and "Milan" +13. In A5 and B5, add "Jack" and "London" +14. Note down the sheets document Id + +=== Running Kafka + +[source] + +$KAFKA_HOME/bin/zookeeper-server-start.sh $KAFKA_HOME/config/zookeeper.properties +$KAFKA_HOME/bin/kafka-server-start.sh $KAFKA_HOME/config/server.properties +$KAFKA_HOME/bin/kafka-topics.sh --create --bootstrap-server localhost:9092 --replication-factor 1 --partitions 1 --topic mytopic + + +=== Download the connector package + +Download the connector package zip and extract the content to a directory. In this example we'll use `/home/oscerd/connectors/` + +[source] + +> cd /home/oscerd/connectors/ +> wget https://repo1.maven.org/maven2/org/apache/camel/kafkaconnector/camel-google-sheets-stream-kafka-connector/0.6.0/camel-google-sheets-stream-kafka-connector-0.6.0-package.zip +> unzip camel-google-sheets-stream-kafka-connector-0.6.0-package.zip + + +=== Configuring Kafka Connect + +You'll need to set up the `plugin.path` property in your kafka + +Open the `$KAFKA_HOME/config/connect-standalone.properties` and set the `plugin.path` property to your choosen location: + +[source] + +... +plugin.path=/home/oscerd/connectors +... + + +=== Setup the connectors + +Open the Git configuration file at `$EXAMPLES/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties` + +[source] + +name=CamelGoogle-sheets-streamSourceConnector +connector.class=org.apache.camel.kafkaconnector.googlesheetsstream.CamelGooglesheetsstreamSourceConnector +tasks.max=1 +key.converter=org.apache.kafka.connect.storage.StringConverter +value.converter=org.apache.kafka.connect.storage.StringConverter + +topics=mytopic + +camel.source.path.apiName=data +camel.source.endpoint.clientId= +camel.source.endpoint.spreadsheetId= +camel.source.endpoint.accessToken= +camel.source.endpoint.refreshToken= +camel.source.endpoint.clientSecret= +camel.source.endpoint.applicationName=ckc +camel.source.endpoint.delay=6 +camel.component.google-sheets-stream.range=A1:B5 +camel.source.endpoint.splitResults=true + + +=== Running the example + +Run the kafka connect with the Google Sheets Stream Source connector: + +[source] + +$KAFKA_HOME/bin/connect-standalone.sh $KAFKA_HOME/config/connect-standalone.properties $EXAMPLES/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties + + +On a different terminal run the kafkacat consumer + +[source] + +> ./kafkacat -b localhost:9092 -t db903 -f 'Headers: %h: Message value: %s\n' +% Auto-selecting Consumer mode (use -P or -C to override) +% Reached end of topic db903 [0] at offset 0 +Headers: CamelHeader.CamelGoogleSheetsMajorDimension=ROWS,CamelHeader.CamelGoogleSheetsRange=Foglio1!A1:B5,CamelHeader.CamelGoogleSheetsRangeIndex=1,CamelHeader.CamelGoogleSheetsSpreadsheetId=1rkX3YNc0IEbIouNsQEzOVu0s5QmeyOlyiqjwQFK_hmI,CamelHeader.CamelGoogleSheetsValueIndex=1,CamelProperty.CamelBatchSize=5,Camel
[GitHub] [camel-kafka-connector-examples] oscerd merged pull request #193: Added Google Sheets Streams Source Example with split
oscerd merged pull request #193: URL: https://github.com/apache/camel-kafka-connector-examples/pull/193 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-examples] oscerd opened a new pull request #193: Added Google Sheets Streams Source Example with split
oscerd opened a new pull request #193: URL: https://github.com/apache/camel-kafka-connector-examples/pull/193 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-examples] branch master updated: Added Google Sheets Streams Source Example with split
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-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new 5aeee71 Added Google Sheets Streams Source Example with split 5aeee71 is described below commit 5aeee7115cd820ef69b253f271b99f91a8b30af3 Author: Andrea Cosentino AuthorDate: Thu Nov 12 18:36:05 2020 +0100 Added Google Sheets Streams Source Example with split --- .../README.adoc| 114 + ...melGoogleSheetsStreamSourceConnector.properties | 35 +++ 2 files changed, 149 insertions(+) diff --git a/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc b/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc new file mode 100644 index 000..cbcfa16 --- /dev/null +++ b/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc @@ -0,0 +1,114 @@ += Camel-Kafka-connector Sheets Stream Source with Split Example + +This is an example for Camel-Kafka-connector Sheets Stream Source with Split Example + +== Standalone + +=== What is needed + +- A google account +- A google application authorized to deal with Sheets API + +=== Setting up Google Application + +The step-by-step guide is a bit long, so follow it with attention: + +1. Create a project +2. Note down clientSecret and clientId +2. Create an OAuth consent screen +3. Create OAuth Client credentials (OAuth for WebApp) +4. Add https://developers.google.com/oauthplayground to Authorized redirect URIs +5. Setup https://developers.google.com/oauthplayground using credentials from above +6. Authorize APIs for Sheets API v4 scope https://www.googleapis.com/auth/spreadsheets +7. Exchange authorization code for tokens +8. Note down Access token & Refresh token +9. Create a google sheets document and add two column in A1 and B1, named username and city +10. In A2 and B2, add "John" and "New York" +11. In A3 and B3, add "Andrea" and "Roma" +12. In A4 and B4, add "Andrea" and "Milan" +13. In A5 and B5, add "Jack" and "London" +14. Note down the sheets document Id + +=== Running Kafka + +[source] + +$KAFKA_HOME/bin/zookeeper-server-start.sh $KAFKA_HOME/config/zookeeper.properties +$KAFKA_HOME/bin/kafka-server-start.sh $KAFKA_HOME/config/server.properties +$KAFKA_HOME/bin/kafka-topics.sh --create --bootstrap-server localhost:9092 --replication-factor 1 --partitions 1 --topic mytopic + + +=== Download the connector package + +Download the connector package zip and extract the content to a directory. In this example we'll use `/home/oscerd/connectors/` + +[source] + +> cd /home/oscerd/connectors/ +> wget https://repo1.maven.org/maven2/org/apache/camel/kafkaconnector/camel-google-sheets-stream-kafka-connector/0.6.0/camel-google-sheets-stream-kafka-connector-0.6.0-package.zip +> unzip camel-google-sheets-stream-kafka-connector-0.6.0-package.zip + + +=== Configuring Kafka Connect + +You'll need to set up the `plugin.path` property in your kafka + +Open the `$KAFKA_HOME/config/connect-standalone.properties` and set the `plugin.path` property to your choosen location: + +[source] + +... +plugin.path=/home/oscerd/connectors +... + + +=== Setup the connectors + +Open the Git configuration file at `$EXAMPLES/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties` + +[source] + +name=CamelGoogle-sheets-streamSourceConnector +connector.class=org.apache.camel.kafkaconnector.googlesheetsstream.CamelGooglesheetsstreamSourceConnector +tasks.max=1 +key.converter=org.apache.kafka.connect.storage.StringConverter +value.converter=org.apache.kafka.connect.storage.StringConverter + +topics=mytopic + +camel.source.path.apiName=data +camel.source.endpoint.clientId= +camel.source.endpoint.spreadsheetId= +camel.source.endpoint.accessToken= +camel.source.endpoint.refreshToken= +camel.source.endpoint.clientSecret= +camel.source.endpoint.applicationName=ckc +camel.source.endpoint.delay=6 +camel.component.google-sheets-stream.range=A1:B5 +camel.source.endpoint.splitResults=true + + +=== Running the example + +Run the kafka connect with the Google Sheets Stream Source connector: + +[source] + +$KAFKA_HOME/bin/connect-standalone.sh $KAFKA_HOME/config/connect-standalone.properties $EXAMPLES/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties + + +On a different terminal run the kafkacat consumer + +[source] + +> ./kafkacat -b localhost:9092 -t db903 -f 'Headers: %h: Message value: %s\n' +% Auto-selecting Consumer mode (use -P or -C to override) +% Reached end of topic db903 [0] at offset 0 +Headers: CamelHeader.CamelGoogleSheetsMajorDimension=ROWS,CamelHeader.CamelGoogleSheetsRange=Foglio1!A1:B5,CamelHeader.CamelGoogleSheetsRangeIndex=1,CamelHeader.C
[camel-kafka-connector-examples] branch master updated: Cleanup
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-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new 008685d Cleanup 008685d is described below commit 008685d1a73cddf4dd4028b5b3f28fd0f65b99f6 Author: Andrea Cosentino AuthorDate: Thu Nov 12 18:42:21 2020 +0100 Cleanup --- .../CamelGoogleSheetsStreamSourceConnector.properties | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties b/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties index 6c6b4a5..32bb83d 100644 --- a/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties +++ b/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties @@ -17,17 +17,18 @@ name=CamelGoogle-sheets-streamSourceConnector connector.class=org.apache.camel.kafkaconnector.googlesheetsstream.CamelGooglesheetsstreamSourceConnector +tasks.max=1 key.converter=org.apache.kafka.connect.storage.StringConverter value.converter=org.apache.kafka.connect.storage.StringConverter topics=mytopic camel.source.path.apiName=data -camel.source.endpoint.clientId=513252201330-ddsi05kcp44b1fgt2tdffleurpkrb2jt.apps.googleusercontent.com -camel.source.endpoint.accessToken=ya29.A0AfH6SMCA3VfeHn-zMabAvPQmKvakDf8Gw3O8MOXP7WYfo7Ki8nWg3-AJHJA1tA6_ww6eeoBTwjf8wuumNEm0WEfshsmgLudkkegdgYF99ME2H5toVUl-XnqivY6iHaafCACc54v9vha9vQdu_BtU9GXo9miyGkTjp2mCilKA98E -camel.source.endpoint.refreshToken=1//04q_xA-KU1yrSCgYIARAAGAQSNwF-L9Ir27zVsuKZ5GEhXDD3YEFXT80Vnd6z8X3NDQckQX8yUb2ujHcCIkmQh3_hKjISix4k1Po -camel.source.endpoint.clientSecret=8_R8cCH0tGlDlv39gcASagSp -camel.source.endpoint.spreadsheetId=1rkX3YNc0IEbIouNsQEzOVu0s5QmeyOlyiqjwQFK_hmI -camel.source.endpoint.applicationName=ckc127 +camel.source.endpoint.clientId= +camel.source.endpoint.spreadsheetId= +camel.source.endpoint.accessToken= +camel.source.endpoint.refreshToken= +camel.source.endpoint.clientSecret= +camel.source.endpoint.applicationName=ckc camel.source.endpoint.delay=6 camel.component.google-sheets-stream.range=A1:B2
[camel-quarkus] branch quarkus-master updated: nats: Raised the TLS handshake timeout to fix builds when O/S is under pressure #1978
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch quarkus-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/quarkus-master by this push:
new cf066bf nats: Raised the TLS handshake timeout to fix builds when O/S
is under pressure #1978
cf066bf is described below
commit cf066bf449a1858d5c523ca99c36b333b6ee5035
Author: aldettinger
AuthorDate: Thu Nov 12 16:03:39 2020 +0100
nats: Raised the TLS handshake timeout to fix builds when O/S is under
pressure #1978
---
.../component/nats/it/NatsTestResource.java| 7 +++--
.../nats/src/test/resources/conf/tls.conf | 32 ++
pom.xml| 1 +
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git
a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
index ea1fe34..829bd01 100644
---
a/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
+++
b/integration-tests/nats/src/test/java/org/apache/camel/quarkus/component/nats/it/NatsTestResource.java
@@ -38,7 +38,7 @@ public class NatsTestResource implements
ContainerResourceLifecycleManager {
private static final Logger LOG =
LoggerFactory.getLogger(NatsTestResource.class);
private static final String BASIC_AUTH_USERNAME = "admin";
private static final String BASIC_AUTH_PASSWORD = "password";
-private static final String NATS_IMAGE = "nats:2.1.4";
+private static final String NATS_IMAGE = "nats:2.1.9";
private static final int NATS_SERVER_PORT = 4222;
private static final String TOKEN_AUTH_TOKEN = "!admin23456";
@@ -71,7 +71,10 @@ public class NatsTestResource implements
ContainerResourceLifecycleManager {
// Start the container needed for the TLS authentication test
tlsAuthContainer = new
GenericContainer(NATS_IMAGE).withExposedPorts(NATS_SERVER_PORT)
.withClasspathResourceMapping("certs", "/certs",
BindMode.READ_ONLY)
-.withCommand("--tls",
+.withClasspathResourceMapping("conf", "/conf",
BindMode.READ_ONLY)
+.withCommand(
+"--config", "/conf/tls.conf",
+"--tls",
"--tlscert=/certs/server.pem",
"--tlskey=/certs/key.pem",
"--tlsverify",
diff --git a/integration-tests/nats/src/test/resources/conf/tls.conf
b/integration-tests/nats/src/test/resources/conf/tls.conf
new file mode 100644
index 000..3e0914b
--- /dev/null
+++ b/integration-tests/nats/src/test/resources/conf/tls.conf
@@ -0,0 +1,32 @@
+# Client port of 4222 on all interfaces
+port: 4222
+
+# HTTP monitoring port
+monitor_port: 8222
+
+tls {
+ # TLS handshake timeout in fractional seconds. Default set to 0.5 seconds.
+ # This value has been raised up to 1.5s in order to avoid TLS handshake
error on build servers
+ timeout: 1.5
+}
+
+# This is for clustering multiple servers together.
+cluster {
+
+ # Route connections to be received on any interface on port 6222
+ port: 6222
+
+ # Routes are protected, so need to use them with --routes flag
+ # e.g. --routes=nats-route://ruser:T0pS3cr3t@otherdockerhost:6222
+ authorization {
+user: ruser
+password: T0pS3cr3t
+timeout: 6
+ }
+
+ # Routes are actively solicited and connected to from this server.
+ # This Docker image has none by default, but you can pass a
+ # flag to the gnatsd docker image to create one to an existing server.
+ routes = []
+
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8837eb1..8961dcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -416,6 +416,7 @@
**/*.avsc
**/*.bin
**/*.cnf
+**/*.conf
**/*.csv
**/*.ftl
**/*.graphql
[camel] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7217f90 Polished
7217f90 is described below
commit 7217f904f2878455b24faa39c48a62999428c952
Author: Claus Ibsen
AuthorDate: Thu Nov 12 18:44:56 2020 +0100
Polished
---
.../main/java/org/apache/camel/component/direct/DirectComponent.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectComponent.java
b/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectComponent.java
index a083596..403e3f6 100644
---
a/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectComponent.java
+++
b/components/camel-direct/src/main/java/org/apache/camel/component/direct/DirectComponent.java
@@ -62,7 +62,7 @@ public class DirectComponent extends DefaultComponent {
protected void doShutdown() throws Exception {
ServiceHelper.stopAndShutdownService(consumers);
consumers.clear();
-super.doStop();
+super.doShutdown();
}
public boolean isBlock() {
[GitHub] [camel-kafka-connector-examples] oscerd opened a new pull request #194: Google Sheets Stream Source with split example: Fixed path
oscerd opened a new pull request #194: URL: https://github.com/apache/camel-kafka-connector-examples/pull/194 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-examples] branch oscerd-patch-1 created (now 07f2995)
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-kafka-connector-examples.git. at 07f2995 Google Sheets Stream Source with split example: Fixed path No new revisions were added by this update.
[GitHub] [camel-kafka-connector-examples] oscerd merged pull request #194: Google Sheets Stream Source with split example: Fixed path
oscerd merged pull request #194: URL: https://github.com/apache/camel-kafka-connector-examples/pull/194 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-examples] branch master updated: Google Sheets Stream Source with split example: Fixed path
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-kafka-connector-examples.git The following commit(s) were added to refs/heads/master by this push: new 97b19ce Google Sheets Stream Source with split example: Fixed path 97b19ce is described below commit 97b19ce0228d4034a90733020ae280f9a1a83fbe Author: Andrea Cosentino AuthorDate: Thu Nov 12 18:53:28 2020 +0100 Google Sheets Stream Source with split example: Fixed path --- .../google-sheets-stream-with-split-source/README.adoc| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc b/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc index cbcfa16..12df6ea 100644 --- a/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc +++ b/google-sheets-stream/google-sheets-stream-with-split-source/README.adoc @@ -64,7 +64,7 @@ plugin.path=/home/oscerd/connectors === Setup the connectors -Open the Git configuration file at `$EXAMPLES/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties` +Open the Git configuration file at `$EXAMPLES/google-sheets-stream/google-sheets-stream-with-split-source/config/CamelGoogleSheetsStreamSourceConnector.properties` [source] @@ -94,7 +94,7 @@ Run the kafka connect with the Google Sheets Stream Source connector: [source] -$KAFKA_HOME/bin/connect-standalone.sh $KAFKA_HOME/config/connect-standalone.properties $EXAMPLES/google-sheets-stream/google-sheets-stream-source/config/CamelGoogleSheetsStreamSourceConnector.properties +$KAFKA_HOME/bin/connect-standalone.sh $KAFKA_HOME/config/connect-standalone.properties $EXAMPLES/google-sheets-stream/google-sheets-stream-with-split-source/config/CamelGoogleSheetsStreamSourceConnector.properties On a different terminal run the kafkacat consumer
[GitHub] [camel] davsclaus commented on pull request #4594: CAMEL-15769: disable split default delimiter
davsclaus commented on pull request #4594: URL: https://github.com/apache/camel/pull/4594#issuecomment-726239635 Ah those json files just need to be regenerated. Let me try that 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-15769: disable split default delimiter (#4594)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f6f3cc3 CAMEL-15769: disable split default delimiter (#4594)
f6f3cc3 is described below
commit f6f3cc36c0474d12aa52af1da04ba05c59cd736b
Author: Scott Carrier
AuthorDate: Thu Nov 12 12:56:49 2020 -0500
CAMEL-15769: disable split default delimiter (#4594)
* CAMEL-15769: disable split default delimiter
* format new unit test java file
* Add fluent method for delimiter with javadoc
* committing generated sources from local build
---
.../org/apache/camel/catalog/models/split.json | 31 -
.../apache/camel/catalog/schemas/camel-spring.xsd | 8 +++
.../resources/org/apache/camel/model/split.json| 31 -
.../apache/camel/model/ProcessorDefinition.java| 18 ++
.../org/apache/camel/model/SplitDefinition.java| 24 +++
.../java/org/apache/camel/processor/Splitter.java | 39 ++-
.../org/apache/camel/reifier/SplitReifier.java | 19 --
.../camel/processor/SplitWithDelimiterTest.java| 75 ++
.../java/org/apache/camel/xml/in/ModelParser.java | 1 +
9 files changed, 209 insertions(+), 37 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/split.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/split.json
index acf7a83..b2c01fa 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/split.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/split.json
@@ -11,20 +11,21 @@
"output": true
},
"properties": {
-"expression": { "kind": "expression", "displayName": "Expression",
"required": true, "type": "object", "javaType":
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant",
"exchangeProperty", "groovy", "header", "hl7terser", "joor", "jsonpath",
"language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize",
"xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired": false,
"secret": false, "description": "Expression of how to split the message [...]
-"parallelProcessing": { "kind": "attribute", "displayName": "Parallel
Processing", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If enabled then processing each splitted
messages occurs concurrently. Note the caller thread will still wait until all
messages has been fully processed, before it continues. Its only processing the
sub messages from the splitter which [...]
-"strategyRef": { "kind": "attribute", "displayName": "Strategy Ref",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Sets
a reference to the AggregationStrategy to be used to assemble the replies from
the splitted messages, into a single outgoing message from the Splitter. By
default Camel will use the original incoming message to the splitter (leave it
unchanged). You can also use a POJO a [...]
-"strategyMethodName": { "kind": "attribute", "displayName": "Strategy
Method Name", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option can be used to explicit declare the method name to
use, when using POJOs as the AggregationStrategy." },
-"strategyMethodAllowNull": { "kind": "attribute", "displayName": "Strategy
Method Allow Null", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "If this option is false then the
aggregate method is not used if there was no data to enrich. If this option is
true then null values is used as the oldExchange (when no data to enrich), when
using POJOs as the AggregationStr [...]
-"executorServiceRef": { "kind": "attribute", "displayName": "Executor
Service Ref", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Refers to a custom Thread Pool to be used for parallel
processing. Notice if you set this option, then parallel processing is
automatic implied, and you do not have to enable that option as well." },
-"streaming": { "kind": "attribute", "displayName": "Streaming",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "When in streaming mode, then the splitter splits the
original message on-demand,
[GitHub] [camel] davsclaus merged pull request #4594: CAMEL-15769: disable split default delimiter
davsclaus merged pull request #4594: URL: https://github.com/apache/camel/pull/4594 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] srcarrier commented on pull request #4594: CAMEL-15769: disable split default delimiter
srcarrier commented on pull request #4594: URL: https://github.com/apache/camel/pull/4594#issuecomment-726240649 oh, sorry Claus - I managed to generate the json files locally and committed them. Hopefully I didn't step on your toes there. 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] github-actions[bot] opened a new pull request #4599: Generated sources regen
github-actions[bot] opened a new pull request #4599: URL: https://github.com/apache/camel/pull/4599 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
