[camel-k] branch main updated: chore: Remove custom REST client
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new af02f47 chore: Remove custom REST client
af02f47 is described below
commit af02f474cc293f511fce7afd671540cb645e75a5
Author: Antonin Stefanutti
AuthorDate: Thu Dec 2 10:55:50 2021 +0100
chore: Remove custom REST client
---
pkg/builder/s2i.go | 16 +--
pkg/cmd/uninstall.go| 8 ++--
pkg/util/kubernetes/client.go | 19 --
pkg/util/kubernetes/customclient.go | 39 -
4 files changed, 16 insertions(+), 66 deletions(-)
diff --git a/pkg/builder/s2i.go b/pkg/builder/s2i.go
index 6254441..d523e84 100644
--- a/pkg/builder/s2i.go
+++ b/pkg/builder/s2i.go
@@ -31,23 +31,25 @@ import (
"strings"
"time"
- "github.com/apache/camel-k/pkg/util"
-
- "github.com/pkg/errors"
-
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+ "k8s.io/apimachinery/pkg/runtime/schema"
+ "k8s.io/apimachinery/pkg/runtime/serializer"
+
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/apiutil"
ctrlutil "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+ "github.com/pkg/errors"
+
buildv1 "github.com/openshift/api/build/v1"
imagev1 "github.com/openshift/api/image/v1"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/kubernetes"
+ "github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/log"
)
@@ -173,7 +175,9 @@ func (t *s2iTask) Do(ctx context.Context) v1.BuildStatus {
return err
}
- restClient, err := kubernetes.GetClientFor(t.c,
"build.openshift.io", "v1")
+ restClient, err := apiutil.RESTClientForGVK(
+ schema.GroupVersionKind{Group: "build.openshift.io",
Version: "v1"}, false,
+ t.c.GetConfig(),
serializer.NewCodecFactory(t.c.GetScheme()))
if err != nil {
return err
}
diff --git a/pkg/cmd/uninstall.go b/pkg/cmd/uninstall.go
index 2cc76d9..92d42a5 100644
--- a/pkg/cmd/uninstall.go
+++ b/pkg/cmd/uninstall.go
@@ -27,12 +27,14 @@ import (
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/apimachinery/pkg/runtime/schema"
+ "k8s.io/apimachinery/pkg/runtime/serializer"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
+ "sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/client"
- "github.com/apache/camel-k/pkg/util/kubernetes"
"github.com/apache/camel-k/pkg/util/olm"
)
@@ -278,7 +280,9 @@ func (o *uninstallCmdOptions)
uninstallNamespaceResources(ctx context.Context, c
}
func (o *uninstallCmdOptions) uninstallCrd(ctx context.Context, c
client.Client) error {
- restClient, err := kubernetes.GetClientFor(c, "apiextensions.k8s.io",
"v1")
+ restClient, err := apiutil.RESTClientForGVK(
+ schema.GroupVersionKind{Group: "apiextensions.k8s.io", Version:
"v1"}, false,
+ c.GetConfig(), serializer.NewCodecFactory(c.GetScheme()))
if err != nil {
return err
}
diff --git a/pkg/util/kubernetes/client.go b/pkg/util/kubernetes/client.go
index 3b361e4..a1e8fc9 100644
--- a/pkg/util/kubernetes/client.go
+++ b/pkg/util/kubernetes/client.go
@@ -21,7 +21,6 @@ import (
"context"
"fmt"
- appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -146,21 +145,3 @@ func ResolveValueSource(ctx context.Context, client
ctrl.Reader, namespace strin
return "", nil
}
-
-func GetDeployment(context context.Context, client ctrl.Reader, name string,
namespace string) (*appsv1.Deployment, error) {
- deployment := &appsv1.Deployment{
- TypeMeta: metav1.TypeMeta{
- Kind: "Deployment",
- APIVersion: appsv1.SchemeGroupVersion.String(),
- },
- ObjectMeta: metav1.ObjectMeta{
- Name: name,
- Namespace: namespace,
- },
- }
- if err := client.Get(context, ctrl.ObjectKeyFromObject(deployment),
deployment); err != nil {
- return nil, err
- }
-
- return dep
[GitHub] [camel-k] astefanutti merged pull request #2806: chore: Remove custom REST client
astefanutti merged pull request #2806: URL: https://github.com/apache/camel-k/pull/2806 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: camel-vertx-kafka - Deprecated as the vertx kafka client are in tech preview only and not active maintained. Quarkus is not using this either. The regular camel-kafka is i
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 3eb46d5 camel-vertx-kafka - Deprecated as the vertx kafka client are in tech preview only and not active maintained. Quarkus is not using this either. The regular camel-kafka is improved alot recommended to be used. 3eb46d5 is described below commit 3eb46d5146d44b7f3ec06317b87bb1402e2e6ab4 Author: Claus Ibsen AuthorDate: Fri Dec 3 09:20:41 2021 +0100 camel-vertx-kafka - Deprecated as the vertx kafka client are in tech preview only and not active maintained. Quarkus is not using this either. The regular camel-kafka is improved alot recommended to be used. --- .../resources/org/apache/camel/catalog/components/vertx-kafka.json | 2 +- .../camel-vertx-kafka/camel-vertx-kafka-component/pom.xml| 2 +- .../META-INF/services/org/apache/camel/component.properties | 2 +- .../org/apache/camel/component/vertx/kafka/vertx-kafka.json | 2 +- .../src/main/docs/vertx-kafka-component.adoc | 5 +++-- .../org/apache/camel/builder/component/ComponentsBuilderFactory.java | 1 + .../builder/component/dsl/VertxKafkaComponentBuilderFactory.java | 1 + core/camel-componentdsl/src/generated/resources/metadata.json| 2 +- .../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java| 2 ++ .../camel/builder/endpoint/dsl/VertxKafkaEndpointBuilderFactory.java | 3 +++ 10 files changed, 15 insertions(+), 7 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-kafka.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-kafka.json index 0a2cb70..c10e2c9 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-kafka.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-kafka.json @@ -4,7 +4,7 @@ "name": "vertx-kafka", "title": "Vert.x Kafka", "description": "Sent and receive messages to\/from an Apache Kafka broker using vert.x Kafka client", -"deprecated": false, +"deprecated": true, "firstVersion": "3.7.0", "label": "messaging", "javaType": "org.apache.camel.component.vertx.kafka.VertxKafkaComponent", diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml index 28a73f4..28079d5 100644 --- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml +++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/pom.xml @@ -28,7 +28,7 @@ camel-vertx-kafka jar -Camel :: Vert.x :: Kafka +Camel :: Vert.x :: Kafka (deprecated) Camel Vertx Kafka support diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties index d97defb..130f729 100644 --- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -3,5 +3,5 @@ components=vertx-kafka groupId=org.apache.camel artifactId=camel-vertx-kafka version=3.14.0-SNAPSHOT -projectName=Camel :: Vert.x :: Kafka +projectName=Camel :: Vert.x :: Kafka (deprecated) projectDescription=Camel Vertx Kafka support diff --git a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/generated/resources/org/apache/camel/component/vertx/kafka/vertx-kafka.json b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/generated/resources/org/apache/camel/component/vertx/kafka/vertx-kafka.json index 0a2cb70..c10e2c9 100644 --- a/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/generated/resources/org/apache/camel/component/vertx/kafka/vertx-kafka.json +++ b/components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component/src/generated/resources/org/apache/camel/component/vertx/kafka/vertx-kafka.json @@ -4,7 +4,7 @@ "name": "vertx-kafka", "title": "Vert.x Kafka", "description": "Sent and receive messages to\/from an Apache Kafka broker using vert.x Kafka client", -"deprecated": false, +"deprecated": true, "firstVersion": "3.7.0", "label": "messaging", "javaType": "org.apache.camel.component.vertx.kafka.VertxKafkaComponent", diff --git a/components/camel-vertx/camel-vertx
[GitHub] [camel-karavan] Croway opened a new issue #139: [VS Code] White empty page
Croway opened a new issue #139: URL: https://github.com/apache/camel-karavan/issues/139 When using `Karavan: Create CRD`, `Karavan: Create YAML` or `Karavan: Open`, I get a white empty page, output logs are empty, where can I look for errors/logs?  -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on issue #2483: Add Quarkus service binding support to vertx-kafka extension
jamesnetherton commented on issue #2483: URL: https://github.com/apache/camel-quarkus/issues/2483#issuecomment-985312317 The `vertx-kafka` component has been [labelled as deprecated](https://github.com/apache/camel/commit/3eb46d5146d44b7f3ec06317b87bb1402e2e6ab4), so it's probably not worth investing any further time in this extension. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton closed issue #2483: Add Quarkus service binding support to vertx-kafka extension
jamesnetherton closed issue #2483: URL: https://github.com/apache/camel-quarkus/issues/2483 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17200: camel-google-storage - Fix includeFolders when set to false
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0e663ef CAMEL-17200: camel-google-storage - Fix includeFolders when
set to false
0e663ef is described below
commit 0e663efd72805a3fbe6cd85b74793ab1540353c4
Author: Claus Ibsen
AuthorDate: Fri Dec 3 09:31:46 2021 +0100
CAMEL-17200: camel-google-storage - Fix includeFolders when set to false
---
.../component/google/storage/GoogleCloudStorageConsumer.java | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git
a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumer.java
b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumer.java
index 1511b81..ef00abf 100644
---
a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumer.java
+++
b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumer.java
@@ -140,11 +140,15 @@ public class GoogleCloudStorageConsumer extends
ScheduledBatchPollingConsumer {
* @return true to include, false to exclude
*/
protected boolean includeObject(Blob blob) {
-if (getConfiguration().isIncludeFolders()) {
-return true;
+// is the blog a folder
+boolean folder = blob.getName().endsWith("/");
+
+if (folder && !getConfiguration().isIncludeFolders()) {
+// we should not include folders
+return false;
}
-// Config says to ignore folders/directories
-return blob.getName().endsWith("/");
+
+return true;
}
@Override
[camel] branch main updated: CAMEL-17266: camel-google-storage - Include body should use stream caching
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f7c75ac CAMEL-17266: camel-google-storage - Include body should use
stream caching
f7c75ac is described below
commit f7c75ac4912f59eb0b5b4e541b18a13ffc97ff3a
Author: Claus Ibsen
AuthorDate: Fri Dec 3 09:42:23 2021 +0100
CAMEL-17266: camel-google-storage - Include body should use stream caching
---
.../component/google/storage/GoogleCloudStorageConsumer.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumer.java
b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumer.java
index ef00abf..8891ecc 100644
---
a/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumer.java
+++
b/components/camel-google/camel-google-storage/src/main/java/org/apache/camel/component/google/storage/GoogleCloudStorageConsumer.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.google.storage;
-import java.io.ByteArrayOutputStream;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
@@ -38,6 +37,7 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.EmptyAsyncCallback;
import org.apache.camel.support.ScheduledBatchPollingConsumer;
+import org.apache.camel.support.builder.OutputStreamBuilder;
import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
@@ -271,9 +271,11 @@ public class GoogleCloudStorageConsumer extends
ScheduledBatchPollingConsumer {
if (getConfiguration().isIncludeBody()) {
try {
-ByteArrayOutputStream baos = new ByteArrayOutputStream();
-blob.downloadTo(baos);
-message.setBody(baos.toByteArray());
+// if stream caching is enabled then use that so we can stream
accordingly
+// for example to overflow to disk for big streams
+OutputStreamBuilder osb =
OutputStreamBuilder.withExchange(exchange);
+blob.downloadTo(osb);
+message.setBody(osb.build());
} catch (Exception e) {
throw new RuntimeCamelException(e);
}
[GitHub] [camel-k] astefanutti opened a new pull request #2811: chore(ci): Better GitHub Actions concurrency group
astefanutti opened a new pull request #2811: URL: https://github.com/apache/camel-k/pull/2811 Aim at enabling concurrent runs on main branch, and cancelling in progress concurrency groups by pull request. **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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17266: camel-google-storage - Download to file support.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new da5cadb CAMEL-17266: camel-google-storage - Download to file support. da5cadb is described below commit da5cadb5516bf11b96e240ec4935affe65737dea Author: Claus Ibsen AuthorDate: Fri Dec 3 10:21:42 2021 +0100 CAMEL-17266: camel-google-storage - Download to file support. --- .../GoogleCloudStorageComponentConfigurer.java | 6 +++ .../GoogleCloudStorageEndpointConfigurer.java | 6 +++ .../GoogleCloudStorageEndpointUriFactory.java | 3 +- .../component/google/storage/google-storage.json | 2 + .../storage/GoogleCloudStorageConfiguration.java | 22 + .../google/storage/GoogleCloudStorageConsumer.java | 55 ++ ...calTest.java => ConsumerDownloadLocalTest.java} | 15 -- .../google/storage/unit/ConsumerLocalTest.java | 1 - .../dsl/GoogleStorageComponentBuilderFactory.java | 23 + .../GoogleCloudStorageEndpointBuilderFactory.java | 22 + 10 files changed, 142 insertions(+), 13 deletions(-) diff --git a/components/camel-google/camel-google-storage/src/generated/java/org/apache/camel/component/google/storage/GoogleCloudStorageComponentConfigurer.java b/components/camel-google/camel-google-storage/src/generated/java/org/apache/camel/component/google/storage/GoogleCloudStorageComponentConfigurer.java index 7eb4300..6ddc88f 100644 --- a/components/camel-google/camel-google-storage/src/generated/java/org/apache/camel/component/google/storage/GoogleCloudStorageComponentConfigurer.java +++ b/components/camel-google/camel-google-storage/src/generated/java/org/apache/camel/component/google/storage/GoogleCloudStorageComponentConfigurer.java @@ -39,6 +39,8 @@ public class GoogleCloudStorageComponentConfigurer extends PropertyConfigurerSup case "deleteAfterRead": getOrCreateConfiguration(target).setDeleteAfterRead(property(camelContext, boolean.class, value)); return true; case "destinationbucket": case "destinationBucket": getOrCreateConfiguration(target).setDestinationBucket(property(camelContext, java.lang.String.class, value)); return true; +case "downloadfilename": +case "downloadFileName": getOrCreateConfiguration(target).setDownloadFileName(property(camelContext, java.lang.String.class, value)); return true; case "includebody": case "includeBody": getOrCreateConfiguration(target).setIncludeBody(property(camelContext, boolean.class, value)); return true; case "includefolders": @@ -81,6 +83,8 @@ public class GoogleCloudStorageComponentConfigurer extends PropertyConfigurerSup case "deleteAfterRead": return boolean.class; case "destinationbucket": case "destinationBucket": return java.lang.String.class; +case "downloadfilename": +case "downloadFileName": return java.lang.String.class; case "includebody": case "includeBody": return boolean.class; case "includefolders": @@ -119,6 +123,8 @@ public class GoogleCloudStorageComponentConfigurer extends PropertyConfigurerSup case "deleteAfterRead": return getOrCreateConfiguration(target).isDeleteAfterRead(); case "destinationbucket": case "destinationBucket": return getOrCreateConfiguration(target).getDestinationBucket(); +case "downloadfilename": +case "downloadFileName": return getOrCreateConfiguration(target).getDownloadFileName(); case "includebody": case "includeBody": return getOrCreateConfiguration(target).isIncludeBody(); case "includefolders": diff --git a/components/camel-google/camel-google-storage/src/generated/java/org/apache/camel/component/google/storage/GoogleCloudStorageEndpointConfigurer.java b/components/camel-google/camel-google-storage/src/generated/java/org/apache/camel/component/google/storage/GoogleCloudStorageEndpointConfigurer.java index 7fe7f5d..00d8366 100644 --- a/components/camel-google/camel-google-storage/src/generated/java/org/apache/camel/component/google/storage/GoogleCloudStorageEndpointConfigurer.java +++ b/components/camel-google/camel-google-storage/src/generated/java/org/apache/camel/component/google/storage/GoogleCloudStorageEndpointConfigurer.java @@ -36,6 +36,8 @@ public class GoogleCloudStorageEndpointConfigurer extends PropertyConfigurerSupp case "deleteAfterRead": target.getConfiguration().setDeleteAfterRead(property(camelContext, boolean.class, value)); return true; case "destinationbucket": case "destinationBucket": target.getConfiguration().setDestinationBucket(property(camelContext, java.lang.String.class, value)); return true; +case "downloadfilename": +case "downloadFileName": target.getConfiguration().setDownloadFileName(p
[camel] branch regen_bot updated (b61369a -> f7c75ac)
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 b61369a Sync deps add 3eb46d5 camel-vertx-kafka - Deprecated as the vertx kafka client are in tech preview only and not active maintained. Quarkus is not using this either. The regular camel-kafka is improved alot recommended to be used. add 0e663ef CAMEL-17200: camel-google-storage - Fix includeFolders when set to false add f7c75ac CAMEL-17266: camel-google-storage - Include body should use stream caching No new revisions were added by this update. Summary of changes: .../camel/catalog/components/vertx-kafka.json | 2 +- .../google/storage/GoogleCloudStorageConsumer.java | 22 ++ .../camel-vertx-kafka-component/pom.xml| 2 +- .../services/org/apache/camel/component.properties | 2 +- .../camel/component/vertx/kafka/vertx-kafka.json | 2 +- .../src/main/docs/vertx-kafka-component.adoc | 5 +++-- .../component/ComponentsBuilderFactory.java| 1 + .../dsl/VertxKafkaComponentBuilderFactory.java | 1 + .../src/generated/resources/metadata.json | 2 +- .../builder/endpoint/StaticEndpointBuilders.java | 2 ++ .../dsl/VertxKafkaEndpointBuilderFactory.java | 3 +++ 11 files changed, 29 insertions(+), 15 deletions(-)
[camel] branch regen_bot updated (f7c75ac -> 0e663ef)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit f7c75ac CAMEL-17266: camel-google-storage - Include body should use stream caching This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (0e663ef) \ O -- O -- O (f7c75ac) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../component/google/storage/GoogleCloudStorageConsumer.java | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #6498: Generated sources regen
github-actions[bot] opened a new pull request #6498: URL: https://github.com/apache/camel/pull/6498 Regen bot :robot: found some uncommited changes after running build on :camel: main. 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (0e663ef -> 06dbaf5)
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 0e663ef CAMEL-17200: camel-google-storage - Fix includeFolders when
set to false
add f7c75ac CAMEL-17266: camel-google-storage - Include body should use
stream caching
add da5cadb CAMEL-17266: camel-google-storage - Download to file support.
add 06dbaf5 Regen for commit da5cadb5516bf11b96e240ec4935affe65737dea
No new revisions were added by this update.
Summary of changes:
.../camel/catalog/components/google-storage.json | 2 +
.../GoogleCloudStorageComponentConfigurer.java | 6 +++
.../GoogleCloudStorageEndpointConfigurer.java | 6 +++
.../GoogleCloudStorageEndpointUriFactory.java | 3 +-
.../component/google/storage/google-storage.json | 2 +
.../storage/GoogleCloudStorageConfiguration.java | 22 +
.../google/storage/GoogleCloudStorageConsumer.java | 55 +++---
...calTest.java => ConsumerDownloadLocalTest.java} | 15 --
.../google/storage/unit/ConsumerLocalTest.java | 1 -
.../dsl/GoogleStorageComponentBuilderFactory.java | 23 +
.../GoogleCloudStorageEndpointBuilderFactory.java | 22 +
11 files changed, 145 insertions(+), 12 deletions(-)
copy
components/camel-google/camel-google-storage/src/test/java/org/apache/camel/component/google/storage/unit/{ConsumerLocalTest.java
=> ConsumerDownloadLocalTest.java} (85%)
[GitHub] [camel] oscerd merged pull request #6498: Generated sources regen
oscerd merged pull request #6498: URL: https://github.com/apache/camel/pull/6498 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit da5cadb5516bf11b96e240ec4935affe65737dea
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new deb0315 Regen for commit da5cadb5516bf11b96e240ec4935affe65737dea
deb0315 is described below
commit deb03150c3091f0f99b18f96e1645a2f8d5ed496
Author: davsclaus
AuthorDate: Fri Dec 3 10:26:56 2021 +
Regen for commit da5cadb5516bf11b96e240ec4935affe65737dea
Signed-off-by: GitHub
---
.../resources/org/apache/camel/catalog/components/google-storage.json | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-storage.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-storage.json
index 7ea0144..d5fedf1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-storage.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-storage.json
@@ -31,6 +31,7 @@
"bridgeErrorHandler": { "kind": "property", "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 me [...]
"deleteAfterRead": { "kind": "property", "displayName": "Delete After
Read", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "Delete objects from the
bucket after they have been retrieved. The delete [...]
"destinationBucket": { "kind": "property", "displayName": "Destination
Bucket", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "Define the destination
bucket where an object must be moved when moveAfterRead is set [...]
+"downloadFileName": { "kind": "property", "displayName": "Download File
Name", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "The folder or filename
to use when downloading the blob. By default, this specifies th [...]
"includeBody": { "kind": "property", "displayName": "Include Body",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "If it is true, the
Object exchange will be consumed and put into the body. If false [...]
"includeFolders": { "kind": "property", "displayName": "Include Folders",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "If it is true, the
folders\/directories will be consumed. If it is false, the [...]
"moveAfterRead": { "kind": "property", "displayName": "Move After Read",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.google.storage.GoogleCloudStorageConfiguration",
"configurationField": "configuration", "description": "Move objects from the
origin bucket to a different bucket after they have bee [...]
@@ -49,6 +50,7 @@
"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, "descrip
[GitHub] [camel-quarkus] jamesnetherton commented on issue #3353: SecurityIdentity is not propagated to Camel route
jamesnetherton commented on issue #3353: URL: https://github.com/apache/camel-quarkus/issues/3353#issuecomment-985432055 This does indeed seem to be broken for `platform-http`. Even when forcefully activating the request context with ` @ActivateRequestContext`, the `SecurityIdentity` details are empty. As a workaround you can try using `camel-quarkus-servlet`. `SecurityIdentity` should then work correctly. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti merged pull request #2811: chore(ci): Better GitHub Actions concurrency group
astefanutti merged pull request #2811: URL: https://github.com/apache/camel-k/pull/2811 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti merged pull request #2809: fix(OLM): Remove aggregated cluster roles from OLM bundle
astefanutti merged pull request #2809: URL: https://github.com/apache/camel-k/pull/2809 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: chore(ci): Better GitHub Actions concurrency group
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 6186d02 chore(ci): Better GitHub Actions concurrency group
6186d02 is described below
commit 6186d02bcd13dd0ec1afb0085237f7e54b46c1ca
Author: Antonin Stefanutti
AuthorDate: Fri Dec 3 10:06:12 2021 +0100
chore(ci): Better GitHub Actions concurrency group
---
.github/workflows/build.yml | 2 +-
.github/workflows/builder.yml| 2 +-
.github/workflows/knative.yml| 2 +-
.github/workflows/kubernetes.yml | 2 +-
.github/workflows/local.yml | 2 +-
.github/workflows/openshift.yml | 2 +-
.github/workflows/upgrade.yml| 2 +-
.github/workflows/validate.yml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index baaf4c6..7831f9e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ on:
- 'NOTICE'
concurrency:
- group: ${{ github.head_ref }}-${{ github.workflow }}
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.sha }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index 5411805..b520ff8 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -44,7 +44,7 @@ on:
- 'NOTICE'
concurrency:
- group: ${{ github.head_ref }}-${{ github.workflow }}
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.sha }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/knative.yml b/.github/workflows/knative.yml
index 3ee7e34..149e9b3 100644
--- a/.github/workflows/knative.yml
+++ b/.github/workflows/knative.yml
@@ -44,7 +44,7 @@ on:
- 'NOTICE'
concurrency:
- group: ${{ github.head_ref }}-${{ github.workflow }}
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.sha }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/kubernetes.yml b/.github/workflows/kubernetes.yml
index 25e4e7e..654d70a 100644
--- a/.github/workflows/kubernetes.yml
+++ b/.github/workflows/kubernetes.yml
@@ -44,7 +44,7 @@ on:
- 'NOTICE'
concurrency:
- group: ${{ github.head_ref }}-${{ github.workflow }}
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.sha }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/local.yml b/.github/workflows/local.yml
index 0c00454..a1a0856 100644
--- a/.github/workflows/local.yml
+++ b/.github/workflows/local.yml
@@ -44,7 +44,7 @@ on:
- 'NOTICE'
concurrency:
- group: ${{ github.head_ref }}-${{ github.workflow }}
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.sha }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/openshift.yml b/.github/workflows/openshift.yml
index 36c7c7a..1febe06 100644
--- a/.github/workflows/openshift.yml
+++ b/.github/workflows/openshift.yml
@@ -44,7 +44,7 @@ on:
- 'NOTICE'
concurrency:
- group: ${{ github.head_ref }}-${{ github.workflow }}
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.sha }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
index 3133628..9e9e733 100644
--- a/.github/workflows/upgrade.yml
+++ b/.github/workflows/upgrade.yml
@@ -44,7 +44,7 @@ on:
- 'NOTICE'
concurrency:
- group: ${{ github.head_ref }}-${{ github.workflow }}
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.sha }}
cancel-in-progress: true
jobs:
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index a4a27ef..b635a84 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -28,7 +28,7 @@ on:
- "release-*"
concurrency:
- group: ${{ github.head_ref }}-${{ github.workflow }}
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number ||
github.sha }}
cancel-in-progress: true
jobs:
[camel-k] branch main updated: fix(OLM): Remove aggregated cluster roles from OLM bundle
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 15ce8a4 fix(OLM): Remove aggregated cluster roles from OLM bundle 15ce8a4 is described below commit 15ce8a451d8c6e2df4c61d8f6b26e0230f685bf5 Author: Antonin Stefanutti AuthorDate: Thu Dec 2 18:21:57 2021 +0100 fix(OLM): Remove aggregated cluster roles from OLM bundle --- config/manifests/kustomization.yaml| 3 +++ ...zation.yaml => patch-delete-user-cluster-role.yaml} | 18 +- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml index 7842251..408829e 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/kustomization.yaml @@ -28,3 +28,6 @@ resources: - ../scorecard - ../rbac - ../rbac/openshift + +patchesStrategicMerge: +- patch-delete-user-cluster-role.yaml diff --git a/config/manifests/kustomization.yaml b/config/manifests/patch-delete-user-cluster-role.yaml similarity index 80% copy from config/manifests/kustomization.yaml copy to config/manifests/patch-delete-user-cluster-role.yaml index 7842251..e380103 100644 --- a/config/manifests/kustomization.yaml +++ b/config/manifests/patch-delete-user-cluster-role.yaml @@ -14,17 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # --- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -# Labels to add to all resources and selectors. -commonLabels: - app: camel-k - -resources: -- ../manager -- ../crd -- ../samples -- ../scorecard -- ../rbac -- ../rbac/openshift +$patch: delete +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: camel-k-edit
[GitHub] [camel] davsclaus merged pull request #6497: Update doc instructions, including website release instructions
davsclaus merged pull request #6497: URL: https://github.com/apache/camel/pull/6497 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (06dbaf5 -> deb0315)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit 06dbaf5 Regen for commit da5cadb5516bf11b96e240ec4935affe65737dea add deb0315 Regen for commit da5cadb5516bf11b96e240ec4935affe65737dea This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (06dbaf5) \ N -- N -- N refs/heads/regen_bot (deb0315) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel] branch main updated: Update doc instructions, including website release instructions (#6497)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 08e6572 Update doc instructions, including website release
instructions (#6497)
08e6572 is described below
commit 08e657294327cbe2b06d8d87c4cbb474a3daf33b
Author: djencks
AuthorDate: Fri Dec 3 03:33:56 2021 -0800
Update doc instructions, including website release instructions (#6497)
* non-archaic user manual images location
* Improve website release guide and doc guides
---
.../images/books/3151EN_Mastering_Apache_Camel.jpg | Bin
.../ROOT/{assets => }/images/books/3477OS.jpg | Bin
.../ROOT/{assets => }/images/books/3477OSmall.jpg | Bin
.../ROOT/{assets => }/images/books/5347OSmall.jpg | Bin
.../images/books/B03507_MockupCover_Normal.jpg | Bin
.../images/books/CamelCookbookCover.png| Bin
.../{assets => }/images/books/CiA-front-medium.png | Bin
.../images/books/camel-design-patterns.jpg | Bin
.../{assets => }/images/books/cia2-cover-small.jpg | Bin
.../ROOT/{assets => }/images/books/cia_small.jpg | Bin
.../{assets => }/images/books/eip_book_cover.jpg | Bin
.../ROOT/{assets => }/images/books/large.jpg | Bin
.../ROOT/{assets => }/images/books/rademakers.jpg | Bin
.../images/images/EventDrivenConsumerSolution.gif | Bin
.../images/images/MessageEndpointSolution.gif | Bin
.../images/images/MessageTranslator.gif| Bin
.../apache-spark.data/camel_spark_cluster.png | Bin
.../apache-spark.data/camel_spark_driver.png | Bin
.../images/apache-spark.data/fabric_docker-(2).png | Bin
.../images/barcode-data-format.data/qr-code.png| Bin
.../images/images/camel-architecture.png | Bin
.../{assets => }/images/images/camel-context.png | Bin
.../ROOT/{assets => }/images/images/camel-logo.png | Bin
.../ROOT/{assets => }/images/images/debug.png | Bin
.../images/direct-vm.data/camel-direct-vm.png | Bin
.../download.data/camel-box-v1.0-150x200.png | Bin
.../images/images/endpoint-factory.png | Bin
.../images/images/endpoint-uri-syntax.png | Bin
.../enterprise-integration-patterns.data/clear.png | Bin
.../images/images/message_flow_in_route.png| Bin
.../images/images/service_lifecycle.png| Bin
docs/user-manual/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/improving-the-documentation.adoc| 39 ++---
.../modules/ROOT/pages/release-guide-website.adoc | 190 +
.../modules/ROOT/pages/release-guide.adoc | 1 +
.../flow.png | Bin 6152 -> 0 bytes
.../message-flow-in-route.png | Bin 13415 -> 0 bytes
.../flow.png | Bin
.../message-flow-in-route.png | Bin
.../faq/pages/how-does-the-website-work.adoc | 2 +-
40 files changed, 103 insertions(+), 130 deletions(-)
diff --git
a/docs/user-manual/modules/ROOT/assets/images/books/3151EN_Mastering_Apache_Camel.jpg
b/docs/user-manual/modules/ROOT/images/books/3151EN_Mastering_Apache_Camel.jpg
similarity index 100%
rename from
docs/user-manual/modules/ROOT/assets/images/books/3151EN_Mastering_Apache_Camel.jpg
rename to
docs/user-manual/modules/ROOT/images/books/3151EN_Mastering_Apache_Camel.jpg
diff --git a/docs/user-manual/modules/ROOT/assets/images/books/3477OS.jpg
b/docs/user-manual/modules/ROOT/images/books/3477OS.jpg
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/books/3477OS.jpg
rename to docs/user-manual/modules/ROOT/images/books/3477OS.jpg
diff --git a/docs/user-manual/modules/ROOT/assets/images/books/3477OSmall.jpg
b/docs/user-manual/modules/ROOT/images/books/3477OSmall.jpg
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/books/3477OSmall.jpg
rename to docs/user-manual/modules/ROOT/images/books/3477OSmall.jpg
diff --git a/docs/user-manual/modules/ROOT/assets/images/books/5347OSmall.jpg
b/docs/user-manual/modules/ROOT/images/books/5347OSmall.jpg
similarity index 100%
rename from docs/user-manual/modules/ROOT/assets/images/books/5347OSmall.jpg
rename to docs/user-manual/modules/ROOT/images/books/5347OSmall.jpg
diff --git
a/docs/user-manual/modules/ROOT/assets/images/books/B03507_MockupCover_Normal.jpg
b/docs/user-manual/modules/ROOT/images/books/B03507_MockupCover_Normal.jpg
similarity index 100%
rename from
docs/user-manual/modules/ROOT/assets/images/books/B03507_MockupCover_Normal.jpg
rename to
docs/user-manual/modules/ROOT/images/books/B03507_MockupCover_Normal.jpg
diff --git
a/docs/user-manual/modules/ROOT/assets/images/books/CamelCookbookCover.png
b/docs/user-manual/modules/ROOT/images/books/CamelCookbookCover.png
similarity index 100%
rename from
docs/user-manual/modules/ROOT/assets/images/books/Came
[camel] branch regen_bot updated (deb0315 -> 08e6572)
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 deb0315 Regen for commit da5cadb5516bf11b96e240ec4935affe65737dea
add 08e6572 Update doc instructions, including website release
instructions (#6497)
No new revisions were added by this update.
Summary of changes:
.../images/books/3151EN_Mastering_Apache_Camel.jpg | Bin
.../ROOT/{assets => }/images/books/3477OS.jpg | Bin
.../ROOT/{assets => }/images/books/3477OSmall.jpg | Bin
.../ROOT/{assets => }/images/books/5347OSmall.jpg | Bin
.../images/books/B03507_MockupCover_Normal.jpg | Bin
.../images/books/CamelCookbookCover.png| Bin
.../{assets => }/images/books/CiA-front-medium.png | Bin
.../images/books/camel-design-patterns.jpg | Bin
.../{assets => }/images/books/cia2-cover-small.jpg | Bin
.../ROOT/{assets => }/images/books/cia_small.jpg | Bin
.../{assets => }/images/books/eip_book_cover.jpg | Bin
.../ROOT/{assets => }/images/books/large.jpg | Bin
.../ROOT/{assets => }/images/books/rademakers.jpg | Bin
.../images/images/EventDrivenConsumerSolution.gif | Bin
.../images/images/MessageEndpointSolution.gif | Bin
.../images/images/MessageTranslator.gif| Bin
.../apache-spark.data/camel_spark_cluster.png | Bin
.../apache-spark.data/camel_spark_driver.png | Bin
.../images/apache-spark.data/fabric_docker-(2).png | Bin
.../images/barcode-data-format.data/qr-code.png| Bin
.../images/images/camel-architecture.png | Bin
.../{assets => }/images/images/camel-context.png | Bin
.../ROOT/{assets => }/images/images/camel-logo.png | Bin
.../ROOT/{assets => }/images/images/debug.png | Bin
.../images/direct-vm.data/camel-direct-vm.png | Bin
.../download.data/camel-box-v1.0-150x200.png | Bin
.../images/images/endpoint-factory.png | Bin
.../images/images/endpoint-uri-syntax.png | Bin
.../enterprise-integration-patterns.data/clear.png | Bin
.../images/images/message_flow_in_route.png| Bin
.../images/images/service_lifecycle.png| Bin
docs/user-manual/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/improving-the-documentation.adoc| 39 ++---
.../modules/ROOT/pages/release-guide-website.adoc | 190 +
.../modules/ROOT/pages/release-guide.adoc | 1 +
.../flow.png | Bin 6152 -> 0 bytes
.../message-flow-in-route.png | Bin 13415 -> 0 bytes
.../flow.png | Bin
.../message-flow-in-route.png | Bin
.../faq/pages/how-does-the-website-work.adoc | 2 +-
40 files changed, 103 insertions(+), 130 deletions(-)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/books/3151EN_Mastering_Apache_Camel.jpg (100%)
rename docs/user-manual/modules/ROOT/{assets => }/images/books/3477OS.jpg
(100%)
rename docs/user-manual/modules/ROOT/{assets => }/images/books/3477OSmall.jpg
(100%)
rename docs/user-manual/modules/ROOT/{assets => }/images/books/5347OSmall.jpg
(100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/books/B03507_MockupCover_Normal.jpg (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/books/CamelCookbookCover.png (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/books/CiA-front-medium.png (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/books/camel-design-patterns.jpg (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/books/cia2-cover-small.jpg (100%)
rename docs/user-manual/modules/ROOT/{assets => }/images/books/cia_small.jpg
(100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/books/eip_book_cover.jpg (100%)
rename docs/user-manual/modules/ROOT/{assets => }/images/books/large.jpg (100%)
rename docs/user-manual/modules/ROOT/{assets => }/images/books/rademakers.jpg
(100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/EventDrivenConsumerSolution.gif (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/MessageEndpointSolution.gif (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/MessageTranslator.gif (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/apache-spark.data/camel_spark_cluster.png (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/apache-spark.data/camel_spark_driver.png (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/apache-spark.data/fabric_docker-(2).png (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/barcode-data-format.data/qr-code.png (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/camel-architecture.png (100%)
rename docs/user-manual/modules/ROOT/{assets =>
}/images/images/camel-context.png (100%)
rename docs/us
[GitHub] [camel-quarkus] jamesnetherton opened a new issue #3355: Remove CI workflow steps to install `yq`
jamesnetherton opened a new issue #3355: URL: https://github.com/apache/camel-quarkus/issues/3355 `yq` is now part of the installed software on the CI VM, so there's no longer any need to download and install it manually. The current version is `4.15.1` so we need to check whether the bits that use `yq` still work properly with 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] davsclaus closed issue #686: Add more prominent link to the official Apache Camel group on linkedin
davsclaus closed issue #686: URL: https://github.com/apache/camel-website/issues/686 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] henka-rl opened a new pull request #6499: CAMEL-17267 Adding httpMethod to endpoint properties
henka-rl opened a new pull request #6499: URL: https://github.com/apache/camel/pull/6499 I had to change HeaderFilteringTest because it did a GET with a body and this didn't work after I added httpMethod to the endpoint properties. But you shouldn't send a body with a GET anyway, so this seems to be the right way to do the test... -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] zregvart opened a new issue #702: Use cache bursting hash on resources from the Antora UI
zregvart opened a new issue #702: URL: https://github.com/apache/camel-website/issues/702 Recently we updated the `antora-ui-camel/src/img/brand-logos.svg`, but the effect of that change might not be seen by all user agents depending on their cache state. The cache expires [after 1 month](https://github.com/apache/camel-website/blob/edf4924352b466056ad6bc8f00744dd199d0dfeb/static/.htaccess#L1901), making the user agent skip fetching the resource until it expires, which could be a ~30 days from now. For CSS we use cache bursting hash, we should use it for other resources within the Anotra UI so changes are immediately in effect. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ffang commented on pull request #3341: fix [JDK17]kudu:integration test failed in native mode #3340
ffang commented on pull request #3341: URL: https://github.com/apache/camel-quarkus/pull/3341#issuecomment-985621648 > About where to put `--add-opens java.base/java.net=ALL-UNNAMED` given that java 11 is our baseline, where this should work and given that we need it for both plugins in all profiles, can't we just add > > ``` > > > --add-opens java.base/java.net=ALL-UNNAMED > > ``` > > in the top profile-less context (and remove the old `jdk16-workarounds` profile altogether)? Hi @ppalaga , I may miss your point, but if we add ``` + + + +org.apache.maven.plugins +maven-surefire-plugin + + +--add-opens java.base/java.net=ALL-UNNAMED + + + + ``` in the pom.xml out of profiles, this can't affect the maven-failsafe-plugin configuration in native profile. The maven-failsafe-plugin configuration in native profile can't pick up this argLine and will fail with JDK17 in native mode. We need to add this argLine in native profile anyway. Freeman -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] betonetotbo opened a new issue #2812: Be able to configure PodMonitor via prometheus trait
betonetotbo opened a new issue #2812: URL: https://github.com/apache/camel-k/issues/2812 Currently the only thing is possible to configure at the prometheus trait is the labels, as we can see here: https://camel.apache.org/camel-k/1.7.x/traits/prometheus.html Would be a nice feature , if we would be able to configure prometheus `PodMonitor` specs (https://github.com/prometheus-operator/prometheus-operator/blob/release-0.39/Documentation/api.md#podmetricsendpoint). For example: set a specific interval for the metrics endpoint scrape, in my case the default scrape interval in prometheus is 60s, but I need that my camel-k integrations to be scrape each 15 seconds. A suggestion for use in command line: `kamel run Integration.java --trait prometheus.pod-monitor.spec.pod-metrics-endpoints.interval=15s` So this would be a nice pattern to customize any parameter in the PodMonitor definition. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] vkrizan opened a new pull request #6500: CAMEL-17269: camel-splunk-hec IPv4 hostname
vkrizan opened a new pull request #6500: URL: https://github.com/apache/camel/pull/6500 Improves URI validation messages for hostname and adds support for using an IPv4 address as hostname on Splunk HEC component. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] vkrizan commented on pull request #6500: CAMEL-17269: camel-splunk-hec IPv4 hostname
vkrizan commented on pull request #6500: URL: https://github.com/apache/camel/pull/6500#issuecomment-985693503 The `mvn clean install -Psourcecheck` fails on Core on my side for some reason. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] vkrizan edited a comment on pull request #6500: CAMEL-17269: camel-splunk-hec IPv4 hostname
vkrizan edited a comment on pull request #6500: URL: https://github.com/apache/camel/pull/6500#issuecomment-985693503 The `mvn clean install -Psourcecheck` fails on Core on my side for some reason. ``` [ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 5.03 s <<< FAILURE! - in org.apache.camel.processor.SagaTimeoutTest [ERROR] org.apache.camel.processor.SagaTimeoutTest.testTimeoutHasNoEffectIfCompleted Time elapsed: 1.857 s <<< ERROR! org.apache.camel.CamelExecutionException: Exception occurred during execution on the exchange: Exchange[56E05F5F602BCF1-0001] ``` (and more failures) -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti commented on issue #2812: Be able to configure PodMonitor via prometheus trait
astefanutti commented on issue #2812: URL: https://github.com/apache/camel-k/issues/2812#issuecomment-985707685 I wonder in that case whether creating a single bespoke `PodMonitor` matching all the integrations, would meet your need, e.g.: ```yaml apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: name: camel-k-integrations labels: # To match the Prometheus PodMonitor selector spec: podTargetLabels: - camel.apache.org/integration selector: matchExpressions: - key: camel.apache.org/integration operator: Exists podMetricsEndpoints: - port: metrics path: /q/metrics interval: 15s ``` And you could configuration the _prometheus_ trait globally on the IntegrationPlatform, e.g.: ```yaml apiVersion: camel.apache.org/v1 kind: IntegrationPlatform spec: traits: - prometheus: configuration: enabled: true podMonitor: false ``` -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] betonetotbo commented on issue #2812: Be able to configure PodMonitor via prometheus trait
betonetotbo commented on issue #2812: URL: https://github.com/apache/camel-k/issues/2812#issuecomment-985712303 Yes, for that scenario. But in the case if I need different intervals, this will not fit, or just about the simple case that I just not want to manually manage the PodMonitors. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin commented on issue #139: [VS Code] White empty page
mgubaidullin commented on issue #139: URL: https://github.com/apache/camel-karavan/issues/139#issuecomment-985717287 @Croway what is your OS type and version, VSCode version and extensions installed? -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin commented on issue #139: [VS Code] White empty page
mgubaidullin commented on issue #139: URL: https://github.com/apache/camel-karavan/issues/139#issuecomment-985717784 You could find some logs in Developer Tool https://user-images.githubusercontent.com/1379213/144650219-978e6305-a3b7-4032-8553-3f696ed0760d.png";> -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] Croway commented on issue #139: [VS Code] White empty page
Croway commented on issue #139: URL: https://github.com/apache/camel-karavan/issues/139#issuecomment-985730335 Fedora 35, vscode version: 1.62.3, karavan version 0.0.8 I think (from changelog)  -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] astefanutti opened a new pull request #2813: Backport #2755 and #2809 to 1.7.x
astefanutti opened a new pull request #2813: URL: https://github.com/apache/camel-k/pull/2813 Backport #2755 and #2809 to 1.7.x. **Release Note** ```release-note chore(old): Update the operator-sdk version fix(OLM): Remove aggregated cluster roles from OLM bundle ``` -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on pull request #3341: fix [JDK17]kudu:integration test failed in native mode #3340
ppalaga commented on pull request #3341: URL: https://github.com/apache/camel-quarkus/pull/3341#issuecomment-985792359 I spoke about `` in ``, not plugin config. We should be able to hit both plugins that way. -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] Croway commented on pull request #599: Add Redis source kamelet
Croway commented on pull request #599: URL: https://github.com/apache/camel-kamelets/pull/599#issuecomment-985822875 oh nice, I didn't know about generators and validators, moreover your documentation generator write adoc much better then 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch asf-site updated (1b5d595 -> 0cf760b)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard 1b5d595 Website updated to edf4924352b466056ad6bc8f00744dd199d0dfeb discard b0bb6be Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 6884fff Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 0cf760b Website updated to edf4924352b466056ad6bc8f00744dd199d0dfeb This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1b5d595) \ N -- N -- N refs/heads/asf-site (0cf760b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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: .htaccess | 26 +- camel-spring-boot/next/list.html |2 +- components/next/google-storage-component.html |2 +- components/next/index.html |2 +- manual/Endpoint-dsl.html |2 +- ...configuration-of-camelcontext-using-spring.html |2 +- manual/advice-with.html|2 +- manual/architecture.html |2 +- manual/backlog-debugger.html |2 +- manual/backlog-tracer.html |2 +- manual/batch-consumer.html |2 +- manual/bean-binding.html |2 +- manual/bean-injection.html |2 +- manual/bean-integration.html |2 +- manual/book-getting-started.html |2 +- manual/browsable-endpoint.html |2 +- manual/building.html |2 +- manual/camel-3-migration-guide.html|2 +- manual/camel-3x-upgrade-guide-3_1.html |2 +- manual/camel-3x-upgrade-guide-3_10.html|2 +- manual/camel-3x-upgrade-guide-3_11.html|2 +- manual/camel-3x-upgrade-guide-3_12.html|2 +- manual/camel-3x-upgrade-guide-3_13.html|2 +- manual/camel-3x-upgrade-guide-3_14.html|2 +- manual/camel-3x-upgrade-guide-3_2.html |2 +- manual/camel-3x-upgrade-guide-3_3.html |2 +- manual/camel-3x-upgrade-guide-3_4.html |2 +- manual/camel-3x-upgrade-guide-3_5.html |2 +- manual/camel-3x-upgrade-guide-3_6.html |2 +- manual/camel-3x-upgrade-guide-3_7.html |2 +- manual/camel-3x-upgrade-guide-3_8.html |2 +- manual/camel-3x-upgrade-guide-3_9.html |2 +- manual/camel-3x-upgrade-guide.html |2 +- manual/camel-catalog.html |2 +- manual/camel-component-maven-plugin.html |2 +- manual/camel-configuration-utilities.html |2 +- manual/camel-jbang.html|2 +- manual/camel-maven-archetypes.html |2 +- manual/camel-maven-plugin.html |2 +- manual/camel-report-maven-plugin.html |2 +- manual/camelcontext-autoconfigure.html |2 +- manual/camelcontext.html |2 +- manual/clustering.html |2 +- manual/commercial-camel-offerings.html |2 +- manual/component-dsl.html |2 +- manual/component.html |2 +- ...ing-route-startup-ordering-and-autostartup.html |2 +- manual/consumertemplate.html |2 +- manual/cronscheduledroutepolicy.html |2 +- manual/data-format.html|2 +- manual/debugger.html |2 +- manual/defaulterrorhandler.html|2 +- manual/delay-interceptor.html |2 +- manual/dsl.html|2 +- manual/endpoint-annotations.html |2 +- manual/endpoint.html |2 +- manual/error-handler.html |2 +- manual/examples
[GitHub] [camel-quarkus] ffang commented on pull request #3341: fix [JDK17]kudu:integration test failed in native mode #3340
ffang commented on pull request #3341: URL: https://github.com/apache/camel-quarkus/pull/3341#issuecomment-985854738 > I spoke about `` in ``, not plugin config. We should be able to hit both plugins that way. That's right, I will revise the PR soon. Thanks! Freeman -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-985969656 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 1537855279-590-929515f6-d65f-4eee-944e-5de6fc3638d0 * Camel Quarkus Commit: 052756c40fa4b393d64712162d4b65ba073fd295 * Quarkus Main Commit: e5bdd8227bf084a6160780c574bae7aaf71ee33a * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1537855279 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6500: CAMEL-17269: camel-splunk-hec IPv4 hostname
davsclaus merged pull request #6500: URL: https://github.com/apache/camel/pull/6500 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (08e6572 -> 3143946)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 08e6572 Update doc instructions, including website release instructions (#6497) add 3143946 CAMEL-17269: camel-splunk-hec IPv4 hostname (#6500) No new revisions were added by this update. Summary of changes: .../apache/camel/component/splunkhec/SplunkHECEndpoint.java| 10 -- .../camel/component/splunkhec/SplunkHECEndpointTest.java | 10 ++ 2 files changed, 18 insertions(+), 2 deletions(-)
[GitHub] [camel] davsclaus merged pull request #6499: CAMEL-17267 Adding httpMethod to endpoint properties
davsclaus merged pull request #6499: URL: https://github.com/apache/camel/pull/6499 -- 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17267 Adding httpMethod to endpoint properties (#6499)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5d8f4f4 CAMEL-17267 Adding httpMethod to endpoint properties (#6499)
5d8f4f4 is described below
commit 5d8f4f495ed6d999aa7bd1fa639512e80584327b
Author: henka-rl <67908385+henka...@users.noreply.github.com>
AuthorDate: Sat Dec 4 07:56:32 2021 +0100
CAMEL-17267 Adding httpMethod to endpoint properties (#6499)
---
.../src/main/java/org/apache/camel/component/http/HttpComponent.java | 1 +
.../java/org/apache/camel/component/http/HeaderFilteringTest.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index 8554b4f..e547b9b 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -561,6 +561,7 @@ public class HttpComponent extends HttpCommonComponent
implements RestProducerFa
// build query string, and append any endpoint configuration properties
if (config.getProducerComponent() == null ||
config.getProducerComponent().equals("http")) {
// setup endpoint options
+map.put("httpMethod", verb);
if (config.getEndpointProperties() != null &&
!config.getEndpointProperties().isEmpty()) {
map.putAll(config.getEndpointProperties());
}
diff --git
a/components/camel-http/src/test/java/org/apache/camel/component/http/HeaderFilteringTest.java
b/components/camel-http/src/test/java/org/apache/camel/component/http/HeaderFilteringTest.java
index faed11f..d190653 100644
---
a/components/camel-http/src/test/java/org/apache/camel/component/http/HeaderFilteringTest.java
+++
b/components/camel-http/src/test/java/org/apache/camel/component/http/HeaderFilteringTest.java
@@ -38,7 +38,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.apache.camel.component.http.HttpMethods.GET;
+import static org.apache.camel.component.http.HttpMethods.POST;
import static org.apache.http.HttpHeaders.HOST;
import static org.apache.http.entity.ContentType.APPLICATION_JSON;
import static org.assertj.core.api.Assertions.assertThat;
@@ -59,7 +59,7 @@ public class HeaderFilteringTest {
final HttpComponent http = context.getComponent("http",
HttpComponent.class);
-final Producer producer = http.createProducer(context,
"http://localhost:"; + port, GET.name(), "/test", null, null,
+final Producer producer = http.createProducer(context,
"http://localhost:"; + port, POST.name(), "/test", null, null,
APPLICATION_JSON.getMimeType(),
APPLICATION_JSON.getMimeType(), new RestConfiguration(),
Collections.emptyMap());
[camel] branch main updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5a1caa9 Polished
5a1caa9 is described below
commit 5a1caa9c5c6f3f354de95ab3e3163051215d822c
Author: Claus Ibsen
AuthorDate: Fri Dec 3 14:31:50 2021 +0100
Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 68da4c3..0c808ee 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -79,7 +79,7 @@ class Run implements Callable {
private boolean fileLock = true;
@Option(names = { "--local-kamelet-dir" },
-description = "Load Kamelets from a local directory instead of
resolving them from the classpath or GitHub")
+description = "Local directory to load Kamelets from (take
precedence))")
private String localKameletDir;
@Override
