[PR] feat(core): Move jib plugins versions to camelcatalog [camel-k]
gansheer opened a new pull request, #4805: URL: https://github.com/apache/camel-k/pull/4805 Ref #4703 ## Description Extracted jib plugin versions to camel-k-runtime: * use camelcatalog CR .spec.runtime.metadata values * set default values for catalog backward compatibility **Release Note** ```release-note feat(core): Move jib plugins versions to camelcatalog from camel-k-runtime ``` -- 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
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/repos/repos#update-a-repository"}
[camel-website-pub] branch asf-site updated (13a992944 -> f6bdd35de)
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-pub.git discard 13a992944 Website updated to 025db0497698093567995f69b2a7db6b9360a44c discard 9afcd96ee Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 29e57088c Website updated to 325e929157412b27394080f4d4dba3d821476ddf new f6bdd35de Website updated to 34908741c55796c201edd6c8a49b0dddb4d99313 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 (13a992944) \ N -- N -- N refs/heads/asf-site (f6bdd35de) 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 | 40 +- .well-known/security.txt |2 +- camel-k/next/apis/camel-k.html |2 +- camel-k/next/apis/java.html|2 +- camel-k/next/apis/kamelets.html|2 +- camel-k/next/architecture/architecture.html|2 +- camel-k/next/architecture/cr/build.html|2 +- camel-k/next/architecture/cr/camel-catalog.html|2 +- camel-k/next/architecture/cr/integration-kit.html |2 +- .../next/architecture/cr/integration-platform.html |2 +- camel-k/next/architecture/cr/integration.html |2 +- camel-k/next/architecture/incremental-image.html |2 +- camel-k/next/architecture/operator.html|2 +- camel-k/next/architecture/runtime.html |2 +- camel-k/next/architecture/traits.html |2 +- camel-k/next/cli/cli.html |2 +- camel-k/next/cli/file-based-config.html|2 +- camel-k/next/cli/modeline.html |2 +- .../next/configuration/build-time-properties.html |2 +- camel-k/next/configuration/components.html |2 +- camel-k/next/configuration/configuration.html |2 +- camel-k/next/configuration/dependencies.html |2 +- camel-k/next/configuration/maven-profile.html |2 +- camel-k/next/configuration/runtime-config.html |2 +- camel-k/next/configuration/runtime-properties.html |2 +- camel-k/next/configuration/runtime-resources.html |2 +- camel-k/next/contributing/developers.html |2 +- camel-k/next/contributing/e2e.html |2 +- .../next/contributing/local-deployment-olm.html|2 +- camel-k/next/contributing/local-development.html |2 +- camel-k/next/contributing/local-execution.html | 18 + camel-k/next/contributing/remote-debugging.html|4 +- camel-k/next/contributing/uninstalling.html|2 +- camel-k/next/contributing/upgrade.html |2 +- camel-k/next/index.html|2 +- camel-k/next/installation/advanced/advanced.html |2 +- .../next/installation/advanced/build-config.html |2 +- camel-k/next/installation/advanced/http-proxy.html |2 +- camel-k/next/installation/advanced/kustomize.html |2 +- .../next/installation/advanced/maven-proxy.html|2 +- camel-k/next/installation/advanced/maven.html |2 +- .../installation/advanced/multi-architecture.html |2 +- camel-k/next/installation/advanced/multi.html |2 +- camel-k/next/installation/advanced/network.html|2 +- camel-k/next/installation/advanced/offline.html|2 +- camel-k/next/installation/advanced/resources.html |2 +- camel-k/next/installation/installation.html|2 +- camel-k/next/installation/platform/crc.html|2 +- .../next/installation/platform/digitalocean.html |2 +- .../next/installation/platform/docker-desktop.html |2 +- camel-k/next/installation/platform/gke.html|2 +- camel-k/next/installation/platform/iks.html|2 +- camel-k/next/installation/platform/k3s.html|2 +- camel-k/next/installation/platform/kind.html |2 +- camel-k/next/installation/platform/minikube.html |2 +- camel-k/next/installation/platform/openshift.html |2 +- .../next/installation/registry/digitalocean.html |2 +- camel
[camel-quarkus] branch dependabot/maven/org.seleniumhq.selenium-htmlunit-driver-4.13.0 deleted (was af44324331)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch dependabot/maven/org.seleniumhq.selenium-htmlunit-driver-4.13.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was af44324331 Bump org.seleniumhq.selenium:htmlunit-driver from 4.12.0 to 4.13.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-quarkus] branch main updated (db6181ef15 -> 8fc798e76b)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from db6181ef15 Remove Google Cloud native build limitation for RunReachabilityHandlersConcurrently option add 8fc798e76b Bump org.seleniumhq.selenium:htmlunit-driver from 4.12.0 to 4.13.0 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] Bump org.seleniumhq.selenium:htmlunit-driver from 4.12.0 to 4.13.0 [camel-quarkus]
jamesnetherton merged PR #5406: URL: https://github.com/apache/camel-quarkus/pull/5406 -- 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
Re: [PR] Camel-k-runtime tests is failing in Quarkus platform #5319 [camel-quarkus]
spatnity commented on code in PR #5404:
URL: https://github.com/apache/camel-quarkus/pull/5404#discussion_r1348264052
##
integration-tests/camel-k-runtime/src/test/java/org/apache/camel/quarkus/k/it/RuntimeTest.java:
##
@@ -48,6 +61,51 @@ public void inspect() {
.isEqualTo(Application.NoRoutesCollector.class.getName());
}
+public static class Resources implements
QuarkusTestResourceLifecycleManager {
+private static final Path TEMP_DIR =
Paths.get("target/test-classes/camel-k-runtime"); // Specify your temporary
directory here
+
+@Override
+public Map start() {
+Path confd = TEMP_DIR.resolve("conf.d");
+
+for (int i = 1; i <= 3; i++) {
+String path = String.format("00%d", i);
+Path confdSubDir = confd.resolve(path);
+confdSubDir.toFile().mkdirs();
+
+String file = i < 3 ? "conf.properties" : "flat-property";
+copyResourceToTemp("conf.d/" + path + "/" + file,
confdSubDir.resolve(file).toAbsolutePath());
+}
+
+Path confProperties = TEMP_DIR.resolve("conf.properties");
+copyResourceToTemp("conf.properties",
confProperties.toAbsolutePath());
+
+return Map.of(
+"CAMEL_K_CONF", confProperties.toAbsolutePath().toString(),
+"CAMEL_K_CONF_D", confd.toAbsolutePath().toString());
+}
+
+private void copyResourceToTemp(String resourceName, Path destination)
{
+try (InputStream stream =
getClass().getClassLoader().getResourceAsStream(resourceName)) {
+Files.copy(stream, destination,
StandardCopyOption.REPLACE_EXISTING);
+} catch (Exception e) {
+throw new RuntimeException("Failed to copy resource " +
resourceName + " to temporary directory", e);
+}
+}
+
+@Override
+public void stop() {
+try {
+Files.walk(TEMP_DIR)
Review Comment:
Oh okay, noted. Thankyou @aldettinger
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
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 main updated: Move XSD in correct folder
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-website.git
The following commit(s) were added to refs/heads/main by this push:
new 34908741 Move XSD in correct folder
34908741 is described below
commit 34908741c55796c201edd6c8a49b0dddb4d99313
Author: Claus Ibsen
AuthorDate: Fri Oct 6 07:37:16 2023 +0200
Move XSD in correct folder
---
.../camel-spring-xml-3.20.7.xsd => spring/camel-spring-3.20.7.xsd}| 0
.../spring/{camel-spring-xml-3.21.1.xsd => camel-spring-3.21.1.xsd} | 0
.../schema/spring/{camel-spring-xml-4.0.1.xsd => camel-spring-4.0.1.xsd} | 0
3 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/static/schema/spring-xml/camel-spring-xml-3.20.7.xsd
b/static/schema/spring/camel-spring-3.20.7.xsd
similarity index 100%
rename from static/schema/spring-xml/camel-spring-xml-3.20.7.xsd
rename to static/schema/spring/camel-spring-3.20.7.xsd
diff --git a/static/schema/spring/camel-spring-xml-3.21.1.xsd
b/static/schema/spring/camel-spring-3.21.1.xsd
similarity index 100%
rename from static/schema/spring/camel-spring-xml-3.21.1.xsd
rename to static/schema/spring/camel-spring-3.21.1.xsd
diff --git a/static/schema/spring/camel-spring-xml-4.0.1.xsd
b/static/schema/spring/camel-spring-4.0.1.xsd
similarity index 100%
rename from static/schema/spring/camel-spring-xml-4.0.1.xsd
rename to static/schema/spring/camel-spring-4.0.1.xsd
[camel] branch regen_bot updated (2f0e8903e90 -> e52791c5a74)
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 2f0e8903e90 CAMEL-19960: camel-jbang - Add camel get startup-recorder add e52791c5a74 camel-grape - Deprecate No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/components/grape.json | 2 +- components/camel-grape/pom.xml | 2 +- .../META-INF/services/org/apache/camel/component.properties | 2 +- .../generated/resources/org/apache/camel/component/grape/grape.json | 2 +- components/camel-grape/src/main/docs/grape-component.adoc| 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-)
Re: [I] Add ActiveMQ 5.x to dev services [camel-karavan]
davsclaus commented on issue #909: URL: https://github.com/apache/camel-karavan/issues/909#issuecomment-1750005169 https://hub.docker.com/r/apache/activemq-classic/tags -- 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-spring-boot] branch main updated: camel-grape - Deprecate
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-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 489b85e9f99 camel-grape - Deprecate 489b85e9f99 is described below commit 489b85e9f9952bfbae234b3e344e9a4d5956a1ab Author: Claus Ibsen AuthorDate: Fri Oct 6 07:20:50 2023 +0200 camel-grape - Deprecate --- .../resources/org/apache/camel/springboot/catalog/components/grape.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/grape.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/grape.json index 1e81d187502..8c1fc525381 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/grape.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/grape.json @@ -4,7 +4,7 @@ "name": "grape", "title": "Grape", "description": "Fetch, load and manage additional jars dynamically after Camel Context was started.", -"deprecated": false, +"deprecated": true, "firstVersion": "2.16.0", "label": "management", "javaType": "org.apache.camel.component.grape.GrapeComponent",
[camel] branch main updated: camel-grape - Deprecate
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 e52791c5a74 camel-grape - Deprecate e52791c5a74 is described below commit e52791c5a74e9a902f35693f256ba00bd681c999 Author: Claus Ibsen AuthorDate: Fri Oct 6 07:17:40 2023 +0200 camel-grape - Deprecate --- .../resources/org/apache/camel/catalog/components/grape.json | 2 +- components/camel-grape/pom.xml | 2 +- .../META-INF/services/org/apache/camel/component.properties | 2 +- .../generated/resources/org/apache/camel/component/grape/grape.json | 2 +- components/camel-grape/src/main/docs/grape-component.adoc| 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json index b5370679521..4235fde891b 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/grape.json @@ -4,7 +4,7 @@ "name": "grape", "title": "Grape", "description": "Fetch, load and manage additional jars dynamically after Camel Context was started.", -"deprecated": false, +"deprecated": true, "firstVersion": "2.16.0", "label": "management", "javaType": "org.apache.camel.component.grape.GrapeComponent", diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml index 95369c41d9d..172965acdc2 100644 --- a/components/camel-grape/pom.xml +++ b/components/camel-grape/pom.xml @@ -28,7 +28,7 @@ camel-grape -Camel :: Grape +Camel :: Grape (deprecated) The grape component allows you to fetch, load and manage additional jars when CamelContext is running diff --git a/components/camel-grape/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-grape/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 521f9d593a6..5abe532275c 100644 --- a/components/camel-grape/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-grape/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -3,5 +3,5 @@ components=grape groupId=org.apache.camel artifactId=camel-grape version=4.1.0-SNAPSHOT -projectName=Camel :: Grape +projectName=Camel :: Grape (deprecated) projectDescription=The grape component allows you to fetch, load and manage additional jars when CamelContext is running diff --git a/components/camel-grape/src/generated/resources/org/apache/camel/component/grape/grape.json b/components/camel-grape/src/generated/resources/org/apache/camel/component/grape/grape.json index b5370679521..4235fde891b 100644 --- a/components/camel-grape/src/generated/resources/org/apache/camel/component/grape/grape.json +++ b/components/camel-grape/src/generated/resources/org/apache/camel/component/grape/grape.json @@ -4,7 +4,7 @@ "name": "grape", "title": "Grape", "description": "Fetch, load and manage additional jars dynamically after Camel Context was started.", -"deprecated": false, +"deprecated": true, "firstVersion": "2.16.0", "label": "management", "javaType": "org.apache.camel.component.grape.GrapeComponent", diff --git a/components/camel-grape/src/main/docs/grape-component.adoc b/components/camel-grape/src/main/docs/grape-component.adoc index 9a8ee193a67..f93b4a77e21 100644 --- a/components/camel-grape/src/main/docs/grape-component.adoc +++ b/components/camel-grape/src/main/docs/grape-component.adoc @@ -1,10 +1,11 @@ -= Grape Component += Grape Component (deprecated) :doctitle: Grape :shortname: grape :artifactid: camel-grape :description: Fetch, load and manage additional jars dynamically after Camel Context was started. :since: 2.16 -:supportlevel: Stable +:supportlevel: Stable-deprecated +:deprecated: *deprecated* :tabs-sync-option: :component-header: Only producer is supported //Manually maintained attributes
[camel-k] branch main updated: fix(api): deprecate .spec.integration Pipe
This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 ea9fb039e fix(api): deprecate .spec.integration Pipe
ea9fb039e is described below
commit ea9fb039e862775669afd74368fe09cd844d0e8d
Author: Pasquale Congiusti
AuthorDate: Thu Oct 5 15:56:59 2023 +0200
fix(api): deprecate .spec.integration Pipe
Closes #4780
---
config/crd/bases/camel.apache.org_pipes.yaml | 3 ++-
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 1 +
helm/camel-k/crds/crd-pipe.yaml | 3 ++-
pkg/apis/camel/v1/pipe_types.go | 3 +++
pkg/controller/pipe/initialize.go | 11 ++-
pkg/controller/pipe/integration.go| 1 +
pkg/controller/pipe/monitor.go| 9 +
7 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_pipes.yaml
b/config/crd/bases/camel.apache.org_pipes.yaml
index 5bf2d8ff0..c8c5b8ea8 100644
--- a/config/crd/bases/camel.apache.org_pipes.yaml
+++ b/config/crd/bases/camel.apache.org_pipes.yaml
@@ -74,7 +74,8 @@ spec:
x-kubernetes-preserve-unknown-fields: true
integration:
description: Integration is an optional integration used to
specify
- custom parameters
+ custom parameters Deprecated don't use this. Use trait
annotations
+ if you need to change any cluster configuration.
properties:
configuration:
description: 'Deprecated: Use camel trait
(camel.properties) to
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index 39fe3ed4c..a9070f7c7 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -4218,6 +4218,7 @@ PipeSpec defines the binding between a source and a sink.
It can include custom
Integration is an optional integration used to specify custom parameters
+Deprecated don't use this. Use trait annotations if you need to change any
cluster configuration.
|`source` +
*xref:#_camel_apache_org_v1_Endpoint[Endpoint]*
diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml
index 5bf2d8ff0..c8c5b8ea8 100644
--- a/helm/camel-k/crds/crd-pipe.yaml
+++ b/helm/camel-k/crds/crd-pipe.yaml
@@ -74,7 +74,8 @@ spec:
x-kubernetes-preserve-unknown-fields: true
integration:
description: Integration is an optional integration used to
specify
- custom parameters
+ custom parameters Deprecated don't use this. Use trait
annotations
+ if you need to change any cluster configuration.
properties:
configuration:
description: 'Deprecated: Use camel trait
(camel.properties) to
diff --git a/pkg/apis/camel/v1/pipe_types.go b/pkg/apis/camel/v1/pipe_types.go
index 369e8626f..74bf55626 100644
--- a/pkg/apis/camel/v1/pipe_types.go
+++ b/pkg/apis/camel/v1/pipe_types.go
@@ -46,6 +46,7 @@ type Pipe struct {
// PipeSpec defines the binding between a source and a sink. It can include
custom parameters and additional intermediate steps and error handling.
type PipeSpec struct {
// Integration is an optional integration used to specify custom
parameters
+ // Deprecated don't use this. Use trait annotations if you need to
change any cluster configuration.
Integration *IntegrationSpec `json:"integration,omitempty"`
// Source is the starting point of the integration defined by this Pipe
Source Endpoint `json:"source,omitempty"`
@@ -132,6 +133,8 @@ const (
PipeConditionReady PipeConditionType = "Ready"
// PipeIntegrationConditionError is used to report the error on the
generated Integration.
PipeIntegrationConditionError PipeConditionType = "IntegrationError"
+ // PipeIntegrationDeprecationNotice is used to report the usage of a
deprecated resource.
+ PipeIntegrationDeprecationNotice PipeConditionType = "DeprecationNotice"
)
// PipePhase --.
diff --git a/pkg/controller/pipe/initialize.go
b/pkg/controller/pipe/initialize.go
index 35b5c56f0..4cec1faf4 100644
--- a/pkg/controller/pipe/initialize.go
+++ b/pkg/controller/pipe/initialize.go
@@ -54,6 +54,15 @@ func (action *initializeAction) CanHandle(binding *v1.Pipe)
bool {
func (action *initializeAction) Handle(ctx context.Context, binding *v1.Pipe)
(*v1.Pipe, error) {
action.L.Info("Initializing Pipe")
+ if binding.Spec.Integration != nil {
+ action.L.Infof("Pipe %s is using deprecated .spec.integration
parameter. Please, update and use annotation traits instead", bi
Re: [PR] fix(api): deprecate .spec.integration Pipe [camel-k]
squakez merged PR #4800: URL: https://github.com/apache/camel-k/pull/4800 -- 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
Re: [I] Consider adding `/PipeSpec/traits` [camel-k]
squakez closed issue #4780: Consider adding `/PipeSpec/traits` URL: https://github.com/apache/camel-k/issues/4780 -- 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(doc): bring back support for local operator execution
This is an automated email from the ASF dual-hosted git repository. pcongiusti 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 8db5e0035 chore(doc): bring back support for local operator execution 8db5e0035 is described below commit 8db5e00356a31eed81f316bf4c045e5e5490990d Author: Pasquale Congiusti AuthorDate: Thu Oct 5 17:53:24 2023 +0200 chore(doc): bring back support for local operator execution This was removed as we temporary introduced the dynamic builder. Now that is gone, the local execution can be still a way to debug the operator. Ref #4513 --- docs/modules/ROOT/nav-end.adoc | 3 +- .../ROOT/pages/contributing/local-development.adoc | 4 +- .../ROOT/pages/contributing/local-execution.adoc | 85 ++ 3 files changed, 90 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/nav-end.adoc b/docs/modules/ROOT/nav-end.adoc index 2df74b5cb..69cf0c052 100644 --- a/docs/modules/ROOT/nav-end.adoc +++ b/docs/modules/ROOT/nav-end.adoc @@ -90,6 +90,7 @@ ** xref:apis/java.adoc[Java API] * xref:contributing/developers.adoc[Contributing] ** xref:contributing/local-development.adoc[Local development] -*** xref:contributing/remote-debugging.adoc[Operator Remote Debug] +*** xref:contributing/local-execution.adoc[Operator - local execution] +*** xref:contributing/remote-debugging.adoc[Operator - remote debug] ** xref:contributing/local-deployment-olm.adoc[Local OLM deployment] ** xref:contributing/e2e.adoc[Local E2E testing] diff --git a/docs/modules/ROOT/pages/contributing/local-development.adoc b/docs/modules/ROOT/pages/contributing/local-development.adoc index a5729205b..0ccece2b7 100644 --- a/docs/modules/ROOT/pages/contributing/local-development.adoc +++ b/docs/modules/ROOT/pages/contributing/local-development.adoc @@ -3,10 +3,12 @@ If you plan on contributing to Camel K, you will end up needing to run and troubleshoot your operator code locally. Here is a guideline that will help you configure your local operator running. +NOTE: you can also run and debug the operator as a local process: see xref:contributing/local-execution.adoc[Operator - local execution] + [[local-operator]] == Running a development operator -As soon as you build your operator locally you will ask yourself how to test it. In the past, we used to have the possibility to run the operator on the same development machine and connect to Kubernetes cluster. However, that approach was quite cumbersome, so now we propose a way to locally install and run your development Camel K operator as it was a "normal" installation. +As soon as you build your operator locally you will ask yourself how to test it. In this space we propose a way to locally install and run your development Camel K operator as it was a "normal" installation. Once you have done your development, you will need to build and push Camel K Operator container image to the container registry your Kubernetes is later going to use. If you're on a local machine, you are probably using Minikube or Kind. In such case you can make your Docker daemon to use the cluster container registry. In Minikube it would be like the following: diff --git a/docs/modules/ROOT/pages/contributing/local-execution.adoc b/docs/modules/ROOT/pages/contributing/local-execution.adoc new file mode 100644 index 0..8e478f023 --- /dev/null +++ b/docs/modules/ROOT/pages/contributing/local-execution.adoc @@ -0,0 +1,85 @@ += Running operator as a local process + +If you need a finer control on the operator process (ie, attaching a debugger or quickly building and running the operator locally), then you can run and debug the operator binary locally. The idea is that you execute it on your machine and instruct the local process to **watch** a namespace on a Kubernetes cluster (it may be remote or any local environment). + +NOTE: if you need a simpler approach you can build and run the operator on a connected cluster (local or remote): see xref:contributing/local-development.adoc[Local development] + +Let's use a namespace called `operator-test. + +You can start with setting the environment variable `WATCH_NAMESPACE` with the namespace you'd like your operator to watch. You also need to specify the name of the operator, as you may have different operators running on the cluster. + +export WATCH_NAMESPACE=operator-test +export OPERATOR_ID="camel-k-dev" + + +The next step is to install an `IntegrationPlatform` on the cluster namespace. You probably need to tweak the registry parameters in order to be able to authenticate against an image repository (see below paragraph for local repository instructions). It's important to specify the target operator that will take care of this IntegrationPlatform (`-x` or `--operator-id` option). + +./kamel install --skip-operator-s
Re: [PR] chore(doc): bring back support for local operator execution [camel-k]
squakez merged PR #4802: URL: https://github.com/apache/camel-k/pull/4802 -- 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 dependabot/go_modules/golang.org/x/term-0.13.0 updated (1c7bc59f3 -> b5940d05e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/golang.org/x/term-0.13.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git discard 1c7bc59f3 chore(deps): bump golang.org/x/term from 0.12.0 to 0.13.0 add af7604e47 chore(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0 add b5940d05e chore(deps): bump golang.org/x/term from 0.12.0 to 0.13.0 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 (1c7bc59f3) \ N -- N -- N refs/heads/dependabot/go_modules/golang.org/x/term-0.13.0 (b5940d05e) 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: go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
[camel-k] branch main updated: chore(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0
This is an automated email from the ASF dual-hosted git repository. pcongiusti 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 af7604e47 chore(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0 af7604e47 is described below commit af7604e470797c1210e36fdff709bcb99de12c80 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Oct 6 00:07:25 2023 + chore(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.3.0 to 0.4.0. - [Commits](https://github.com/golang/sync/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 65e1b153b..673c19592 100644 --- a/go.mod +++ b/go.mod @@ -38,7 +38,7 @@ require ( go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 golang.org/x/oauth2 v0.12.0 - golang.org/x/sync v0.3.0 + golang.org/x/sync v0.4.0 golang.org/x/term v0.12.0 golang.org/x/text v0.13.0 golang.org/x/time v0.3.0 diff --git a/go.sum b/go.sum index 72ff08f0a..37ad1d34e 100644 --- a/go.sum +++ b/go.sum @@ -585,8 +585,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= -golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
[camel-k] branch dependabot/go_modules/golang.org/x/sync-0.4.0 deleted (was 394e26470)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/golang.org/x/sync-0.4.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 394e26470 chore(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] chore(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0 [camel-k]
squakez merged PR #4803: URL: https://github.com/apache/camel-k/pull/4803 -- 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
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1749986103 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 6426668674-1261-2cf37671-2153-43dc-9867-79aa6b7eff75 * Camel Quarkus Commit: eee4f1399dd4881328335bba0b4cbe8a825c28b2 * Quarkus Main Commit: db6181ef15bac6786779f008a78a948a34f1f6d1 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6426668674 -- 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-kamelets] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 75c35631 Updated CHANGELOG.md 75c35631 is described below commit 75c356311671b3b716c332b060597b2c6ffe16f1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Oct 6 03:09:35 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf756509..9fe4b694 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,11 @@ - Splunk-source kamelet - initEarliestTime is required parameter [\#1663](https://github.com/apache/camel-kamelets/issues/1663) - Release Camel-Kamelets 4.0.1 [\#1659](https://github.com/apache/camel-kamelets/issues/1659) +- Create a Salesforce Upsert Sink Kamelet [\#1527](https://github.com/apache/camel-kamelets/issues/1527) **Merged pull requests:** +- Kamelet Prefix Enum: Added missing entries [\#1673](https://github.com/apache/camel-kamelets/pull/1673) ([oscerd](https://github.com/oscerd)) - chore: Fix JitPack build for main branch [\#1669](https://github.com/apache/camel-kamelets/pull/1669) ([christophd](https://github.com/christophd)) - Splunk-source kamelet - initEarliestTime is required parameter [\#1664](https://github.com/apache/camel-kamelets/pull/1664) ([oscerd](https://github.com/oscerd)) - Upgrade Artemis to version 2.31.0 [\#1662](https://github.com/apache/camel-kamelets/pull/1662) ([oscerd](https://github.com/oscerd))
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1749881612 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 6425812716-1157-a6a7af31-7f05-4a2f-8e9b-53d8c75fb617 * Camel Quarkus Commit: 30b91b9c7fdcf5341766d32965d9a9b9f2869364 * Camel Main Commit: db6181ef15bac6786779f008a78a948a34f1f6d1 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6425812716 -- 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] 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 92882b2f4c8f9d316a1e2c85d07e2c2160275536
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Oct 6 00:53:13 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 6e69914f3..d4abcb8db 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:65cf06b6-5105-4d42-96a6-7c5ab7b92869",
+ "serialNumber": "urn:uuid:c591-1bbb-4924-b001-eeba381e954a",
"version": 1,
"metadata": {
-"timestamp": "2023-10-05T00:57:03Z",
+"timestamp": "2023-10-06T00:53:13Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005005128-c1a602855a06?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231006005044-87646c6ce83e?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231005005128-c1a602855a06",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005005128-c1a602855a06?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231006005044-87646c6ce83e",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231006005044-87646c6ce83e?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -4021,7 +4021,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005005128-c1a602855a06?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231006005044-87646c6ce83e?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.29?type=module",
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 87646c6ce83e4698f0a8cf93ca63db200a456cb3 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Oct 6 00:50:44 2023 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e7cb0a7f..089b2124c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - E2E - Recurrent golang stacktrace logs [\#4754](https://github.com/apache/camel-k/issues/4754) - E2E kamelets.camel.apache.org "my-own-timer-source" already exists failure [\#4750](https://github.com/apache/camel-k/issues/4750) - Buildah check regression [\#4744](https://github.com/apache/camel-k/issues/4744) +- Kamelet - Inject secret in Azure KeyVault Trait [\#4743](https://github.com/apache/camel-k/issues/4743) - Regression: upgrade check failing after 2.0.1 [\#4721](https://github.com/apache/camel-k/issues/4721) - Insecure internal registry fails while pulling the kit [\#4720](https://github.com/apache/camel-k/issues/4720) - kamel reports error when trying to use a camel-k-runtime version not following the sematic version [\#4715](https://github.com/apache/camel-k/issues/4715) @@ -32,6 +33,7 @@ - Language page for documentation of camel-k 1.12.x missing [\#4176](https://github.com/apache/camel-k/issues/4176) - Redesign traits that have runtime dependencies [\#4166](https://github.com/apache/camel-k/issues/4166) - Error creating Integration with Kaniko build strategy and Docker Desktop [\#4158](https://github.com/apache/camel-k/issues/4158) +- camel-k 1.6.1 camel-xmljson dependency is failed to download [\#3971](https://github.com/apache/camel-k/issues/3971) - provide link to resume strategy documentation from resume trait documentation [\#3643](https://github.com/apache/camel-k/issues/3643) - Buildah pods will wait for Istio container to finish then timeout [\#3408](https://github.com/apache/camel-k/issues/3408) - How Camel K build container images [\#3336](https://github.com/apache/camel-k/issues/3336)
[camel-k] branch release-2.0.x updated (9b52b8150 -> 92882b2f4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 9b52b8150 chore: nightly SBOM update new 87646c6ce chore: changelog automatic update new 92882b2f4 chore: nightly SBOM update 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: CHANGELOG.md | 2 ++ camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 8 insertions(+), 6 deletions(-)
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 27eb994e1dbb0966b1e2a2b572bb58f0568d8fd4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Oct 6 00:33:30 2023 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e7cb0a7f..089b2124c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - E2E - Recurrent golang stacktrace logs [\#4754](https://github.com/apache/camel-k/issues/4754) - E2E kamelets.camel.apache.org "my-own-timer-source" already exists failure [\#4750](https://github.com/apache/camel-k/issues/4750) - Buildah check regression [\#4744](https://github.com/apache/camel-k/issues/4744) +- Kamelet - Inject secret in Azure KeyVault Trait [\#4743](https://github.com/apache/camel-k/issues/4743) - Regression: upgrade check failing after 2.0.1 [\#4721](https://github.com/apache/camel-k/issues/4721) - Insecure internal registry fails while pulling the kit [\#4720](https://github.com/apache/camel-k/issues/4720) - kamel reports error when trying to use a camel-k-runtime version not following the sematic version [\#4715](https://github.com/apache/camel-k/issues/4715) @@ -32,6 +33,7 @@ - Language page for documentation of camel-k 1.12.x missing [\#4176](https://github.com/apache/camel-k/issues/4176) - Redesign traits that have runtime dependencies [\#4166](https://github.com/apache/camel-k/issues/4166) - Error creating Integration with Kaniko build strategy and Docker Desktop [\#4158](https://github.com/apache/camel-k/issues/4158) +- camel-k 1.6.1 camel-xmljson dependency is failed to download [\#3971](https://github.com/apache/camel-k/issues/3971) - provide link to resume strategy documentation from resume trait documentation [\#3643](https://github.com/apache/camel-k/issues/3643) - Buildah pods will wait for Istio container to finish then timeout [\#3408](https://github.com/apache/camel-k/issues/3408) - How Camel K build container images [\#3336](https://github.com/apache/camel-k/issues/3336)
[camel-k] branch release-1.12.x updated (a85140677 -> b138be78f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from a85140677 Periodic Sync of Camel K Main Branch for SBOM Generation new 27eb994e1 chore: changelog automatic update new b138be78f Periodic Sync of Camel K Main Branch for SBOM Generation 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: CHANGELOG.md | 2 ++ camel-k-sbom/camel-k-sbom.json | 54 +- 2 files changed, 29 insertions(+), 27 deletions(-)
[camel-k] 02/02: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b138be78f2e860d44daf55ceeefca44d727d5c70
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Oct 6 00:38:24 2023 +
Periodic Sync of Camel K Main Branch for SBOM Generation
---
camel-k-sbom/camel-k-sbom.json | 54 +-
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index d9468104a..55efcbfc1 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:fd171691-989c-4805-932b-b872fe16c3c9",
+ "serialNumber": "urn:uuid:085f72ba-9b4a-40a5-b849-ad02594b4a68",
"version": 1,
"metadata": {
-"timestamp": "2023-10-05T00:39:40Z",
+"timestamp": "2023-10-06T00:38:24Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20231005003446-0e72465ec9fe?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20231006003330-27eb994e1dbb?type=module",
"type": "application",
"name": "github.com/apache/camel-k",
- "version": "v0.0.0-20231005003446-0e72465ec9fe",
- "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20231005003446-0e72465ec9fe?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231006003330-27eb994e1dbb",
+ "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20231006003330-27eb994e1dbb?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -510,18 +510,18 @@
}
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231005003446-0e72465ec9fe?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231006003330-27eb994e1dbb?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/apis/camel",
- "version": "v0.0.0-20231005003446-0e72465ec9fe",
+ "version": "v0.0.0-20231006003330-27eb994e1dbb",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"9a2884a4b8dea4021ffa24bd0f961c0589131a44db421fe666452ca36ab16a2b"
+ "content":
"50beb69a380dcb132bbdb438f5ec3fdff23305a3a054c3b84c0d9456715ed510"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231005003446-0e72465ec9fe?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231006003330-27eb994e1dbb?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/apis/camel";,
@@ -530,18 +530,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231005003446-0e72465ec9fe?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231006003330-27eb994e1dbb?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/client/camel",
- "version": "v0.0.0-20231005003446-0e72465ec9fe",
+ "version": "v0.0.0-20231006003330-27eb994e1dbb",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"04a095c5b9bc3c66d837cdd415ee85fc083963ea6aa20bac62341dd618372124"
+ "content":
"2771ffab389ec082789a6cd231652ab0920252037167d1e9b74aeccdf6c44f58"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231005003446-0e72465ec9fe?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231006003330-27eb994e1dbb?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/client/camel";,
@@ -550,18 +550,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20231005003446-0e72465ec9fe?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20231006003330-27eb994e1dbb?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/kamelet/repository",
- "version": "v0.0.0-20231005003446-0e72465ec9fe",
+ "version": "v0.0.0-20231006003330-27eb994e1dbb",
"scope": "required",
"hashes": [
{
"alg": "SHA
Re: [I] camel-k 1.6.1 camel-xmljson dependency is failed to download [camel-k]
github-actions[bot] closed issue #3971: camel-k 1.6.1 camel-xmljson dependency is failed to download URL: https://github.com/apache/camel-k/issues/3971 -- 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
Re: [I] Build waiting condition [camel-k]
github-actions[bot] commented on issue #4542: URL: https://github.com/apache/camel-k/issues/4542#issuecomment-1749821851 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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
Re: [I] Using an XSLT as a local dependency results in "unknown dependency error" [camel-k]
github-actions[bot] commented on issue #4426: URL: https://github.com/apache/camel-k/issues/4426#issuecomment-1749821881 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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
[PR] chore(deps): bump golang.org/x/term from 0.12.0 to 0.13.0 [camel-k]
dependabot[bot] opened a new pull request, #4804: URL: https://github.com/apache/camel-k/pull/4804 Bumps [golang.org/x/term](https://github.com/golang/term) from 0.12.0 to 0.13.0. Commits https://github.com/golang/term/commit/ea6303ae752eaacd897fec4b7534b74c56e1d787";>ea6303a go.mod: update golang.org/x dependencies See full diff in https://github.com/golang/term/compare/v0.12.0...v0.13.0";>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- 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 dependabot/go_modules/golang.org/x/term-0.13.0 created (now 1c7bc59f3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/golang.org/x/term-0.13.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 1c7bc59f3 chore(deps): bump golang.org/x/term from 0.12.0 to 0.13.0 No new revisions were added by this update.
[camel-k] branch dependabot/go_modules/golang.org/x/sync-0.4.0 created (now 394e26470)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/golang.org/x/sync-0.4.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 394e26470 chore(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0 No new revisions were added by this update.
[PR] chore(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0 [camel-k]
dependabot[bot] opened a new pull request, #4803: URL: https://github.com/apache/camel-k/pull/4803 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.3.0 to 0.4.0. Commits https://github.com/golang/sync/commit/22ba2078e183beec12908ea94f1d899c53dbf02c";>22ba207 singleflight: add panicError.Unwrap method See full diff in https://github.com/golang/sync/compare/v0.3.0...v0.4.0";>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- 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 (ed36d886f -> 1b2f06e3f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from ed36d886f fix(doc): image location new 2eec5b9f1 chore: changelog automatic update new 03cb1935e chore: autogenerated project resource update new 277f8159b chore: nightly SBOM update new 1b2f06e3f chore: nightly coverage badge update The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 5 + README.adoc| 2 +- camel-k-sbom/camel-k-sbom.json | 12 ++-- pkg/resources/resources.go | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-)
[camel-k] 04/04: chore: nightly coverage badge update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 1b2f06e3ffe5e8f1cd3a293876244323d37e7948 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 5 23:48:28 2023 + chore: nightly coverage badge update --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 9c34c8475..653400653 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernet image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative";, link="https://github.com/apache/camel-k/actions/workflows/knative.yml";] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml";] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml";] -image:https://img.shields.io/badge/Coverage-33.4%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml";] +image:https://img.shields.io/badge/Coverage-33.5%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml";] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com";] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider.
[camel-k] 01/04: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 2eec5b9f10f0ee3107eec8da32b9581f6ad8cc7e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 5 23:40:46 2023 + chore: changelog automatic update --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1a796b22..2e11331ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - E2E - Recurrent golang stacktrace logs [\#4754](https://github.com/apache/camel-k/issues/4754) - E2E kamelets.camel.apache.org "my-own-timer-source" already exists failure [\#4750](https://github.com/apache/camel-k/issues/4750) - Buildah check regression [\#4744](https://github.com/apache/camel-k/issues/4744) +- Kamelet - Inject secret in Azure KeyVault Trait [\#4743](https://github.com/apache/camel-k/issues/4743) - Regression: upgrade check failing after 2.0.1 [\#4721](https://github.com/apache/camel-k/issues/4721) - Insecure internal registry fails while pulling the kit [\#4720](https://github.com/apache/camel-k/issues/4720) - kamel reports error when trying to use a camel-k-runtime version not following the sematic version [\#4715](https://github.com/apache/camel-k/issues/4715) @@ -45,6 +46,10 @@ **Merged pull requests:** +- fix\(doc\): image location [\#4801](https://github.com/apache/camel-k/pull/4801) ([squakez](https://github.com/squakez)) +- Kamelet - Inject secret in Vaults - Hashicorp Vault [\#4799](https://github.com/apache/camel-k/pull/4799) ([oscerd](https://github.com/oscerd)) +- Kamelet - Inject secret in Vaults - Azure Key Vault [\#4798](https://github.com/apache/camel-k/pull/4798) ([oscerd](https://github.com/oscerd)) +- Kamelet - Inject secret in Vaults - AWS Secret Manager [\#4794](https://github.com/apache/camel-k/pull/4794) ([oscerd](https://github.com/oscerd)) - Added License headers to generated traits.yaml [\#4792](https://github.com/apache/camel-k/pull/4792) ([oscerd](https://github.com/oscerd)) - Remove deprecated linters [\#4791](https://github.com/apache/camel-k/pull/4791) ([oscerd](https://github.com/oscerd)) - Added Missing license headers and license headers to generation of tr… [\#4790](https://github.com/apache/camel-k/pull/4790) ([oscerd](https://github.com/oscerd))
[camel-k] 03/04: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 277f8159bc9e7d0ae5977d20f5ff19e1fd220a7a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Oct 5 23:45:32 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 2324eba47..12ddb8ef6 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:f10754ed-8a2a-4ac7-8943-b7a59ae66ae2",
+ "serialNumber": "urn:uuid:4d627813-e9ff-409a-bdf4-92d916d24c9f",
"version": 1,
"metadata": {
-"timestamp": "2023-10-04T23:49:06Z",
+"timestamp": "2023-10-05T23:45:32Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231004234827-7649d299989d?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005234459-03cb1935ecf6?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231004234827-7649d299989d",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231004234827-7649d299989d?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231005234459-03cb1935ecf6",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005234459-03cb1935ecf6?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -3772,7 +3772,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231004234827-7649d299989d?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005234459-03cb1935ecf6?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.37?type=module",
[camel-k] 02/04: chore: autogenerated project resource update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 03cb1935ecf68b57433d3dc10bbdd67a511efcec
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Oct 5 23:44:59 2023 +
chore: autogenerated project resource update
---
pkg/resources/resources.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index ebf4104c9..2c7db0c6e 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -625,9 +625,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgenÛ°CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 71502,
+ uncompressedSize: 72639,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x77\x1b\xb9\x91\x38\xfa\xbf\x3f\x05\x0e\xe7\xee\x91\xe4\xcb\x87\x3c\xd9\x64\x67\xb5\x71\xf6\x6a\x6c\x4f\xa2\x8c\x1f\xba\x96\x66\xb2\x39\x5e\x9f\x10\xec\x06\x49\x8c\x9a\x40\x07\x40\x4b\xe6\xdc\xdc\xef\xfe\x3b\xa8\x2a\x3c\xba\xd9\x14\x29\x5b\x9a\x8d\x36\x99\x9c\x13\x8b\x64\x37\x50\x28\x14\x0a\xf5\xae\xaf\xd8\xe8\xfe\xfe\x7b\xf2\x15\x7b\x2d\x0b\xa1\xac\x28\x99\xd3\xcc\x2d\x05\x3b\xad\x79\xb1\x14\xec\x42\xcf\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\x1c\xb9\x91\x38\xf8\xbf\x3e\x05\xa2\xe7\x7e\x41\x52\xd7\x0f\x6a\xfc\xb3\x77\x96\x6b\x79\x8f\x23\x69\x6c\x7a\xf4\xe0\x89\x9c\xf1\x3a\x74\x0a\x37\xba\x0a\xdd\x0d\xb1\x1a\x28\x03\x28\x52\x3d\xb7\xf7\xdd\x2f\x90\x99\x78\x54\x75\x35\xbb\x29\x91\xb3\xe6\xae\xbd\x11\x3b\x22\x59\x48\x24\x12\x89\x44\x66\x22\x1f\xdf\xb0\xd1\xfd\xfd\xef\xc9\x37\xec\xb5\x2c\x84\xb2\xa2\x64\x4e\x33\xb7\x14\xec\xb4\xe6\xc5\x52\xb0\x
[...]
},
}
fs["/"].(*vfsgenÛ°DirInfo).entries = []os.FileInfo{
[PR] Bump org.seleniumhq.selenium:htmlunit-driver from 4.12.0 to 4.13.0 [camel-quarkus]
dependabot[bot] opened a new pull request, #5406: URL: https://github.com/apache/camel-quarkus/pull/5406 Bumps [org.seleniumhq.selenium:htmlunit-driver](https://github.com/SeleniumHQ/htmlunit-driver) from 4.12.0 to 4.13.0. Release notes Sourced from https://github.com/SeleniumHQ/htmlunit-driver/releases";>org.seleniumhq.selenium:htmlunit-driver's releases. HtmlUnit Driver 4.13.0 This driver is compatible with Selenium 4.13.0 and uses HtmlUnit 2.70.0. Therefore this version is only compatible with HtmlUnit drivers prior to 4.8.1. If you like to use the latest HtmlUnit version please use the HtmlUnit 3 Driver 4.13.0 (artifactId: htmlunit3-driver). If you still use Selenium 3 please download the HtmlUnit Driver 2.70.0 release.** Changes use Selenium 4.13.0 Commits https://github.com/SeleniumHQ/htmlunit-driver/commit/1ef543cf8e65cae0731787a37045b37a49f65552";>1ef543c release 4.13.0 https://github.com/SeleniumHQ/htmlunit-driver/commit/ace821f6f71f165b5b41a17ad82ee116598532aa";>ace821f release 4.12.0 https://github.com/SeleniumHQ/htmlunit-driver/commit/a41933b56b15b8c11a9fe7424ceeeb07c8c7aefe";>a41933b release 4.11.0 https://github.com/SeleniumHQ/htmlunit-driver/commit/7a49604788d582e6aad856b0975cba16ed8b129f";>7a49604 release 4.10.0 https://github.com/SeleniumHQ/htmlunit-driver/commit/adb0819ed1b9ebb25dfa87fb35cd20c8e2907dec";>adb0819 release 4.9.1 https://github.com/SeleniumHQ/htmlunit-driver/commit/982676f581dce26db8f2e3c14337cbb42e0abeb9";>982676f release 4.9.1 https://github.com/SeleniumHQ/htmlunit-driver/commit/61f087a497410e40ab48ac35163b3bd1acc7de29";>61f087a release 4.9.0 https://github.com/SeleniumHQ/htmlunit-driver/commit/86187237983378a033c7814eeb50994fb986e4b7";>8618723 supressions https://github.com/SeleniumHQ/htmlunit-driver/commit/89e35796f150819db159d6ab3afae053832327af";>89e3579 release 4.8.3 https://github.com/SeleniumHQ/htmlunit-driver/commit/70d91707d15cfe46e6e08855232c28f529260abc";>70d9170 release 4.8.1.1 Additional commits viewable in https://github.com/SeleniumHQ/htmlunit-driver/compare/htmlunit-driver-4.12.0...htmlunit-driver-4.13.0";>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- 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-quarkus] branch dependabot/maven/org.seleniumhq.selenium-htmlunit-driver-4.13.0 created (now af44324331)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.seleniumhq.selenium-htmlunit-driver-4.13.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at af44324331 Bump org.seleniumhq.selenium:htmlunit-driver from 4.12.0 to 4.13.0 No new revisions were added by this update.
[camel-karavan] branch main updated: Fix issues
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 03ac3bf8 Fix issues
03ac3bf8 is described below
commit 03ac3bf818955c3e823c014c319c3e0afdc8c6ad
Author: Marat Gubaidullin
AuthorDate: Thu Oct 5 17:09:47 2023 -0400
Fix issues
---
.../main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
index 597fb142..14a6d6a0 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
@@ -453,6 +453,7 @@ public class KubernetesService implements HealthCheck {
private void createPVC(String podName, Map labels) {
try (KubernetesClient client = kubernetesClient()) {
+PersistentVolumeClaim old =
client.persistentVolumeClaims().inNamespace(getNamespace()).withName(podName).get();
if (old == null) {
PersistentVolumeClaim pvc = new PersistentVolumeClaimBuilder()
.withNewMetadata()
[camel-karavan] branch main updated: Fix ui issues
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 714e07c8 Fix ui issues
714e07c8 is described below
commit 714e07c845bc90976888f9d0a2507fdd232a6c9f
Author: Marat Gubaidullin
AuthorDate: Thu Oct 5 16:18:58 2023 -0400
Fix ui issues
---
karavan-designer/src/designer/route/DslProperties.tsx | 3 +--
karavan-vscode/webview/index.css | 2 +-
.../java/org/apache/camel/karavan/kubernetes/KubernetesService.java| 1 -
.../karavan-app/src/main/webui/src/designer/route/DslProperties.tsx| 1 -
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/karavan-designer/src/designer/route/DslProperties.tsx
b/karavan-designer/src/designer/route/DslProperties.tsx
index 82fd3dd9..8231759c 100644
--- a/karavan-designer/src/designer/route/DslProperties.tsx
+++ b/karavan-designer/src/designer/route/DslProperties.tsx
@@ -41,8 +41,7 @@ interface Props {
export function DslProperties(props: Props) {
-const [integration, setIntegration] = useIntegrationStore((state) =>
-[state.integration, state.setIntegration], shallow)
+const [integration] = useIntegrationStore((state) => [state.integration],
shallow)
const {cloneElement, onDataFormatChange, onPropertyChange,
onParametersChange, onExpressionChange} =
usePropertiesHook(props.isRouteDesigner);
diff --git a/karavan-vscode/webview/index.css b/karavan-vscode/webview/index.css
index d7be29a5..2074a097 100644
--- a/karavan-vscode/webview/index.css
+++ b/karavan-vscode/webview/index.css
@@ -200,7 +200,7 @@ body, :root, #root, .karavan {
border: none;
background: var(--vscode-tab-inactiveBackground);
color: var(--vscode-input-foreground);
- margin-bottom: 0;
+ /* margin-bottom: 0; */
}
.vscode-dark .karavan .pf-v5-c-drawer__splitter {
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
index 14a6d6a0..597fb142 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/kubernetes/KubernetesService.java
@@ -453,7 +453,6 @@ public class KubernetesService implements HealthCheck {
private void createPVC(String podName, Map labels) {
try (KubernetesClient client = kubernetesClient()) {
-PersistentVolumeClaim old =
client.persistentVolumeClaims().inNamespace(getNamespace()).withName(podName).get();
if (old == null) {
PersistentVolumeClaim pvc = new PersistentVolumeClaimBuilder()
.withNewMetadata()
diff --git
a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx
b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx
index d0635d26..82fd3dd9 100644
---
a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/designer/route/DslProperties.tsx
@@ -127,7 +127,6 @@ export function DslProperties(props: Props) {
: getProperties().filter(p => !dataFormats.includes(p.name));
const propertiesMain = properties.filter(p =>
!p.label.includes("advanced"));
const propertiesAdvanced = properties.filter(p =>
p.label.includes("advanced"));
-console.log(selectedStep)
return (
[camel-karavan] branch main updated: FIx
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 75c46e4c FIx
75c46e4c is described below
commit 75c46e4ce0167cc2eb7c56cac9b5de9a647da34a
Author: Marat Gubaidullin
AuthorDate: Thu Oct 5 14:48:44 2023 -0400
FIx
---
karavan-designer/src/designer/rest/rest.css| 5 +-
karavan-web/docker/Dockerfile.devmode | 2 +-
.../src/main/webui/src/designer/KaravanStore.ts| 252 -
.../src/main/webui/src/designer/rest/rest.css | 5 +-
.../webui/src/designer/route/DslProperties.tsx | 1 +
.../webui/src/project/files/UploadFileModal.tsx| 1 -
.../webui/src/project/topology/TopologyTab.tsx | 2 +-
.../main/webui/src/project/topology/topology.css | 6 +-
8 files changed, 14 insertions(+), 260 deletions(-)
diff --git a/karavan-designer/src/designer/rest/rest.css
b/karavan-designer/src/designer/rest/rest.css
index 25012e2d..3f1a53a5 100644
--- a/karavan-designer/src/designer/rest/rest.css
+++ b/karavan-designer/src/designer/rest/rest.css
@@ -185,6 +185,7 @@
margin-left: 6px;
cursor: pointer;
justify-content: space-between;
+position: relative;
}
.karavan .rest-designer .rest-config-card,
@@ -238,8 +239,8 @@
.karavan .rest-designer .rest-card .delete-button,
.karavan .rest-designer .method-card .delete-button {
position: absolute;
-top: 3px;
-right: 3px;
+top: -7px;
+right: -7px;
line-height: 1;
border: 0;
padding: 0;
diff --git a/karavan-web/docker/Dockerfile.devmode
b/karavan-web/docker/Dockerfile.devmode
index 00f743d1..0ae6bf69 100644
--- a/karavan-web/docker/Dockerfile.devmode
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -24,7 +24,7 @@ LABEL "org.opencontainers.image.version"="4.0.1"
RUN apt-get update && apt-get install git && apt-get clean
ENV JBANG_VERSION=0.110.0
-ENV CAMEL_VERSION=4.0.1
+ENV CAMEL_VERSION=4.0.0
ENV KARAVAN="/karavan"
ENV JBANG_DIR="$KARAVAN/.jbang"
ENV MAVEN_CONFIG="$KARAVAN/.m2"
diff --git
a/karavan-web/karavan-app/src/main/webui/src/designer/KaravanStore.ts
b/karavan-web/karavan-app/src/main/webui/src/designer/KaravanStore.ts
deleted file mode 100644
index 15a9b7be..
--- a/karavan-web/karavan-app/src/main/webui/src/designer/KaravanStore.ts
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * 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.
- */
-
-import {CamelElement, Integration} from
"karavan-core/lib/model/IntegrationDefinition";
-import {DslPosition, EventBus} from "./utils/EventBus";
-import {createWithEqualityFn} from "zustand/traditional";
-import {shallow} from "zustand/shallow";
-
-interface IntegrationState {
-integration: Integration;
-json: string;
-setIntegration: (integration: Integration, propertyOnly: boolean) => void;
-propertyOnly: boolean;
-reset: () => void;
-}
-
-export const useIntegrationStore =
createWithEqualityFn((set) => ({
-integration: Integration.createNew("demo", "plain"),
-propertyOnly: false,
-json: '{}',
-setIntegration: (integration: Integration, propertyOnly: boolean) => {
-set((state: IntegrationState) => {
-const json = JSON.stringify(integration);
-if (state.json === json) {
-return {integration: state.integration, propertyOnly:
state.propertyOnly, json: state.json};
-} else {
-EventBus.sendIntegrationUpdate(integration, propertyOnly);
-return {integration: integration, propertyOnly: propertyOnly,
json: json};
-}
-})
-},
-reset: () => {
-set({integration: Integration.createNew("demo", "plain"), json: '{}',
propertyOnly: false});
-}
-}), shallow)
-
-
-interface SelectorStateState {
-showSelector: boolean;
-setShowSelector: (showSelector: boolean) => void;
-showSteps: boolean;
-setShowSteps: (showSteps: boolean) => void;
-parentDsl?: string;
-setParentDsl: (parentDsl?: string) => void;
-parentId: string;
-setParentId: (parentId: string) => void;
-selectorTabIndex?:
[camel] branch regen_bot updated (04dac449b78 -> 2f0e8903e90)
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 04dac449b78 CAMEL-15625: Add startup recorder dev console and be able to capture these. add 2f0e8903e90 CAMEL-19960: camel-jbang - Add camel get startup-recorder No new revisions were added by this update. Summary of changes: .../org/apache/camel/main/BaseMainSupport.java | 15 +- .../camel/cli/connector/LocalCliConnector.java | 8 + .../dsl/jbang/core/commands/CamelJBangMain.java| 2 + .../action/CamelStartupRecorderAction.java | 196 + .../java/org/apache/camel/main/KameletMain.java| 3 + 5 files changed, 220 insertions(+), 4 deletions(-) create mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelStartupRecorderAction.java
[camel] branch main updated: CAMEL-19960: camel-jbang - Add camel get startup-recorder
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 2f0e8903e90 CAMEL-19960: camel-jbang - Add camel get startup-recorder
2f0e8903e90 is described below
commit 2f0e8903e904542bb2d13aa20e0f3ff2c37cf428
Author: Claus Ibsen
AuthorDate: Thu Oct 5 20:17:11 2023 +0200
CAMEL-19960: camel-jbang - Add camel get startup-recorder
---
.../org/apache/camel/main/BaseMainSupport.java | 15 +-
.../camel/cli/connector/LocalCliConnector.java | 8 +
.../dsl/jbang/core/commands/CamelJBangMain.java| 2 +
.../action/CamelStartupRecorderAction.java | 196 +
.../java/org/apache/camel/main/KameletMain.java| 3 +
5 files changed, 220 insertions(+), 4 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index b529a16f91f..bc9760e909e 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -39,6 +39,7 @@ import org.apache.camel.CamelConfiguration;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Configuration;
+import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoSuchLanguageException;
import org.apache.camel.PropertiesLookupListener;
import org.apache.camel.RuntimeCamelException;
@@ -484,6 +485,8 @@ public abstract class BaseMainSupport extends BaseService {
}
protected void configureStartupRecorder(CamelContext camelContext) {
+ExtendedCamelContext ecc = camelContext.getCamelContextExtension();
+
// we need to load these configurations early as they control the
startup recorder when using camel-jfr
// and we want to start jfr recording as early as possible to also
capture details during bootstrapping Camel
@@ -516,16 +519,20 @@ public abstract class BaseMainSupport extends BaseService
{
if ("off".equals(mainConfigurationProperties.getStartupRecorder())
||
"false".equals(mainConfigurationProperties.getStartupRecorder())) {
-
camelContext.getCamelContextExtension().getStartupStepRecorder().setEnabled(false);
+ecc.getStartupStepRecorder().setEnabled(false);
} else if
("logging".equals(mainConfigurationProperties.getStartupRecorder())) {
-camelContext.getCamelContextExtension().setStartupStepRecorder(new
LoggingStartupStepRecorder());
+if (!(ecc.getStartupStepRecorder() instanceof
LoggingStartupStepRecorder)) {
+ecc.setStartupStepRecorder(new LoggingStartupStepRecorder());
+}
} else if
("backlog".equals(mainConfigurationProperties.getStartupRecorder())) {
-camelContext.getCamelContextExtension().setStartupStepRecorder(new
BacklogStartupStepRecorder());
+if (!(ecc.getStartupStepRecorder() instanceof
BacklogStartupStepRecorder)) {
+ecc.setStartupStepRecorder(new BacklogStartupStepRecorder());
+}
} else if
("jfr".equals(mainConfigurationProperties.getStartupRecorder())
||
"java-flight-recorder".equals(mainConfigurationProperties.getStartupRecorder())
|| mainConfigurationProperties.getStartupRecorder() == null) {
// try to auto discover camel-jfr to use
-StartupStepRecorder fr =
camelContext.getCamelContextExtension().getBootstrapFactoryFinder()
+StartupStepRecorder fr = ecc.getBootstrapFactoryFinder()
.newInstance(StartupStepRecorder.FACTORY,
StartupStepRecorder.class).orElse(null);
if (fr != null) {
LOG.debug("Discovered startup recorder: {} from classpath",
fr);
diff --git
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
index 365f13b6908..9ff207ec741 100644
---
a/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
+++
b/dsl/camel-cli-connector/src/main/java/org/apache/camel/cli/connector/LocalCliConnector.java
@@ -324,6 +324,14 @@ public class LocalCliConnector extends ServiceSupport
implements CliConnector, C
LOG.trace("Updating output file: {}", outputFile);
IOHelper.writeText(json.toJson(), outputFile);
}
+} else if ("startup-recorder".equals(action)) {
+DevConsole dc =
camelContext.getCamelContextExtension().getContextPlugin(DevConsoleRegistry.class)
+.resolveById("startup-recorder");
+if (dc != null) {
+
[camel-kamelets] branch regen_bot updated (414ee698 -> 5a38e494)
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-kamelets.git from 414ee698 chore: Fix JitPack build for main branch (#1669) add ccfdc52f Updated CHANGELOG.md add 9866c40e Updated CHANGELOG.md add 5a38e494 Kamelet Prefix Enum: Added missing entries (#1673) No new revisions were added by this update. Summary of changes: CHANGELOG.md | 2 ++ .../apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java | 2 ++ .../java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java| 3 +++ 3 files changed, 7 insertions(+)
[camel-kamelets] branch main updated: Kamelet Prefix Enum: Added missing entries (#1673)
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-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new 5a38e494 Kamelet Prefix Enum: Added missing entries (#1673)
5a38e494 is described below
commit 5a38e49436c5580c55cee5d420df9aef6c71c3b9
Author: Andrea Cosentino
AuthorDate: Thu Oct 5 19:20:34 2023 +0200
Kamelet Prefix Enum: Added missing entries (#1673)
* KameletPrefixSchemeEnum is missing salesforce-composite-upsert Sink
Kamelet
Signed-off-by: Andrea Cosentino
* KameletPrefixSchemeEnum is missing Azure Datalake Kamelets
Signed-off-by: Andrea Cosentino
-
Signed-off-by: Andrea Cosentino
---
.../apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java | 2 ++
.../java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java| 3 +++
2 files changed, 5 insertions(+)
diff --git
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
index 863c8380..0f212f0b 100644
---
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
+++
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
@@ -38,6 +38,7 @@ public enum KameletPrefixSchemeEnum {
azure_servicebus("azure-servicebus","azure-servicebus"),
azure_storage_blob("azure-storage-blob","azure-storage-blob"),
azure_storage_blob_changefeed("azure-storage-blob-changefeed","azure-storage-blob"),
+azure_storage_datalake("azure-storage-datalake","azure-storage-datalake"),
azure_storage_queue("azure-storage-queue","azure-storage-queue"),
beer("beer", "http"),
bitcoin("bitcoin", "xchange"),
@@ -101,6 +102,7 @@ public enum KameletPrefixSchemeEnum {
salesforce_create("salesforce-create", "salesforce"),
salesforce_delete("salesforce-delete", "salesforce"),
salesforce_update("salesforce-update", "salesforce"),
+salesforce_composite_upsert("salesforce-composite-upsert", "salesforce"),
salesforce("salesforce", "salesforce"),
scp("scp", "scp"),
sftp("sftp", "sftp"),
diff --git
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 686b8e43..1c49d3d8 100644
---
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -147,6 +147,8 @@ public class KameletsCatalogTest {
verifyHeaders("azure-storage-blob-source", 34);
verifyHeaders("azure-storage-blob-sink", 33);
verifyHeaders("azure-storage-blob-changefeed-source", 34);
+verifyHeaders("azure-storage-datalake-source", 0);
+verifyHeaders("azure-storage-datalake-sink", 0);
verifyHeaders("azure-storage-queue-source", 6);
verifyHeaders("azure-storage-queue-sink", 16);
verifyHeaders("cassandra-sink", 1);
@@ -232,6 +234,7 @@ public class KameletsCatalogTest {
verifyHeaders("salesforce-create-sink", 1);
verifyHeaders("salesforce-delete-sink", 1);
verifyHeaders("salesforce-update-sink", 1);
+verifyHeaders("salesforce-composite-upsert-sink", 1);
verifyHeaders("salesforce-source", 19);
verifyHeaders("scp-sink", 0);
verifyHeaders("sftp-sink", 8);
[camel-kamelets] branch catalog-fixes deleted (was de73dd67)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch catalog-fixes in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git was de73dd67 KameletPrefixSchemeEnum is missing Azure Datalake Kamelets The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Kamelet Prefix Enum: Added missing entries [camel-kamelets]
oscerd merged PR #1673: URL: https://github.com/apache/camel-kamelets/pull/1673 -- 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 (6ea0b1ae5de -> 04dac449b78)
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 6ea0b1ae5de CAMEL-19950: camel-report-maven-plugin - Get rid of grape (#11655) add 949bee2c079 CAMEL-15625: Add startup recorder dev console and be able to capture these. add 8cf4bcca392 CAMEL-19953: route templates / kamelets - Add scriptLanguage to specify language instead of type so its more intuitive and similar to the new bean model. add 04dac449b78 CAMEL-15625: Add startup recorder dev console and be able to capture these. No new revisions were added by this update. Summary of changes: .../main/camel-main-configuration-metadata.json| 2 +- .../startup/jfr/FlightRecorderStartupStep.java | 6 ++ .../main/java/org/apache/camel/StartupStep.java| 5 ++ .../org/apache/camel/spi/StartupStepRecorder.java | 9 +++ .../org/apache/camel/dev-console/startup-recorder | 2 + .../impl/console/StartupRecorderDevConsole.java| 89 ++ .../camel/model/RouteTemplateDefinition.java | 4 +- .../camel-main-configuration-metadata.json | 2 +- core/camel-main/src/main/docs/main.adoc| 2 +- .../org/apache/camel/main/BaseMainSupport.java | 3 + .../camel/main/DefaultConfigurationConfigurer.java | 5 ++ .../camel/main/DefaultConfigurationProperties.java | 6 +- .../startup/BacklogStartupStepRecorder.java| 40 ++ .../camel/support/startup/DefaultStartupStep.java | 8 +- .../startup/DefaultStartupStepRecorder.java| 5 ++ .../startup/LoggingStartupStepRecorder.java| 17 +++-- .../ROOT/pages/camel-4x-upgrade-guide-4_1.adoc | 2 + .../java/org/apache/camel/main/KameletMain.java| 1 + 18 files changed, 177 insertions(+), 31 deletions(-) create mode 100644 core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/startup-recorder create mode 100644 core/camel-console/src/main/java/org/apache/camel/impl/console/StartupRecorderDevConsole.java copy components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java => core/camel-support/src/main/java/org/apache/camel/support/startup/BacklogStartupStepRecorder.java (56%)
[camel] 02/03: CAMEL-19953: route templates / kamelets - Add scriptLanguage to specify language instead of type so its more intuitive and similar to the new bean model.
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 commit 8cf4bcca392b45a63f9468c62838437d6137b097 Author: Claus Ibsen AuthorDate: Thu Oct 5 18:30:44 2023 +0200 CAMEL-19953: route templates / kamelets - Add scriptLanguage to specify language instead of type so its more intuitive and similar to the new bean model. --- .../src/main/java/org/apache/camel/model/RouteTemplateDefinition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java index 320b3a11267..44802872d58 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java @@ -306,7 +306,7 @@ public class RouteTemplateDefinition extends OptionalIdentifiedDefinition
[camel] 03/03: CAMEL-15625: Add startup recorder dev console and be able to capture these.
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
commit 04dac449b78444c8b91e0d7bee5c09dfc7aa5b12
Author: Claus Ibsen
AuthorDate: Thu Oct 5 18:56:49 2023 +0200
CAMEL-15625: Add startup recorder dev console and be able to capture these.
---
.../camel/catalog/main/camel-main-configuration-metadata.json | 2 +-
.../org/apache/camel/startup/jfr/FlightRecorderStartupStep.java | 6 ++
docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_1.adoc | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 237e996e769..de05f6d7933 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -109,7 +109,7 @@
{ "name": "camel.main.shutdownSuppressLoggingOnTimeout", "description":
"Whether Camel should try to suppress logging during shutdown and timeout was
triggered, meaning forced shutdown is happening. And during forced shutdown we
want to avoid logging errors\/warnings et all in the logs as a side-effect of
the forced timeout. Notice the suppress is a best effort as there may still be
some logs coming from 3rd party libraries and whatnot, which Camel cannot
control. This option is defa [...]
{ "name": "camel.main.shutdownTimeout", "description": "Timeout in seconds
to graceful shutdown all the Camel routes.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "int", "defaultValue": 45 },
{ "name": "camel.main.sourceLocationEnabled", "description": "Whether to
capture precise source location:line-number for all EIPs in Camel routes.
Enabling this will impact parsing Java based routes (also Groovy, Kotlin, etc.)
on startup as this uses JDK StackTraceElement to calculate the location from
the Camel route, which comes with a performance cost. This only impact startup,
not the performance of the routes at runtime.", "sourceType":
"org.apache.camel.main.DefaultConfiguratio [...]
-{ "name": "camel.main.startupRecorder", "description": "To use startup
recorder for capturing execution time during starting Camel. The recorder can
be one of: false (or off), logging, java-flight-recorder (or jfr).",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"string", "javaType": "java.lang.String", "enum": [ "false", "off",
"java-flight-recorder", "jfr", "logging" ] },
+{ "name": "camel.main.startupRecorder", "description": "To use startup
recorder for capturing execution time during starting Camel. The recorder can
be one of: false (or off), logging, backlog, java-flight-recorder (or jfr).",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"string", "javaType": "java.lang.String", "enum": [ "false", "off",
"java-flight-recorder", "jfr", "logging", "backlog" ] },
{ "name": "camel.main.startupRecorderDir", "description": "Directory to
store the recording. By default the current directory will be used. Use false
to turn off saving recording to disk.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.main.startupRecorderDuration", "description": "How long
time to run the startup recorder. Use 0 (default) to keep the recorder running
until the JVM is exited. Use -1 to stop the recorder right after Camel has been
started (to only focus on potential Camel startup performance bottlenecks) Use
a positive value to keep recording for N seconds. When the recorder is stopped
then the recording is auto saved to disk (note: save to disk can be disabled by
setting startupRec [...]
{ "name": "camel.main.startupRecorderMaxDepth", "description": "To filter
our sub steps at a maximum depth. Use -1 for no maximum. Use 0 for no sub
steps. Use 1 for max 1 sub step, and so forth. The default is -1.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"integer", "javaType": "int", "defaultValue": -1 },
diff --git
a/components/camel-jfr/src/main/java/org/apache/camel/startup/jfr/FlightRecorderStartupStep.java
b/components/camel-jfr/src/main/java/org/apache/camel/startup/jfr/FlightRecorderStartupStep.java
index 9a0c2f1bfc1..74f2409ba78 100644
---
a/components/camel-jfr/src/main/java/org/apache/camel/startup/jfr/FlightRecorderStartupStep.java
+++
b/components/camel-jfr/src/main/java/org/apache/camel/startup/jfr/FlightRecorderStartupStep.java
@@ -82,6 +82,12 @@ public class Flight
[camel] 01/03: CAMEL-15625: Add startup recorder dev console and be able to capture these.
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
commit 949bee2c079cbe80b2252264fa70bcd933ca4c77
Author: Claus Ibsen
AuthorDate: Thu Oct 5 18:28:53 2023 +0200
CAMEL-15625: Add startup recorder dev console and be able to capture these.
---
.../main/java/org/apache/camel/StartupStep.java| 5 ++
.../org/apache/camel/spi/StartupStepRecorder.java | 9 +++
.../org/apache/camel/dev-console/startup-recorder | 2 +
.../impl/console/StartupRecorderDevConsole.java| 89 ++
.../camel-main-configuration-metadata.json | 2 +-
core/camel-main/src/main/docs/main.adoc| 2 +-
.../org/apache/camel/main/BaseMainSupport.java | 3 +
.../camel/main/DefaultConfigurationConfigurer.java | 5 ++
.../camel/main/DefaultConfigurationProperties.java | 6 +-
...corder.java => BacklogStartupStepRecorder.java} | 37 +
.../camel/support/startup/DefaultStartupStep.java | 8 +-
.../startup/DefaultStartupStepRecorder.java| 5 ++
.../startup/LoggingStartupStepRecorder.java| 17 +++--
.../java/org/apache/camel/main/KameletMain.java| 1 +
14 files changed, 163 insertions(+), 28 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/StartupStep.java
b/core/camel-api/src/main/java/org/apache/camel/StartupStep.java
index 6da0ac511e3..4f48bdfb6f0 100644
--- a/core/camel-api/src/main/java/org/apache/camel/StartupStep.java
+++ b/core/camel-api/src/main/java/org/apache/camel/StartupStep.java
@@ -62,4 +62,9 @@ public interface StartupStep {
*/
long getBeginTime();
+/**
+ * Gets the duration the step took (optional)
+ */
+long getDuration();
+
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/StartupStepRecorder.java
b/core/camel-api/src/main/java/org/apache/camel/spi/StartupStepRecorder.java
index 634dd14af82..0600f494c09 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/StartupStepRecorder.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/StartupStepRecorder.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.spi;
+import java.util.stream.Stream;
+
import org.apache.camel.StartupStep;
import org.apache.camel.StaticService;
@@ -108,4 +110,11 @@ public interface StartupStepRecorder extends StaticService
{
*/
void endStep(StartupStep step);
+/**
+ * Some records will capture all steps which can be accessed on demand.
+ */
+default Stream steps() {
+return Stream.empty();
+}
+
}
diff --git
a/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/startup-recorder
b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/startup-recorder
new file mode 100644
index 000..6a38b3c5ed7
--- /dev/null
+++
b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/startup-recorder
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.impl.console.StartupRecorderDevConsole
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/StartupRecorderDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/StartupRecorderDevConsole.java
new file mode 100644
index 000..0f527caa2f5
--- /dev/null
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/StartupRecorderDevConsole.java
@@ -0,0 +1,89 @@
+/*
+ * 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.impl.console;
+
+import java.util.Map;
+
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.StartupStep;
+import org.apache.camel.spi.StartupStepRecorder;
+import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.console.AbstractDevConsole;
+import org.apache.camel.util.StringHelper;
+import org.apache.camel.util.json.JsonArray;
+import org.apache.camel.util.json.JsonObject;
+
+@DevConsole("startup-recorder")
+public class StartupRecorderDevConsole extends AbstractDevConsole {
+
+public StartupRecorderDevConsole() {
+
[camel] branch main updated (6ea0b1ae5de -> 04dac449b78)
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 6ea0b1ae5de CAMEL-19950: camel-report-maven-plugin - Get rid of grape (#11655) new 949bee2c079 CAMEL-15625: Add startup recorder dev console and be able to capture these. new 8cf4bcca392 CAMEL-19953: route templates / kamelets - Add scriptLanguage to specify language instead of type so its more intuitive and similar to the new bean model. new 04dac449b78 CAMEL-15625: Add startup recorder dev console and be able to capture these. 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: .../main/camel-main-configuration-metadata.json| 2 +- .../startup/jfr/FlightRecorderStartupStep.java | 6 ++ .../main/java/org/apache/camel/StartupStep.java| 5 ++ .../org/apache/camel/spi/StartupStepRecorder.java | 9 +++ .../org/apache/camel/dev-console/startup-recorder | 2 + .../impl/console/StartupRecorderDevConsole.java| 89 ++ .../camel/model/RouteTemplateDefinition.java | 4 +- .../camel-main-configuration-metadata.json | 2 +- core/camel-main/src/main/docs/main.adoc| 2 +- .../org/apache/camel/main/BaseMainSupport.java | 3 + .../camel/main/DefaultConfigurationConfigurer.java | 5 ++ .../camel/main/DefaultConfigurationProperties.java | 6 +- .../startup/BacklogStartupStepRecorder.java| 40 ++ .../camel/support/startup/DefaultStartupStep.java | 8 +- .../startup/DefaultStartupStepRecorder.java| 5 ++ .../startup/LoggingStartupStepRecorder.java| 17 +++-- .../ROOT/pages/camel-4x-upgrade-guide-4_1.adoc | 2 + .../java/org/apache/camel/main/KameletMain.java| 1 + 18 files changed, 177 insertions(+), 31 deletions(-) create mode 100644 core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/startup-recorder create mode 100644 core/camel-console/src/main/java/org/apache/camel/impl/console/StartupRecorderDevConsole.java copy components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java => core/camel-support/src/main/java/org/apache/camel/support/startup/BacklogStartupStepRecorder.java (56%)
[PR] Kamelet Prefix Enum: Added missing entries [camel-kamelets]
oscerd opened a new pull request, #1673: URL: https://github.com/apache/camel-kamelets/pull/1673 (no comment) -- 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-kamelets] 02/02: KameletPrefixSchemeEnum is missing Azure Datalake Kamelets
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch catalog-fixes
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit de73dd675be6be80fb969b82d1c4ce8c74615576
Author: Andrea Cosentino
AuthorDate: Thu Oct 5 18:37:38 2023 +0200
KameletPrefixSchemeEnum is missing Azure Datalake Kamelets
Signed-off-by: Andrea Cosentino
---
.../apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java| 1 +
.../java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java | 2 ++
2 files changed, 3 insertions(+)
diff --git
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
index 211fddc5..0f212f0b 100644
---
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
+++
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
@@ -38,6 +38,7 @@ public enum KameletPrefixSchemeEnum {
azure_servicebus("azure-servicebus","azure-servicebus"),
azure_storage_blob("azure-storage-blob","azure-storage-blob"),
azure_storage_blob_changefeed("azure-storage-blob-changefeed","azure-storage-blob"),
+azure_storage_datalake("azure-storage-datalake","azure-storage-datalake"),
azure_storage_queue("azure-storage-queue","azure-storage-queue"),
beer("beer", "http"),
bitcoin("bitcoin", "xchange"),
diff --git
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 60560347..1c49d3d8 100644
---
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -147,6 +147,8 @@ public class KameletsCatalogTest {
verifyHeaders("azure-storage-blob-source", 34);
verifyHeaders("azure-storage-blob-sink", 33);
verifyHeaders("azure-storage-blob-changefeed-source", 34);
+verifyHeaders("azure-storage-datalake-source", 0);
+verifyHeaders("azure-storage-datalake-sink", 0);
verifyHeaders("azure-storage-queue-source", 6);
verifyHeaders("azure-storage-queue-sink", 16);
verifyHeaders("cassandra-sink", 1);
[camel-kamelets] 01/02: KameletPrefixSchemeEnum is missing salesforce-composite-upsert Sink Kamelet
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch catalog-fixes
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit bc439200b2d574ed2b5be90267ff01fa352127ce
Author: Andrea Cosentino
AuthorDate: Thu Oct 5 18:23:00 2023 +0200
KameletPrefixSchemeEnum is missing salesforce-composite-upsert Sink Kamelet
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java | 1 +
.../test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java | 1 +
2 files changed, 2 insertions(+)
diff --git
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
index 863c8380..211fddc5 100644
---
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
+++
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
@@ -101,6 +101,7 @@ public enum KameletPrefixSchemeEnum {
salesforce_create("salesforce-create", "salesforce"),
salesforce_delete("salesforce-delete", "salesforce"),
salesforce_update("salesforce-update", "salesforce"),
+salesforce_composite_upsert("salesforce-composite-upsert", "salesforce"),
salesforce("salesforce", "salesforce"),
scp("scp", "scp"),
sftp("sftp", "sftp"),
diff --git
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 686b8e43..60560347 100644
---
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -232,6 +232,7 @@ public class KameletsCatalogTest {
verifyHeaders("salesforce-create-sink", 1);
verifyHeaders("salesforce-delete-sink", 1);
verifyHeaders("salesforce-update-sink", 1);
+verifyHeaders("salesforce-composite-upsert-sink", 1);
verifyHeaders("salesforce-source", 19);
verifyHeaders("scp-sink", 0);
verifyHeaders("sftp-sink", 8);
[camel-kamelets] branch catalog-fixes created (now de73dd67)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch catalog-fixes in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at de73dd67 KameletPrefixSchemeEnum is missing Azure Datalake Kamelets This branch includes the following new commits: new bc439200 KameletPrefixSchemeEnum is missing salesforce-composite-upsert Sink Kamelet new de73dd67 KameletPrefixSchemeEnum is missing Azure Datalake Kamelets 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.
[camel-kamelets] branch catalog-fix created (now 1f22f844)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch catalog-fix in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at 1f22f844 Updated Prefix Enum after Kamelets removal No new revisions were added by this update.
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/repos/repos#update-a-repository"}
[camel-website-pub] branch asf-site updated (4baf5e692 -> 13a992944)
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-pub.git discard 4baf5e692 Website updated to 025db0497698093567995f69b2a7db6b9360a44c discard f25a7d06d Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 9afcd96ee Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 13a992944 Website updated to 025db0497698093567995f69b2a7db6b9360a44c 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 (4baf5e692) \ N -- N -- N refs/heads/asf-site (13a992944) 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 | 28 +- .well-known/security.txt |2 +- camel-k/next/_images/camel_k_pipeline.png | Bin 0 -> 17355 bytes camel-k/next/apis/camel-k.html |2 +- camel-k/next/apis/java.html|2 +- camel-k/next/apis/kamelets.html|2 +- camel-k/next/architecture/architecture.html|2 +- camel-k/next/architecture/cr/build.html|2 +- camel-k/next/architecture/cr/camel-catalog.html|2 +- camel-k/next/architecture/cr/integration-kit.html |2 +- .../next/architecture/cr/integration-platform.html |2 +- camel-k/next/architecture/cr/integration.html |2 +- camel-k/next/architecture/incremental-image.html |2 +- camel-k/next/architecture/operator.html|2 +- camel-k/next/architecture/runtime.html |2 +- camel-k/next/architecture/traits.html |2 +- camel-k/next/cli/cli.html |2 +- camel-k/next/cli/file-based-config.html|2 +- camel-k/next/cli/modeline.html |2 +- .../next/configuration/build-time-properties.html |2 +- camel-k/next/configuration/components.html |2 +- camel-k/next/configuration/configuration.html |2 +- camel-k/next/configuration/dependencies.html |2 +- camel-k/next/configuration/maven-profile.html |2 +- camel-k/next/configuration/runtime-config.html |2 +- camel-k/next/configuration/runtime-properties.html |2 +- camel-k/next/configuration/runtime-resources.html |2 +- camel-k/next/contributing/developers.html |2 +- camel-k/next/contributing/e2e.html |2 +- .../next/contributing/local-deployment-olm.html|2 +- camel-k/next/contributing/local-development.html |2 +- camel-k/next/contributing/remote-debugging.html|2 +- camel-k/next/contributing/uninstalling.html|2 +- camel-k/next/contributing/upgrade.html |2 +- camel-k/next/index.html|2 +- camel-k/next/installation/advanced/advanced.html |2 +- .../next/installation/advanced/build-config.html |2 +- camel-k/next/installation/advanced/http-proxy.html |2 +- camel-k/next/installation/advanced/kustomize.html |2 +- .../next/installation/advanced/maven-proxy.html|2 +- camel-k/next/installation/advanced/maven.html |2 +- .../installation/advanced/multi-architecture.html |2 +- camel-k/next/installation/advanced/multi.html |2 +- camel-k/next/installation/advanced/network.html|2 +- camel-k/next/installation/advanced/offline.html|2 +- camel-k/next/installation/advanced/resources.html |2 +- camel-k/next/installation/installation.html|2 +- camel-k/next/installation/platform/crc.html|2 +- .../next/installation/platform/digitalocean.html |2 +- .../next/installation/platform/docker-desktop.html |2 +- camel-k/next/installation/platform/gke.html|2 +- camel-k/next/installation/platform/iks.html|2 +- camel-k/next/installation/platform/k3s.html|2 +- camel-k/next/installation/platform/kind.html |2 +- camel-k/next/installation/platform/minikube.html |2 +- camel-k/next/installation/platform/openshift.html |2 +- .../next/installation/registry/digitalocean.html |
Re: [I] Allow to remote debug the Operator [camel-k]
squakez commented on issue #4513: URL: https://github.com/apache/camel-k/issues/4513#issuecomment-1749186848 The documentation supporting the local operator execution will be back as we have now removed the dynamic builder container generation. -- 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
[PR] chore(doc): bring back support for local operator execution [camel-k]
squakez opened a new pull request, #4802: URL: https://github.com/apache/camel-k/pull/4802 This was removed as we temporary introduced the dynamic builder. Now that is gone, the local execution can be still a way to debug the operator. Ref #4513 **Release Note** ```release-note chore(doc): bring back support for local operator execution ``` -- 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
[PR] feat: Add jib plugins versions to catalog runtime metadata [camel-k-runtime]
gansheer opened a new pull request, #1096: URL: https://github.com/apache/camel-k-runtime/pull/1096 Ref camel-k/issues#4703 **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
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
orpiske commented on code in PR #11656:
URL: https://github.com/apache/camel/pull/11656#discussion_r1347602770
##
core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java:
##
@@ -107,7 +107,7 @@ private T fastConvertTo(Class type, Exchange
exchange, Object value) {
return null;
}
-if (type.isInstance(value)) {
+if (type.equals(value.getClass())) {
Review Comment:
More specifically: the code is doing this in a subsequent call, so this
check runs twice. I'm just making the first check a bit lenient to avoid
hitting a slow path in the JVM itself.
--
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
Re: [PR] feat(trait): let camel framework manage Kamelets [camel-k]
github-actions[bot] commented on PR #4797: URL: https://github.com/apache/camel-k/pull/4797#issuecomment-1749123657 :camel: **Thank you for contributing!** Code Coverage Report :warning: - Coverage changed: 33.4% --> 33.3% (Coverage difference: **-.1%**) -- 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
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
orpiske commented on code in PR #11656:
URL: https://github.com/apache/camel/pull/11656#discussion_r1347602770
##
core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java:
##
@@ -107,7 +107,7 @@ private T fastConvertTo(Class type, Exchange
exchange, Object value) {
return null;
}
-if (type.isInstance(value)) {
+if (type.equals(value.getClass())) {
Review Comment:
More specifically: the code is doing this check twice. I'm just making the
first check a bit lenient to avoid hitting a slow path in the JVM itself.
--
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
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
orpiske commented on code in PR #11656:
URL: https://github.com/apache/camel/pull/11656#discussion_r1347601292
##
core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java:
##
@@ -107,7 +107,7 @@ private T fastConvertTo(Class type, Exchange
exchange, Object value) {
return null;
}
-if (type.isInstance(value)) {
+if (type.equals(value.getClass())) {
Review Comment:
It's still gonna be checked for this later. This is just a duplicated one.
--
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
[PR] fix(doc): image location [camel-k]
squakez opened a new pull request, #4801: URL: https://github.com/apache/camel-k/pull/4801 **Release Note** ```release-note fix(doc): image location ``` -- 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
Re: [PR] fix(doc): image location [camel-k]
squakez merged PR #4801: URL: https://github.com/apache/camel-k/pull/4801 -- 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: fix(doc): image location
This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 ed36d886f fix(doc): image location
ed36d886f is described below
commit ed36d886f52762a8efc5f59a0e5fb1432285bacd
Author: Pasquale Congiusti
AuthorDate: Thu Oct 5 17:17:26 2023 +0200
fix(doc): image location
---
docs/modules/ROOT/{ => images}/camel_k_pipeline.png | Bin
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/docs/modules/ROOT/camel_k_pipeline.png
b/docs/modules/ROOT/images/camel_k_pipeline.png
similarity index 100%
rename from docs/modules/ROOT/camel_k_pipeline.png
rename to docs/modules/ROOT/images/camel_k_pipeline.png
[camel] branch regen_bot updated (3ef29185ab0 -> 6ea0b1ae5de)
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 3ef29185ab0 (chores) camel-core: code cleanup add 6ea0b1ae5de CAMEL-19950: camel-report-maven-plugin - Get rid of grape (#11655) No new revisions were added by this update. Summary of changes: apache-camel/pom.xml | 4 - bom/camel-bom/pom.xml | 5 - catalog/camel-catalog-maven-grape/pom.xml | 114 --- .../catalog/maven/ComponentArtifactHelper.java | 95 - .../maven/DefaultMavenArtifactProvider.java| 141 - .../camel/catalog/maven/MavenArtifactProvider.java | 60 -- .../camel/catalog/maven/MavenVersionManager.java | 222 - .../catalog/maven/TimeoutHttpClientHandler.java| 72 --- .../src/main/resources/META-INF/LICENSE.txt| 203 --- .../src/main/resources/META-INF/NOTICE.txt | 11 - .../maven/MavenArtifactProviderManualTest.java | 49 - .../maven/MavenVersionManagerManualTest.java | 153 -- .../src/test/resources/log4j2.properties | 28 --- .../camel/catalog/maven/MavenVersionManager.java | 16 +- catalog/camel-report-maven-plugin/pom.xml | 27 ++- .../src/main/docs/camel-report-maven-plugin.adoc | 4 +- .../java/org/apache/camel/maven/ValidateMojo.java | 15 +- catalog/pom.xml| 1 - .../ROOT/pages/camel-report-maven-plugin.adoc | 4 +- parent/pom.xml | 5 - tests/camel-itest/pom.xml | 2 +- .../camel/tooling/maven/MavenDownloaderImpl.java | 33 ++- 22 files changed, 80 insertions(+), 1184 deletions(-) delete mode 100644 catalog/camel-catalog-maven-grape/pom.xml delete mode 100644 catalog/camel-catalog-maven-grape/src/main/java/org/apache/camel/catalog/maven/ComponentArtifactHelper.java delete mode 100644 catalog/camel-catalog-maven-grape/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java delete mode 100644 catalog/camel-catalog-maven-grape/src/main/java/org/apache/camel/catalog/maven/MavenArtifactProvider.java delete mode 100644 catalog/camel-catalog-maven-grape/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java delete mode 100644 catalog/camel-catalog-maven-grape/src/main/java/org/apache/camel/catalog/maven/TimeoutHttpClientHandler.java delete mode 100644 catalog/camel-catalog-maven-grape/src/main/resources/META-INF/LICENSE.txt delete mode 100644 catalog/camel-catalog-maven-grape/src/main/resources/META-INF/NOTICE.txt delete mode 100644 catalog/camel-catalog-maven-grape/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderManualTest.java delete mode 100644 catalog/camel-catalog-maven-grape/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerManualTest.java delete mode 100644 catalog/camel-catalog-maven-grape/src/test/resources/log4j2.properties
Re: [I] Kamelet - Inject secret in Azure KeyVault Trait [camel-k]
oscerd closed issue #4743: Kamelet - Inject secret in Azure KeyVault Trait URL: https://github.com/apache/camel-k/issues/4743 -- 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 4743-hashicorp-vault deleted (was 15083c455)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 4743-hashicorp-vault in repository https://gitbox.apache.org/repos/asf/camel-k.git was 15083c455 Kamelet - Inject secret in Vaults - Hashicorp Vault The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-k] branch main updated: Kamelet - Inject secret in Vaults - Hashicorp Vault (#4799)
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-k.git
The following commit(s) were added to refs/heads/main by this push:
new f5c86b79d Kamelet - Inject secret in Vaults - Hashicorp Vault (#4799)
f5c86b79d is described below
commit f5c86b79d320ea719b645545d4923c1c9e43c6f5
Author: Andrea Cosentino
AuthorDate: Thu Oct 5 17:04:29 2023 +0200
Kamelet - Inject secret in Vaults - Hashicorp Vault (#4799)
Signed-off-by: Andrea Cosentino
---
addons/vault/hashicorp/hashicorp_vault.go | 20 +-
addons/vault/hashicorp/hashicorp_vault_test.go | 84 +-
docs/modules/traits/pages/hashicorp-vault.adoc | 4 +-
resources/traits.yaml | 6 +-
4 files changed, 108 insertions(+), 6 deletions(-)
diff --git a/addons/vault/hashicorp/hashicorp_vault.go
b/addons/vault/hashicorp/hashicorp_vault.go
index e3eefed8e..058b18cc9 100644
--- a/addons/vault/hashicorp/hashicorp_vault.go
+++ b/addons/vault/hashicorp/hashicorp_vault.go
@@ -18,10 +18,13 @@ limitations under the License.
package hashicorp
import (
+ "regexp"
+
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/trait"
"github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
"k8s.io/utils/pointer"
)
@@ -46,7 +49,9 @@ type Trait struct {
Port string `property:"port" json:"port,omitempty"`
// The Hashicorp engine to use
Engine string `property:"engine" json:"engine,omitempty"`
- // The token to access Hashicorp Vault
+ // The token to access Hashicorp Vault. This could be a plain text or a
configmap/secret
+ // The content of the hashicorp vault token is expected to be a text
containing a valid Hashicorp Vault Token.
+ // Syntax: [configmap|secret]:name[/key], where name represents the
resource name, key optionally represents the resource key to be filtered
(default key value = hashicorp-vault-token).
Token string `property:"token" json:"token,omitempty"`
// The scheme to access Hashicorp Vault
Scheme string `property:"scheme" json:"scheme,omitempty"`
@@ -76,6 +81,7 @@ func (t *hashicorpVaultTrait) Configure(environment
*trait.Environment) (bool, e
}
func (t *hashicorpVaultTrait) Apply(environment *trait.Environment) error {
+ rex :=
regexp.MustCompile(`^(configmap|secret):([a-zA-Z0-9][a-zA-Z0-9-]*)(/([a-zA-Z0-9].*))?$`)
if environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&environment.Integration.Status.Capabilities,
v1.CapabilityHashicorpVault)
// Deprecated
@@ -84,7 +90,17 @@ func (t *hashicorpVaultTrait) Apply(environment
*trait.Environment) error {
}
if environment.IntegrationInRunningPhases() {
-
environment.ApplicationProperties["camel.vault.hashicorp.token"] = t.Token
+ hits := rex.FindAllStringSubmatch(t.Token, -1)
+ if len(hits) >= 1 {
+ var res, _ = v1.DecodeValueSource(t.Token,
"hashicorp-vault-token", "The Hashicorp Vault Token provided is not valid")
+ if secretValue, err :=
kubernetes.ResolveValueSource(environment.Ctx, environment.Client,
environment.Platform.Namespace, &res); err != nil {
+ return err
+ } else if secretValue != "" {
+
environment.ApplicationProperties["camel.vault.hashicorp.token"] =
string([]byte(secretValue))
+ }
+ } else {
+
environment.ApplicationProperties["camel.vault.hashicorp.token"] = t.Token
+ }
environment.ApplicationProperties["camel.vault.hashicorp.host"]
= t.Host
environment.ApplicationProperties["camel.vault.hashicorp.port"]
= t.Port
environment.ApplicationProperties["camel.vault.hashicorp.engine"] = t.Engine
diff --git a/addons/vault/hashicorp/hashicorp_vault_test.go
b/addons/vault/hashicorp/hashicorp_vault_test.go
index 7333dffe1..86cb70229 100644
--- a/addons/vault/hashicorp/hashicorp_vault_test.go
+++ b/addons/vault/hashicorp/hashicorp_vault_test.go
@@ -20,6 +20,9 @@ package hashicorp
import (
"testing"
+ "github.com/apache/camel-k/v2/pkg/util/test"
+ corev1 "k8s.io/api/core/v1"
+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
@@ -28,6 +31,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/camel"
"github.com/stretchr/testify/assert"
+ "k8s.io/apimachinery/pkg/runtime"
)
func TestHashicorpVaultTraitApply(t *testing.T) {
@@ -55,25 +59,101 @@ func TestHashicorpVaultTraitAp
Re: [PR] Kamelet - Inject secret in Vaults - Hashicorp Vault [camel-k]
oscerd merged PR #4799: URL: https://github.com/apache/camel-k/pull/4799 -- 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 CAMEL-19950/use-camel-tooling-maven-instead-of-grape deleted (was 121f6535d63)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-19950/use-camel-tooling-maven-instead-of-grape in repository https://gitbox.apache.org/repos/asf/camel.git was 121f6535d63 doc: fix the way to call the plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] CAMEL-19950: camel-report-maven-plugin - Get rid of grape [camel]
essobedo merged PR #11655: URL: https://github.com/apache/camel/pull/11655 -- 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-19950: camel-report-maven-plugin - Get rid of grape (#11655)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 6ea0b1ae5de CAMEL-19950: camel-report-maven-plugin - Get rid of grape
(#11655)
6ea0b1ae5de is described below
commit 6ea0b1ae5deade7bc8810a5e49825419e8f0aabc
Author: Nicolas Filotto
AuthorDate: Thu Oct 5 17:03:43 2023 +0200
CAMEL-19950: camel-report-maven-plugin - Get rid of grape (#11655)
## Motivation
The maven plugin `camel-report-maven-plugin` still uses Groovy Grape and we
would like to get rid of it.
## Modifications:
* Change the dependency `camel-catalog-maven-grape` for
`camel-catalog-maven`
* Add explicitly the dependencies that cause a warning when not scoped with
`provided`
* Adapt the code of `MavenDownloaderImpl` to accept predefined
`RepositorySystem`, `RepositorySystemSession`, and `Settings` to ensure that
internal maven classes are not used during initialization
* Remove the artifact `camel-catalog-maven-grape` and its references as it
is no longer used
* Fix the way to call the plugin in the documentation
---
apache-camel/pom.xml | 4 -
bom/camel-bom/pom.xml | 5 -
catalog/camel-catalog-maven-grape/pom.xml | 114 ---
.../catalog/maven/ComponentArtifactHelper.java | 95 -
.../maven/DefaultMavenArtifactProvider.java| 141 -
.../camel/catalog/maven/MavenArtifactProvider.java | 60 --
.../camel/catalog/maven/MavenVersionManager.java | 222 -
.../catalog/maven/TimeoutHttpClientHandler.java| 72 ---
.../src/main/resources/META-INF/LICENSE.txt| 203 ---
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../maven/MavenArtifactProviderManualTest.java | 49 -
.../maven/MavenVersionManagerManualTest.java | 153 --
.../src/test/resources/log4j2.properties | 28 ---
.../camel/catalog/maven/MavenVersionManager.java | 16 +-
catalog/camel-report-maven-plugin/pom.xml | 27 ++-
.../src/main/docs/camel-report-maven-plugin.adoc | 4 +-
.../java/org/apache/camel/maven/ValidateMojo.java | 15 +-
catalog/pom.xml| 1 -
.../ROOT/pages/camel-report-maven-plugin.adoc | 4 +-
parent/pom.xml | 5 -
tests/camel-itest/pom.xml | 2 +-
.../camel/tooling/maven/MavenDownloaderImpl.java | 33 ++-
22 files changed, 80 insertions(+), 1184 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 0b3f69a07be..15e6748bbff 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -195,10 +195,6 @@
org.apache.camel
camel-catalog-maven
-
-org.apache.camel
-camel-catalog-maven-grape
-
org.apache.camel
camel-route-parser
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index b29011817ae..9f233bbba2b 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -376,11 +376,6 @@
camel-catalog-maven
${project.version}
-
-org.apache.camel
-camel-catalog-maven-grape
-${project.version}
-
org.apache.camel
camel-cbor
diff --git a/catalog/camel-catalog-maven-grape/pom.xml
b/catalog/camel-catalog-maven-grape/pom.xml
deleted file mode 100644
index 4d24ad07b1b..000
--- a/catalog/camel-catalog-maven-grape/pom.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-4.0.0
-
-
-org.apache.camel
-catalog
-4.1.0-SNAPSHOT
-
-
-camel-catalog-maven-grape
-jar
-Camel :: Catalog :: Maven Grape
-Camel Catalog Maven using Grape
-
-
-2.18.0
-tooling
-
-
-
-
-
-org.apache.camel
-camel-catalog
-${project.version}
-
-
-
-org.slf4j
-slf4j-api
-
-
-
-
-org.apache.httpcomponents
-httpclient
-4.5.10
-
-
-org.apache.httpcomponents
-httpcore
-${httpcore4-version}
-
-
-commons-codec
-commons-codec
-
-
-
-
-org.apache.camel
-camel-allcomponents
-${project.version}
-pom
-
-
-org.apache.camel
-*
-
-
-
-
-
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
essobedo commented on code in PR #11656:
URL: https://github.com/apache/camel/pull/11656#discussion_r1347567962
##
core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java:
##
@@ -107,7 +107,7 @@ private T fastConvertTo(Class type, Exchange
exchange, Object value) {
return null;
}
-if (type.isInstance(value)) {
+if (type.equals(value.getClass())) {
Review Comment:
This sounds really risky since `value` could be an instance of a subclass
like in the next example:
Given:
```
public interface Animal {
}
public static class Dog implements Animal {
}
```
When:
```
Dog pluto = new Dog();
System.out.println("Is pluto an animal? Using isInstance " +
(Animal.class.isInstance(pluto) ? "Yes" : "No"));
System.out.println("Is pluto an animal? Using Equals " +
(Animal.class.equals(pluto.getClass()) ? "Yes" : "No"));
```
Then
```
Is pluto an animal? Using isInstance Yes
Is pluto an animal? Using Equals No
```
--
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
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
essobedo commented on code in PR #11656:
URL: https://github.com/apache/camel/pull/11656#discussion_r1347567962
##
core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java:
##
@@ -107,7 +107,7 @@ private T fastConvertTo(Class type, Exchange
exchange, Object value) {
return null;
}
-if (type.isInstance(value)) {
+if (type.equals(value.getClass())) {
Review Comment:
This sounds really risky since `value` could be an instance of a subclass
like in the next example:
Given:
```
public interface Animal {
}
public static class Dog implements Animal {
}
```
When:
```
Dog pluto = new Dog();
System.out.println("Is pluto an animal? Using isInstance " +
(Animal.class.isInstance(pluto) ? "Yes" : "No"));
System.out.println("Is pluto an animal? Using Equals " +
(Animal.class.equals(pluto.getClass()) ? "Yes" : "No"));
```
Then
```
Is pluto an animal? Using isInstance Yes
Is pluto an animal? Using Equals No
```
--
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 (e9d644f8f56 -> 3ef29185ab0)
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 e9d644f8f56 Regen add 3ef29185ab0 (chores) camel-core: code cleanup No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/impl/engine/AdviceIterator.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[camel] branch main updated: (chores) camel-core: code cleanup
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 3ef29185ab0 (chores) camel-core: code cleanup
3ef29185ab0 is described below
commit 3ef29185ab0c5d927f540a4698557533c89384b6
Author: Otavio Rodolfo Piske
AuthorDate: Thu Oct 5 15:27:48 2023 +0200
(chores) camel-core: code cleanup
Move the state index out of the loop to avoid confusing it with the loop
conditions
---
.../src/main/java/org/apache/camel/impl/engine/AdviceIterator.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AdviceIterator.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AdviceIterator.java
index 1d59763bd0d..02461653431 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AdviceIterator.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AdviceIterator.java
@@ -28,11 +28,13 @@ final class AdviceIterator {
}
static void runAfterTasks(List
advices, Object[] states, Exchange exchange) {
-for (int i = advices.size() - 1, j = states.length - 1; i >= 0; i--) {
+int stateIndex = states.length - 1;
+
+for (int i = advices.size() - 1; i >= 0; i--) {
CamelInternalProcessorAdvice task = advices.get(i);
Object state = null;
if (task.hasState()) {
-state = states[j--];
+state = states[stateIndex--];
}
try {
task.after(exchange, state);
Re: [PR] (chores) camel-core: code cleanup [camel]
orpiske merged PR #11654: URL: https://github.com/apache/camel/pull/11654 -- 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
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
orpiske commented on PR #11656: URL: https://github.com/apache/camel/pull/11656#issuecomment-1749048038 Waiting for my CI tests and perf results. -- 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
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
github-actions[bot] commented on PR #11656: URL: https://github.com/apache/camel/pull/11656#issuecomment-1749047860 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- 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] 01/01: doc: fix the way to call the plugin
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch CAMEL-19950/use-camel-tooling-maven-instead-of-grape in repository https://gitbox.apache.org/repos/asf/camel.git commit 121f6535d634fbf69d3d22597552fa7d46e648f4 Author: Nicolas Filotto AuthorDate: Thu Oct 5 16:06:12 2023 +0200 doc: fix the way to call the plugin --- .../src/main/docs/camel-report-maven-plugin.adoc | 4 ++-- docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc| 4 ++-- tests/camel-itest/pom.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc b/catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc index 5f83010137a..9da9525fcf2 100644 --- a/catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc +++ b/catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc @@ -5,7 +5,7 @@ The Camel Report Maven Plugin supports the following goals - camel-report:validate - To validate your source code for invalid Camel endpoint uris - camel-report:route-coverage - To report the coverage of your Camel routes after unit testing -== camel:validate +== camel-report:validate For validating the source code for mis-configured Camel: @@ -172,7 +172,7 @@ $mvn org.apache.camel:camel-report-maven-plugin:3.0.0:validate -Dcamel.includeTe -== camel:route-coverage +== camel-report:route-coverage For generating a report of the coverage of your Camel routes from unit testing. In the same manner you can generate Java code coverage reports, then this is the same but for Camel routes. diff --git a/docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc b/docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc index 5f83010137a..9da9525fcf2 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc @@ -5,7 +5,7 @@ The Camel Report Maven Plugin supports the following goals - camel-report:validate - To validate your source code for invalid Camel endpoint uris - camel-report:route-coverage - To report the coverage of your Camel routes after unit testing -== camel:validate +== camel-report:validate For validating the source code for mis-configured Camel: @@ -172,7 +172,7 @@ $mvn org.apache.camel:camel-report-maven-plugin:3.0.0:validate -Dcamel.includeTe -== camel:route-coverage +== camel-report:route-coverage For generating a report of the coverage of your Camel routes from unit testing. In the same manner you can generate Java code coverage reports, then this is the same but for Camel routes. diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index c2bfb4a72bb..f3aa595e4d0 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -395,7 +395,7 @@ - + org.apache.camel camel-report-maven-plugin
[camel] branch CAMEL-19950/use-camel-tooling-maven-instead-of-grape updated (2297ab8353b -> 121f6535d63)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-19950/use-camel-tooling-maven-instead-of-grape in repository https://gitbox.apache.org/repos/asf/camel.git omit 2297ab8353b doc: fix the way to call the plugin new 121f6535d63 doc: fix the way to call the plugin 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 (2297ab8353b) \ N -- N -- N refs/heads/CAMEL-19950/use-camel-tooling-maven-instead-of-grape (121f6535d63) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/docs/camel-report-maven-plugin.adoc| 2 +- docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Re: [PR] CAMEL-19950: camel-report-maven-plugin - Get rid of grape [camel]
essobedo commented on code in PR #11655: URL: https://github.com/apache/camel/pull/11655#discussion_r1347522299 ## catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc: ## @@ -172,7 +172,7 @@ $mvn org.apache.camel:camel-report-maven-plugin:3.0.0:validate -Dcamel.includeTe -== camel:route-coverage +== camel-camel:route-coverage Review Comment: OOPS, LOL, good 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. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-19950: camel-report-maven-plugin - Get rid of grape [camel]
davsclaus commented on code in PR #11655: URL: https://github.com/apache/camel/pull/11655#discussion_r1347512430 ## docs/user-manual/modules/ROOT/pages/camel-report-maven-plugin.adoc: ## @@ -172,7 +172,7 @@ $mvn org.apache.camel:camel-report-maven-plugin:3.0.0:validate -Dcamel.includeTe -== camel:route-coverage +== camel-camel:route-coverage Review Comment: camel-report ## catalog/camel-report-maven-plugin/src/main/docs/camel-report-maven-plugin.adoc: ## @@ -172,7 +172,7 @@ $mvn org.apache.camel:camel-report-maven-plugin:3.0.0:validate -Dcamel.includeTe -== camel:route-coverage +== camel-camel:route-coverage Review Comment: camel-report -- 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 4743-azure-key-vault deleted (was 2d50c92c0)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 4743-azure-key-vault in repository https://gitbox.apache.org/repos/asf/camel-k.git was 2d50c92c0 Kamelet - Inject secret in Vaults - Azure Key Vault The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-k] branch main updated: Kamelet - Inject secret in Vaults - Azure Key Vault (#4798)
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-k.git
The following commit(s) were added to refs/heads/main by this push:
new 062b21a09 Kamelet - Inject secret in Vaults - Azure Key Vault (#4798)
062b21a09 is described below
commit 062b21a09a96d734e886d1e9a0e49f4769dbce72
Author: Andrea Cosentino
AuthorDate: Thu Oct 5 16:20:42 2023 +0200
Kamelet - Inject secret in Vaults - Azure Key Vault (#4798)
* Kamelet - Inject secret in Vaults - Azure Key Vault
Signed-off-by: Andrea Cosentino
* Kamelet - Inject secret in Vaults - Azure Key Vault
Signed-off-by: Andrea Cosentino
-
Signed-off-by: Andrea Cosentino
---
addons/vault/azure/azure_key_vault.go | 36 ++-
addons/vault/azure/azure_key_vault_test.go | 110 -
docs/modules/traits/pages/aws-secrets-manager.adoc | 4 +-
docs/modules/traits/pages/azure-key-vault.adoc | 8 +-
resources/traits.yaml | 25 +++--
5 files changed, 165 insertions(+), 18 deletions(-)
diff --git a/addons/vault/azure/azure_key_vault.go
b/addons/vault/azure/azure_key_vault.go
index 76ecee985..5ab1ab0f6 100644
--- a/addons/vault/azure/azure_key_vault.go
+++ b/addons/vault/azure/azure_key_vault.go
@@ -18,8 +18,11 @@ limitations under the License.
package azure
import (
+ "regexp"
"strconv"
+ "github.com/apache/camel-k/v2/pkg/util/kubernetes"
+
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
"github.com/apache/camel-k/v2/pkg/trait"
@@ -50,7 +53,9 @@ type Trait struct {
TenantID string `property:"tenant-id" json:"tenantId,omitempty"`
// The Azure Client Id for accessing Key Vault
ClientID string `property:"client-id" json:"clientId,omitempty"`
- // The Azure Client Secret for accessing Key Vault
+ // The Azure Client Secret for accessing Key Vault. This could be a
plain text or a configmap/secret.
+ // The content of the azure key vault client secret is expected to be a
text containing a valid Client Secret.
+ // Syntax: [configmap|secret]:name[/key], where name represents the
resource name, key optionally represents the resource key to be filtered
(default key value = azure-key-vault-client-secret).
ClientSecret string `property:"client-secret"
json:"clientSecret,omitempty"`
// The Azure Vault Name for accessing Key Vault
VaultName string `property:"vault-name" json:"vaultName,omitempty"`
@@ -66,7 +71,9 @@ type Trait struct {
EventhubConnectionString string `property:"eventhub-connection-string"
json:"eventhubConnectionString,omitempty"`
// If Refresh is enabled, the account name for Azure Storage Blob
service used to save checkpoint while consuming from Eventhub
BlobAccountName string `property:"blob-account-name"
json:"blobAccountName,omitempty"`
- // If Refresh is enabled, the access key for Azure Storage Blob service
used to save checkpoint while consuming from Eventhub
+ // If Refresh is enabled, the access key for Azure Storage Blob service
used to save checkpoint while consuming from Eventhub. This could be a plain
text or a configmap/secret.
+ // The content of the azure key vault blob access key is expected to be
a text containing a valid Access Key for Azure Storage Blob.
+ // Syntax: [configmap|secret]:name[/key], where name represents the
resource name, key optionally represents the resource key to be filtered
(default key value = azure-storage-blob-access-key).
BlobAccessKey string `property:"blob-access-key"
json:"blobAccessKey,omitempty"`
// If Refresh is enabled, the container name for Azure Storage Blob
service used to save checkpoint while consuming from Eventhub
BlobContainerName string `property:"blob-container-name"
json:"blobContainerName,omitempty"`
@@ -104,6 +111,7 @@ func (t *azureKeyVaultTrait) Configure(environment
*trait.Environment) (bool, er
}
func (t *azureKeyVaultTrait) Apply(environment *trait.Environment) error {
+ rex :=
regexp.MustCompile(`^(configmap|secret):([a-zA-Z0-9][a-zA-Z0-9-]*)(/([a-zA-Z0-9].*))?$`)
if environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) {
util.StringSliceUniqueAdd(&environment.Integration.Status.Capabilities,
v1.CapabilityAzureKeyVault)
// Deprecated
@@ -112,9 +120,30 @@ func (t *azureKeyVaultTrait) Apply(environment
*trait.Environment) error {
}
if environment.IntegrationInRunningPhases() {
+ hits := rex.FindAllStringSubmatch(t.ClientSecret, -1)
+ if len(hits) >= 1 {
+ var res, _ = v1.DecodeValueSource(t.ClientSecret,
"azure-key-vault-client-secret",
Re: [PR] Kamelet - Inject secret in Vaults - Azure Key Vault [camel-k]
oscerd merged PR #4798: URL: https://github.com/apache/camel-k/pull/4798 -- 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
Re: [PR] CAMEL-19950: camel-report-maven-plugin - Get rid of grape [camel]
github-actions[bot] commented on PR #11655: URL: https://github.com/apache/camel/pull/11655#issuecomment-1748991670 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- 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 (2f6371c645e -> e9d644f8f56)
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 2f6371c645e CAMEL-19957: camel-jbang - Avoid adding double kamelet dir if using both --source-dir and --local-kamelet-dir for the same folder. add f04688f59ee CAMEL-19555: added assertions to the camel-spring-main tests (#11653) add e9d644f8f56 Regen No new revisions were added by this update. Summary of changes: .../org/apache/camel/spring/MainDummyTest.java | 28 +++- .../org/apache/camel/spring/MainExampleTest.java | 51 +- .../java/org/apache/camel/spring/MainVetoTest.java | 25 +++ .../camel/spring/MultipleCamelContextTest.java | 10 +++-- .../spring/SpringMainStartFailedIssueTest.java | 12 ++--- 5 files changed, 75 insertions(+), 51 deletions(-)
[PR] CAMEL-19950: camel-report-maven-plugin - Get rid of grape [camel]
essobedo opened a new pull request, #11655: URL: https://github.com/apache/camel/pull/11655 Fixes https://issues.apache.org/jira/browse/CAMEL-19950 ## Motivation The maven plugin `camel-report-maven-plugin` still uses Groovy Grape and we would like to get rid of it. ## Modifications: * Change the dependency `camel-catalog-maven-grape` for `camel-catalog-maven` * Add explicitly the dependencies that cause a warning when not scoped with `provided` * Adapt the code of `MavenDownloaderImpl` to accept predefined `RepositorySystem`, `RepositorySystemSession`, and `Settings` to ensure that internal maven classes are not used during initialization * Remove the artifact `camel-catalog-maven-grape` and its references as it is no longer used ## Result: ``` mvn camel-report:validate -pl tests/camel-itest [INFO] Scanning for projects... [INFO] [INFO] < org.apache.camel:camel-itest > [INFO] Building Camel :: Integration Tests 4.1.0-SNAPSHOT [INFO] from pom.xml [INFO] [ jar ]- [INFO] [INFO] --- camel-report:4.1.0-SNAPSHOT:validate (default-cli) @ camel-itest --- [INFO] Detected Camel version used in project: 4.1.0-SNAPSHOT [INFO] Validating using Camel version: 4.1.0-SNAPSHOT [INFO] Endpoint validation success: (433 = passed, 0 = invalid, 6 = incapable, 2 = unknown components, 0 = deprecated options) [WARNING] Simple validation error at: org.apache.camel.itest.greeter.JettyRecipientListCxfIssueTest(JettyRecipientListCxfIssueTest.xml:76) Illegal syntax: resource:greetMe-reply1.xml [WARNING] Simple validation error at: org.apache.camel.itest.greeter.JettyRecipientListCxfIssueTest(JettyRecipientListCxfIssueTest.xml:89) Illegal syntax: resource:greetMe-reply2.xml [WARNING] Simple validation error: (17 = passed, 2 = invalid) [WARNING] Endpoint pair (seda/direct) validation error at: spring-config.server-applicationContext(server-applicationContext.xml:61) direct:serverInbound serverInbound Sending to non existing direct queue name [WARNING] Endpoint pair (seda/direct) validation error at: spring-config.server-WsAddressingContext(server-WsAddressingContext.xml:62) direct:serverInbound serverInbound Sending to non existing direct queue name [WARNING] Endpoint pair (seda/direct) validation error: (3 = pairs, 2 = non-pairs) [INFO] Duplicate route id validation success: (64 = ids) [INFO] [INFO] BUILD FAILURE [INFO] [INFO] Total time: 5.641 s [INFO] Finished at: 2023-10-05T16:14:05+02:00 [INFO] [ERROR] Failed to execute goal org.apache.camel:camel-report-maven-plugin:4.1.0-SNAPSHOT:validate (default-cli) on project camel-itest: Endpoint validation success: (433 = passed, 0 = invalid, 6 = incapable, 2 = unknown components, 0 = deprecated options) [ERROR] Simple validation error: (17 = passed, 2 = invalid) [ERROR] Duplicate route id validation success: (64 = ids) [ERROR] Endpoint pair (seda/direct) validation error: (3 = pairs, 2 = non-pairs) [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException ``` ``` -- 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
