Re: [PR] Bump google-auth-library-oauth2-http-version from 1.20.0 to 1.21.0 [camel]
github-actions[bot] commented on PR #12662: URL: https://github.com/apache/camel/pull/12662#issuecomment-1877360667 :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 dependabot/maven/google-auth-library-oauth2-http-version-1.21.0 created (now da9e66e1e7d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/google-auth-library-oauth2-http-version-1.21.0 in repository https://gitbox.apache.org/repos/asf/camel.git at da9e66e1e7d Bump google-auth-library-oauth2-http-version from 1.20.0 to 1.21.0 No new revisions were added by this update.
[PR] Bump google-auth-library-oauth2-http-version from 1.20.0 to 1.21.0 [camel]
dependabot[bot] opened a new pull request, #12662: URL: https://github.com/apache/camel/pull/12662 Bumps `google-auth-library-oauth2-http-version` from 1.20.0 to 1.21.0. Updates `com.google.auth:google-auth-library-oauth2-http` from 1.20.0 to 1.21.0 Updates `com.google.auth:google-auth-library-credentials` from 1.20.0 to 1.21.0 Release notes Sourced from https://github.com/googleapis/google-auth-library-java/releases;>com.google.auth:google-auth-library-credentials's releases. v1.21.0 https://github.com/googleapis/google-auth-library-java/compare/v1.20.0...v1.21.0;>1.21.0 (2023-12-21) Features Add code sample and test for getting an access token from an impersonated SA (https://redirect.github.com/googleapis/google-auth-library-java/issues/1289;>#1289) (https://github.com/googleapis/google-auth-library-java/commit/826ee4007d3e0600dfdf42383f56dbcf6cdd4cec;>826ee40) Multi universe support, adding universe_domain field (https://redirect.github.com/googleapis/google-auth-library-java/issues/1282;>#1282) (https://github.com/googleapis/google-auth-library-java/commit/7eb322e3af6bce85774b2a1051242a4b62b53963;>7eb322e) Bug Fixes Remove -Xlint:unchecked, suppress all existing violations, add https://github.com/CanIgnoreReturnValue;>@​CanIgnoreReturnValue (https://redirect.github.com/googleapis/google-auth-library-java/issues/1324;>#1324) (https://github.com/googleapis/google-auth-library-java/commit/04dfd40c57b89c2d55327d5ea08036d749ebac02;>04dfd40) Documentation Update README.md to link to Cloud authentication documentation rather than AIPs (https://github.com/googleapis/google-auth-library-java/commit/98fc7e1f2f551d59811de63eaef0df6bf8e21c2c;>98fc7e1) Changelog Sourced from https://github.com/googleapis/google-auth-library-java/blob/main/CHANGELOG.md;>com.google.auth:google-auth-library-credentials's changelog. https://github.com/googleapis/google-auth-library-java/compare/v1.20.0...v1.21.0;>1.21.0 (2023-12-21) Features Add code sample and test for getting an access token from an impersonated SA (https://redirect.github.com/googleapis/google-auth-library-java/issues/1289;>#1289) (https://github.com/googleapis/google-auth-library-java/commit/826ee4007d3e0600dfdf42383f56dbcf6cdd4cec;>826ee40) Multi universe support, adding universe_domain field (https://redirect.github.com/googleapis/google-auth-library-java/issues/1282;>#1282) (https://github.com/googleapis/google-auth-library-java/commit/7eb322e3af6bce85774b2a1051242a4b62b53963;>7eb322e) Bug Fixes Remove -Xlint:unchecked, suppress all existing violations, add https://github.com/CanIgnoreReturnValue;>@​CanIgnoreReturnValue (https://redirect.github.com/googleapis/google-auth-library-java/issues/1324;>#1324) (https://github.com/googleapis/google-auth-library-java/commit/04dfd40c57b89c2d55327d5ea08036d749ebac02;>04dfd40) Documentation Update README.md to link to Cloud authentication documentation rather than AIPs (https://github.com/googleapis/google-auth-library-java/commit/98fc7e1f2f551d59811de63eaef0df6bf8e21c2c;>98fc7e1) Commits https://github.com/googleapis/google-auth-library-java/commit/ffb5bd2012e924d67b47aeb5aa31902f2c439dd0;>ffb5bd2 chore(main): release 1.21.0 (https://redirect.github.com/googleapis/google-auth-library-java/issues/1298;>#1298) https://github.com/googleapis/google-auth-library-java/commit/98fc7e1f2f551d59811de63eaef0df6bf8e21c2c;>98fc7e1 docs: Update README.md to link to Cloud authentication documentation rather t... https://github.com/googleapis/google-auth-library-java/commit/7eb322e3af6bce85774b2a1051242a4b62b53963;>7eb322e feat: multi universe support, adding universe_domain field (https://redirect.github.com/googleapis/google-auth-library-java/issues/1282;>#1282) https://github.com/googleapis/google-auth-library-java/commit/5f0628c80714691564eea099ff1ba19646ed1dea;>5f0628c chore: make kokoro cfgs version agnostic (https://redirect.github.com/googleapis/google-auth-library-java/issues/1344;>#1344) https://github.com/googleapis/google-auth-library-java/commit/9e6cdb9b9e02e1f3406fc07340d5dc24bf7c357d;>9e6cdb9 chore: add java-shared-config as parent for consolidated version management (... https://github.com/googleapis/google-auth-library-java/commit/1e6b1a0dcf6895eb1ab9623a21f6d8144f5c862c;>1e6b1a0 ci: Update ci.yaml to introduce Java 21 unit testing (https://redirect.github.com/googleapis/google-auth-library-java/issues/1907;>#1907) (https://redirect.github.com/googleapis/google-auth-library-java/issues/1338;>#1338) https://github.com/googleapis/google-auth-library-java/commit/04dfd40c57b89c2d55327d5ea08036d749ebac02;>04dfd40 fix: Remove -Xlint:unchecked, suppress all existing violations, add https://github.com/CanIgnor;>@​CanIgnor...
Re: [PR] Bump huaweicloud-sdk-version from 3.1.75-patch to 3.1.76 [camel]
github-actions[bot] commented on PR #12661: URL: https://github.com/apache/camel/pull/12661#issuecomment-1877356050 :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 dependabot/maven/huaweicloud-sdk-version-3.1.76 created (now 92a95fba975)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/huaweicloud-sdk-version-3.1.76 in repository https://gitbox.apache.org/repos/asf/camel.git at 92a95fba975 Bump huaweicloud-sdk-version from 3.1.75-patch to 3.1.76 No new revisions were added by this update.
[PR] Bump huaweicloud-sdk-version from 3.1.75-patch to 3.1.76 [camel]
dependabot[bot] opened a new pull request, #12661: URL: https://github.com/apache/camel/pull/12661 Bumps `huaweicloud-sdk-version` from 3.1.75-patch to 3.1.76. Updates `com.huaweicloud.sdk:huaweicloud-sdk-core` from 3.1.75-patch to 3.1.76 Release notes Sourced from https://github.com/huaweicloud/huaweicloud-sdk-java-v3/releases;>com.huaweicloud.sdk:huaweicloud-sdk-core's releases. v3.1.76 Release 3.1.76 Commits https://github.com/huaweicloud/huaweicloud-sdk-java-v3/commit/b2bc4c986244cc6b869426f50af24f44c6fc4ddd;>b2bc4c9 release 3.1.76 source code See full diff in https://github.com/huaweicloud/huaweicloud-sdk-java-v3/compare/v3.1.75-patch...v3.1.76;>compare view Updates `com.huaweicloud.sdk:huaweicloud-sdk-frs` from 3.1.75-patch to 3.1.76 Updates `com.huaweicloud.sdk:huaweicloud-sdk-functiongraph` from 3.1.75-patch to 3.1.76 Updates `com.huaweicloud.sdk:huaweicloud-sdk-iam` from 3.1.75-patch to 3.1.76 Updates `com.huaweicloud.sdk:huaweicloud-sdk-image` from 3.1.75-patch to 3.1.76 Updates `com.huaweicloud.sdk:huaweicloud-sdk-smn` from 3.1.75-patch to 3.1.76 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
Re: [PR] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
apupier commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877319632 release notes: https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.16 -- 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: feat: add support for glob pattern in run sources
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 bf0e79b97 feat: add support for glob pattern in run sources
bf0e79b97 is described below
commit bf0e79b973344e12f556ba9e170c0eb9f8130771
Author: Rinaldo Pitzer Jr <16694899+rinaldo...@users.noreply.github.com>
AuthorDate: Tue Jan 2 15:02:07 2024 -0300
feat: add support for glob pattern in run sources
---
e2e/common/cli/files/glob/Java1.java | 27 +
e2e/common/cli/files/glob/Java2.java | 27 +
e2e/common/cli/files/glob/run1.yaml | 25
e2e/common/cli/files/glob/run2.yaml | 25
e2e/common/cli/run_test.go | 40 +
pkg/cmd/run_test.go | 113 +++
pkg/cmd/source/source.go | 34 +++
pkg/cmd/source/util.go | 20 +++
pkg/resources/resources.go | 8 +--
9 files changed, 315 insertions(+), 4 deletions(-)
diff --git a/e2e/common/cli/files/glob/Java1.java
b/e2e/common/cli/files/glob/Java1.java
new file mode 100644
index 0..554fb9473
--- /dev/null
+++ b/e2e/common/cli/files/glob/Java1.java
@@ -0,0 +1,27 @@
+/*
+ * 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 org.apache.camel.builder.RouteBuilder;
+
+public class Java1 extends RouteBuilder {
+ @Override
+ public void configure() throws Exception {
+ from("timer:tick?period=5000")
+ .setBody().simple("Hello java 1 {{property:default}}")
+ .log("${body}");
+ }
+}
diff --git a/e2e/common/cli/files/glob/Java2.java
b/e2e/common/cli/files/glob/Java2.java
new file mode 100644
index 0..1c8e2d714
--- /dev/null
+++ b/e2e/common/cli/files/glob/Java2.java
@@ -0,0 +1,27 @@
+/*
+ * 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 org.apache.camel.builder.RouteBuilder;
+
+public class Java2 extends RouteBuilder {
+ @Override
+ public void configure() throws Exception {
+ from("timer:tick?period=6000")
+ .setBody().simple("Hello java 2 {{property:default}}")
+ .log("${body}");
+ }
+}
diff --git a/e2e/common/cli/files/glob/run1.yaml
b/e2e/common/cli/files/glob/run1.yaml
new file mode 100644
index 0..10e1fc1eb
--- /dev/null
+++ b/e2e/common/cli/files/glob/run1.yaml
@@ -0,0 +1,25 @@
+# ---
+# 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.
+# ---
+
+- from:
+uri: "timer:yaml"
+parameters:
+ period:
Re: [I] Wildcards in Routes Sources [camel-k]
squakez closed issue #4941: Wildcards in Routes Sources URL: https://github.com/apache/camel-k/issues/4941 -- 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: add support for glob pattern in run sources [camel-k]
squakez merged PR #5015: URL: https://github.com/apache/camel-k/pull/5015 -- 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] Integrations fail with Jib publish strategy [camel-k]
squakez closed issue #5007: Integrations fail with Jib publish strategy URL: https://github.com/apache/camel-k/issues/5007 -- 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(#5007): Jib publish strategy registry secret [camel-k]
squakez merged PR #5016: URL: https://github.com/apache/camel-k/pull/5016 -- 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] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
apupier commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877315666 failing tests are due to known flakiness https://issues.apache.org/jira/browse/CAMEL-20279 -- 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(#5007): Jib publish strategy registry secret
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 c0a91777a fix(#5007): Jib publish strategy registry secret
c0a91777a is described below
commit c0a91777a897a5bd62c6a69a5b5325cf6abd29d2
Author: Gaelle Fournier
AuthorDate: Wed Jan 3 10:16:04 2024 +0100
fix(#5007): Jib publish strategy registry secret
---
pkg/builder/jib.go | 29 ---
pkg/builder/spectrum.go| 39 ++--
pkg/util/jib/configuration.go | 3 +++
pkg/util/registry/registry.go | 40 +
pkg/util/registry/registry_test.go | 41 ++
5 files changed, 108 insertions(+), 44 deletions(-)
diff --git a/pkg/builder/jib.go b/pkg/builder/jib.go
index 264c95a08..129e978b0 100644
--- a/pkg/builder/jib.go
+++ b/pkg/builder/jib.go
@@ -30,6 +30,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/jib"
"github.com/apache/camel-k/v2/pkg/util/log"
"github.com/apache/camel-k/v2/pkg/util/maven"
+ "github.com/apache/camel-k/v2/pkg/util/registry"
)
type jibTask struct {
@@ -89,18 +90,13 @@ func (t *jibTask) Do(ctx context.Context) v1.BuildStatus {
registryConfigDir := ""
if t.task.Registry.Secret != "" {
- registryConfigDir, err = MountSecret(ctx, t.c,
t.build.Namespace, t.task.Registry.Secret)
+ registryConfigDir, err =
registry.MountSecretRegistryConfig(ctx, t.c, t.build.Namespace, "jib-secret-",
t.task.Registry.Secret)
+ os.Setenv(jib.JibRegistryConfigEnvVar, registryConfigDir)
if err != nil {
return status.Failed(err)
}
}
- if registryConfigDir != "" {
- if err := os.RemoveAll(registryConfigDir); err != nil {
- return status.Failed(err)
- }
- }
-
// TODO refactor maven code to avoid creating a file to pass command
args
mavenCommand, err := util.ReadFile(filepath.Join(mavenDir,
"MAVEN_CONTEXT"))
if err != nil {
@@ -125,8 +121,10 @@ func (t *jibTask) Do(ctx context.Context) v1.BuildStatus {
cmd.Dir = mavenDir
myerror := util.RunAndLog(ctx, cmd, maven.MavenLogHandler,
maven.MavenLogHandler)
+
if myerror != nil {
log.Errorf(myerror, "jib integration image containerization did
not run successfully")
+ _ = cleanRegistryConfig(registryConfigDir)
return status.Failed(myerror)
} else {
log.Debug("jib integration image containerization did run
successfully")
@@ -135,10 +133,27 @@ func (t *jibTask) Do(ctx context.Context) v1.BuildStatus {
// retrieve image digest
mavenDigest, errDigest := util.ReadFile(filepath.Join(mavenDir,
jib.JibDigestFile))
if errDigest != nil {
+ _ = cleanRegistryConfig(registryConfigDir)
return status.Failed(errDigest)
}
status.Digest = string(mavenDigest)
}
+ if registryConfigDir != "" {
+ if err := cleanRegistryConfig(registryConfigDir); err != nil {
+ return status.Failed(err)
+ }
+ }
+
return status
}
+
+func cleanRegistryConfig(registryConfigDir string) error {
+ if err := os.Unsetenv(jib.JibRegistryConfigEnvVar); err != nil {
+ return err
+ }
+ if err := os.RemoveAll(registryConfigDir); err != nil {
+ return err
+ }
+ return nil
+}
diff --git a/pkg/builder/spectrum.go b/pkg/builder/spectrum.go
index c30f6f743..dbe70d7b5 100644
--- a/pkg/builder/spectrum.go
+++ b/pkg/builder/spectrum.go
@@ -26,16 +26,13 @@ import (
"runtime"
"strings"
- "go.uber.org/multierr"
-
spectrum "github.com/container-tools/spectrum/pkg/builder"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/client"
"github.com/apache/camel-k/v2/pkg/util"
"github.com/apache/camel-k/v2/pkg/util/log"
+ "github.com/apache/camel-k/v2/pkg/util/registry"
)
type spectrumTask struct {
@@ -105,7 +102,7 @@ func (t *spectrumTask) Do(ctx context.Context)
v1.BuildStatus {
registryConfigDir := ""
if t.task.Registry.Secret != "" {
- registryConfigDir, err = MountSecret(ctx, t.c,
t.build.Namespace, t.task.Registry.Secret)
+ registryConfigDir, err =
registry.MountSecretRegistryConfig(ctx, t.c, t.build.Namespace,
"spectrum-secret-", t.task.Registry.Secret)
if err != nil {
return
(camel-quarkus) branch camel-main updated: Quick workaround to make micrometer-deployment pass.
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 8599e883b3 Quick workaround to make micrometer-deployment pass.
8599e883b3 is described below
commit 8599e883b364a4d6ef096322081f45501c68e2b7
Author: JiriOndrusek
AuthorDate: Thu Jan 4 16:31:17 2024 +0100
Quick workaround to make micrometer-deployment pass.
---
.../deployment/MicrometerMetricsConfigDefaultsTest.java | 2 +-
pom.xml | 1 +
poms/bom/pom.xml | 5 +
poms/bom/src/main/generated/flattened-full-pom.xml| 11 +--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 +
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 +
6 files changed, 22 insertions(+), 7 deletions(-)
diff --git
a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java
b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java
index cf0612ee43..f1e55cf781 100644
---
a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java
+++
b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java
@@ -63,7 +63,7 @@ public class MicrometerMetricsConfigDefaultsTest {
.stream()
.filter(eventNotifier ->
!eventNotifier.getClass().getName().contains("BaseMainSupport"))
.collect(Collectors.toList());
-assertEquals(2, eventNotifiers.size());
+assertEquals(3, eventNotifiers.size());
ThreadPoolFactory threadPoolFactory =
context.getExecutorServiceManager().getThreadPoolFactory();
assertNotNull(threadPoolFactory);
diff --git a/pom.xml b/pom.xml
index d5ce616ad3..6e710771d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,6 +152,7 @@
${snakeyaml-engine-version}
${spring-version}
${spring-data-redis-version}
+1.1.2-pre.1
0.43.1
1.6.0
2.7.2
3.5.13
+
+org.mvnpm.at.lit-labs
+ssr-dom-shim
+1.1.2-pre.1
+
org.optaplanner
optaplanner-quarkus
@@ -22595,12 +22600,6 @@
mockito-inline
5.2.0
-
-org.mvnpm.at.lit-labs
-ssr-dom-shim
-1.1.0
-runtime
-
org.mvnpm.at.lit
reactive-element
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index f5e0a5d2b6..56f3f9b93c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6552,6 +6552,11 @@
mybatis
3.5.13
+
+org.mvnpm.at.lit-labs
+ssr-dom-shim
+1.1.2-pre.1
+
org.optaplanner
optaplanner-quarkus
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index caceb22d46..f945dcc6e9 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6552,6 +6552,11 @@
mybatis
3.5.13
+
+org.mvnpm.at.lit-labs
+ssr-dom-shim
+1.1.2-pre.1
+
org.optaplanner
optaplanner-quarkus
[I] [camel-main] Micrometer: version conflict of org.mvnpm.at.lit-labs:ssr-dom-shim [camel-quarkus]
JiriOndrusek opened a new issue, #5636: URL: https://github.com/apache/camel-quarkus/issues/5636 ### Bug description Build of micrometer-deployment fails with: ``` [INFO] --- enforcer:3.0.0-M3:enforce (camel-quarkus-enforcer-rules) @ camel-quarkus-micrometer-deployment --- [WARNING] Dependency convergence error for org.mvnpm.at.lit-labs:ssr-dom-shim:1.1.1 paths to dependency are: +-org.apache.camel.quarkus:camel-quarkus-micrometer-deployment:3.7.0-SNAPSHOT +-io.quarkus:quarkus-micrometer-deployment:3.6.4 +-io.quarkus:quarkus-vertx-http-deployment:3.6.4 +-io.quarkus:quarkus-vertx-http-dev-ui-resources:3.6.4 +-org.mvnpm.at.lit:reactive-element:1.6.3 +-org.mvnpm.at.lit-labs:ssr-dom-shim:1.1.1 and +-org.apache.camel.quarkus:camel-quarkus-micrometer-deployment:3.7.0-SNAPSHOT +-io.quarkus:quarkus-micrometer-deployment:3.6.4 +-io.quarkus:quarkus-vertx-http-deployment:3.6.4 +-io.quarkus:quarkus-vertx-http-dev-ui-resources:3.6.4 +-org.mvnpm:lit-element:3.3.3 +-org.mvnpm.at.lit-labs:ssr-dom-shim:1.1.2-pre.1 and +-org.apache.camel.quarkus:camel-quarkus-micrometer-deployment:3.7.0-SNAPSHOT +-io.quarkus:quarkus-micrometer-deployment:3.6.4 +-io.quarkus:quarkus-vertx-http-deployment:3.6.4 +-io.quarkus:quarkus-vertx-http-dev-ui-resources:3.6.4 +-org.mvnpm.at.lit-labs:ssr-dom-shim:1.1.1 ``` Quick workaround, which should be reverted, is forced higher version in the cq BOM. -- 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.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kameleon) branch main updated: upgrade camel to 4.0.3 (#41)
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-kameleon.git
The following commit(s) were added to refs/heads/main by this push:
new 9a9a3d5 upgrade camel to 4.0.3 (#41)
9a9a3d5 is described below
commit 9a9a3d5fe71745741f1064c79b5b90b5bb987084
Author: Duncan O N
AuthorDate: Thu Jan 4 18:26:57 2024 +0300
upgrade camel to 4.0.3 (#41)
---
src/main/resources/kameleon.json | 9 +
1 file changed, 9 insertions(+)
diff --git a/src/main/resources/kameleon.json b/src/main/resources/kameleon.json
index 5d958f9..ff54426 100644
--- a/src/main/resources/kameleon.json
+++ b/src/main/resources/kameleon.json
@@ -48,6 +48,15 @@
"pageTitle": "Camel Spring Boot",
"componentListTitle": "Camel components",
"versions": [
+ {
+ "name": "4.0.3",
+ "suffix": "LTS",
+ "javaVersions": ["17"],
+ "defaultJava": "17",
+ "runtimeVersion": "",
+ "archetypeGroupId": "org.apache.camel.archetypes",
+ "archetypeArtifactId": "camel-archetype-spring-boot"
+},
{
"name": "3.20.5",
"suffix": "LTS",
Re: [PR] upgrade camel to 4.0.3 [camel-kameleon]
mgubaidullin merged PR #41: URL: https://github.com/apache/camel-kameleon/pull/41 -- 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] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
github-actions[bot] commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877258809 :robot: The Apache Camel test robot will run the tests for you :+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
(camel) branch CAMEL-20296/exclude-it-folders deleted (was 8187bc2ffb3)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-20296/exclude-it-folders in repository https://gitbox.apache.org/repos/asf/camel.git was 8187bc2ffb3 CAMEL-20296: component-test - Exclude IT folders 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) branch main updated: CAMEL-20296: component-test - Exclude IT folders (#12660)
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 6ddeeafd2a5 CAMEL-20296: component-test - Exclude IT folders (#12660)
6ddeeafd2a5 is described below
commit 6ddeeafd2a5e9dbd8e8d64c90e18f4ca74ba6097
Author: Nicolas Filotto
AuthorDate: Thu Jan 4 16:07:53 2024 +0100
CAMEL-20296: component-test - Exclude IT folders (#12660)
## Motivation
The GitHub action component-test tries to build maven projects that are
integration tests while it should ignore them.
## Modifications:
* Exclude folders related to integration tests when trying to autodetect
the root of sub-projects.
---
.github/actions/component-test/component-test.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/actions/component-test/component-test.sh
b/.github/actions/component-test/component-test.sh
index 8b17efc4f56..73555c72835 100755
--- a/.github/actions/component-test/component-test.sh
+++ b/.github/actions/component-test/component-test.sh
@@ -27,7 +27,7 @@ function main() {
local componentList="${commentBody:16}"
echo "The list of components to test is ${componentList}"
else
-echo "No components has been detected, the expected format is
'/component-test (camel-)component-name1 (camel-)component-name2...'"
+echo "No components have been detected, the expected format is
'/component-test (camel-)component-name1 (camel-)component-name2...'"
exit 1
fi
local pl=""
@@ -39,7 +39,7 @@ function main() {
componentPath="components/camel-${component}"
fi
if [[ -d "${componentPath}" ]] ; then
- pl="$pl$(find "${componentPath}" -name pom.xml -exec dirname {} \; |
sort | tr -s "\n" ",")"
+ pl="$pl$(find "${componentPath}" -name pom.xml -not -path "*/src/it/*"
-exec dirname {} \; | sort | tr -s "\n" ",")"
fi
done
len=${#pl}
Re: [PR] CAMEL-20296: component-test - Exclude IT folders [camel]
essobedo merged PR #12660: URL: https://github.com/apache/camel/pull/12660 -- 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-20296: component-test - Exclude IT folders [camel]
github-actions[bot] commented on PR #12660: URL: https://github.com/apache/camel/pull/12660#issuecomment-1877243250 :robot: The Apache Camel test robot will run the tests for you :+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] CAMEL-20296: component-test - Exclude IT folders [camel]
essobedo commented on PR #12660: URL: https://github.com/apache/camel/pull/12660#issuecomment-1877242566 /component-test base64 salesforce servicenow seda -- 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-20296: component-test - Exclude IT folders [camel]
github-actions[bot] commented on PR #12660: URL: https://github.com/apache/camel/pull/12660#issuecomment-1877240626 :robot: The Apache Camel test robot will run the tests for you :+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] CAMEL-20296: component-test - Exclude IT folders [camel]
apupier commented on PR #12660: URL: https://github.com/apache/camel/pull/12660#issuecomment-1877239861 /component-test salesforce servicenow -- 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] CAMEL-20296: component-test - Exclude IT folders [camel]
essobedo opened a new pull request, #12660: URL: https://github.com/apache/camel/pull/12660 Fixes https://issues.apache.org/jira/browse/CAMEL-20296 ## Motivation The GitHub action component-test tries to build maven projects that are integration tests while it should ignore them. ## Modifications: * Exclude folders related to integration tests when trying to autodetect the root of sub-projects. -- 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: CAMEL-20296: component-test - Exclude IT folders
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-20296/exclude-it-folders
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8187bc2ffb39f319d450891fe01cd7135acc7176
Author: Nicolas Filotto
AuthorDate: Thu Jan 4 15:57:26 2024 +0100
CAMEL-20296: component-test - Exclude IT folders
---
.github/actions/component-test/component-test.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/actions/component-test/component-test.sh
b/.github/actions/component-test/component-test.sh
index 8b17efc4f56..73555c72835 100755
--- a/.github/actions/component-test/component-test.sh
+++ b/.github/actions/component-test/component-test.sh
@@ -27,7 +27,7 @@ function main() {
local componentList="${commentBody:16}"
echo "The list of components to test is ${componentList}"
else
-echo "No components has been detected, the expected format is
'/component-test (camel-)component-name1 (camel-)component-name2...'"
+echo "No components have been detected, the expected format is
'/component-test (camel-)component-name1 (camel-)component-name2...'"
exit 1
fi
local pl=""
@@ -39,7 +39,7 @@ function main() {
componentPath="components/camel-${component}"
fi
if [[ -d "${componentPath}" ]] ; then
- pl="$pl$(find "${componentPath}" -name pom.xml -exec dirname {} \; |
sort | tr -s "\n" ",")"
+ pl="$pl$(find "${componentPath}" -name pom.xml -not -path "*/src/it/*"
-exec dirname {} \; | sort | tr -s "\n" ",")"
fi
done
len=${#pl}
(camel) branch CAMEL-20296/exclude-it-folders created (now 8187bc2ffb3)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-20296/exclude-it-folders in repository https://gitbox.apache.org/repos/asf/camel.git at 8187bc2ffb3 CAMEL-20296: component-test - Exclude IT folders This branch includes the following new commits: new 8187bc2ffb3 CAMEL-20296: component-test - Exclude IT folders The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch regen_bot updated (838b40b1542 -> a8917e8920c)
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 838b40b1542 (chores) camel-netty-http: use StandardCharsets for decoding headers (#12655) add 11f68102c1d (chores) Ensures logging consistency for events add 2ee3edc37da (chores) Ensures logging consistency for the Exchange add a8917e8920c (chores) Avoid unnecessary hits to the exchange UUID Generator No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 2 +- .../apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java| 2 +- .../main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java | 2 +- .../java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java | 2 +- .../java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java | 2 +- .../main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java| 2 +- .../src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/StepFailedEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/StepStartedEvent.java | 2 +- .../src/main/java/org/apache/camel/support/AbstractExchange.java| 2 +- .../src/main/java/org/apache/camel/support/EventHelper.java | 1 - 15 files changed, 14 insertions(+), 15 deletions(-)
Re: [I] Improve pipe status when the pod is full of exceptions [camel-k]
squakez commented on issue #4977: URL: https://github.com/apache/camel-k/issues/4977#issuecomment-1877190602 I applied a fix that should close this issue. However, that would work when the user defines a startup probe (via health trait for instance). The Integration (hence, the Pipe) won't be moved to the running phase until the Pod ready condition is reached. -- 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] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
github-actions[bot] commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877190257 :robot: The Apache Camel test robot will run the tests for you :+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] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
apupier commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877189502 /component-test jslt plc4x weather leveldb splunk splunk-hec jackson kafka elasticsearch-rest-client graphql cbor rest-openapi openapi-java jolt jacksonxml lumberjack zeebe opensearch jsonpath aws chatscript metrics etcd3 wordpress micrometer knative stitch swift xj jsonata sap-netweaver azure dropbox huawei whatsapp telegram zookeeper-master azure bonita elytron cxf -- 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(ctrl): monitor Pod ready condition [camel-k]
squakez opened a new pull request, #5020: URL: https://github.com/apache/camel-k/pull/5020 When the user uses a startup probe, the Integration won't turn as running until the condition is reached Closes #4977 **Release Note** ```release-note fix(ctrl): monitor Pod ready condition ``` -- 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/03: (chores) Ensures logging consistency for events
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
commit 11f68102c1d390c5264bc6c49d79059fdbf1cb16
Author: Otavio Rodolfo Piske
AuthorDate: Thu Jan 4 14:15:23 2024 +0100
(chores) Ensures logging consistency for events
---
.../apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java| 2 +-
.../main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java | 2 +-
.../java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java | 2 +-
.../java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java | 2 +-
.../main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java| 2 +-
.../src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/StepFailedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/StepStartedEvent.java | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
index 94248d550a7..97b8f01cb08 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java
@@ -38,7 +38,7 @@ public class ExchangeAsyncProcessingStartedEvent extends
AbstractExchangeEvent
}
@Override
-public String toString() {
+public final String toString() {
return getExchange().getExchangeId();
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
index 91ab9cf3470..cdd6c57baf7 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
@@ -31,7 +31,7 @@ public class ExchangeCompletedEvent extends
AbstractExchangeEvent implements Cam
}
@Override
-public String toString() {
+public final String toString() {
return getExchange().getExchangeId() + " exchange completed"
+ " took: " + TimeUtils.printDuration(timeTaken, true);
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
index 02a3dbefef3..050c37bef06 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
@@ -33,7 +33,7 @@ public class ExchangeCreatedEvent extends
AbstractExchangeEvent implements Camel
}
@Override
-public String toString() {
+public final String toString() {
return getExchange().getExchangeId() + " exchange created";
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
index 1d4d811fc6a..b33e5e485ba 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
@@ -32,7 +32,7 @@ public class ExchangeFailedEvent extends
AbstractExchangeEvent implements CamelE
}
@Override
-public String toString() {
+public final String toString() {
Exception cause = getExchange().getException();
if (cause != null) {
return getExchange().getExchangeId() + " exchange failed due to: "
+ cause;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
index a2410aa05c2..4b17d0d7fd8 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
@@ -63,7 +63,7 @@ public class ExchangeFailureHandledEvent extends
AbstractExchangeEvent implement
}
@Override
-public String toString() {
+public final String toString() {
if (isDeadLetterChannel()) {
String uri =
(camel) 03/03: (chores) Avoid unnecessary hits to the exchange UUID Generator
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
commit a8917e8920ce064087c0dc667f12d00630513994
Author: Otavio Rodolfo Piske
AuthorDate: Thu Jan 4 15:12:18 2024 +0100
(chores) Avoid unnecessary hits to the exchange UUID Generator
---
.../src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 2 +-
.../src/main/java/org/apache/camel/support/EventHelper.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index fb75e66a6c7..c5230567ec3 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -244,7 +244,7 @@ public class DefaultUnitOfWork implements UnitOfWork {
@Override
public void done(Exchange exchange) {
if (log.isTraceEnabled()) {
-log.trace("UnitOfWork done for ExchangeId: {} with {}",
exchange.getExchangeId(), exchange);
+log.trace("UnitOfWork done for ExchangeId: {}",
exchange.getExchangeId());
}
// at first done the synchronizations
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
index b9123e6e9e6..f694ef00563 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java
@@ -1488,7 +1488,6 @@ public final class EventHelper {
private static boolean doNotifyEvent(EventNotifier notifier, CamelEvent
event) {
if (!notifier.isEnabled(event)) {
-LOG.trace("Notifier: {} is not enabled for the event: {}",
notifier, event);
return false;
}
(camel) branch main updated (838b40b1542 -> a8917e8920c)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 838b40b1542 (chores) camel-netty-http: use StandardCharsets for decoding headers (#12655) new 11f68102c1d (chores) Ensures logging consistency for events new 2ee3edc37da (chores) Ensures logging consistency for the Exchange new a8917e8920c (chores) Avoid unnecessary hits to the exchange UUID Generator 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: .../src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 2 +- .../apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java| 2 +- .../main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java | 2 +- .../java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java | 2 +- .../java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java | 2 +- .../main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java| 2 +- .../src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/StepFailedEvent.java | 2 +- .../src/main/java/org/apache/camel/impl/event/StepStartedEvent.java | 2 +- .../src/main/java/org/apache/camel/support/AbstractExchange.java| 2 +- .../src/main/java/org/apache/camel/support/EventHelper.java | 1 - 15 files changed, 14 insertions(+), 15 deletions(-)
(camel) 02/03: (chores) Ensures logging consistency for the Exchange
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
commit 2ee3edc37da3b0e8002161371095df369f522d4b
Author: Otavio Rodolfo Piske
AuthorDate: Thu Jan 4 14:20:32 2024 +0100
(chores) Ensures logging consistency for the Exchange
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index d3b9b282f23..c1aece49c88 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -685,7 +685,7 @@ abstract class AbstractExchange implements Exchange {
}
@Override
-public String toString() {
+public final String toString() {
// do not output information about the message as it may contain
sensitive information
if (exchangeId != null) {
return "Exchange[" + exchangeId + "]";
Re: [I] [Discussion] Camel K 2024 roadmap [camel-k]
orpiske commented on issue #5019: URL: https://github.com/apache/camel-k/issues/5019#issuecomment-1877180746 This looks very nice @squakez! Some comments: * Remove kamel CLI in favour of other toolings Personally, I would like to see us consolidating on the Camel JBang as the de-facto CLI tool for Camel and every other sub-project. This, of course, might add some additional complexity to Camel Core and reduce further the cohesion of the core project, so we should probably evaluate [CAMEL-20264](https://issues.apache.org/jira/browse/CAMEL-20264) as a preliminary step for that. * Enhance quality of code If there is interest, we can also evaluate adding Camel K bits to the SonarCloud instance. It has been a trusted source of cleanup material for the [Camel Core bits](https://sonarcloud.io/project/overview?id=apache_camel) (granted: I don't know how well it works for Go, so, probably needs further investigation). -- 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] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
github-actions[bot] commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877177906 :robot: The Apache Camel test robot will run the tests for you :+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] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
apupier commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877177146 /component-test jslt plc4x weather leveldb splunk splunk-hec jackson kafka elasticsearch-rest-client graphql cbor rest-openapi openapi-java jolt jacksonxml lumberjack zeebe opensearch jsonpath aws chatscript metrics etcd3 wordpress micrometer knative stitch swift xj jsonata sap-netweaver azure dropbox huawei whatsapp telegram zookeeper-master azure salesforce bonita elytron cxf -- 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] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
github-actions[bot] commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877137145 :robot: The Apache Camel test robot will run the tests for you :+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] Bump jackson2-version from 2.15.3 to 2.16.1 [camel]
apupier commented on PR #12597: URL: https://github.com/apache/camel/pull/12597#issuecomment-1877136610 /component-test jslt plc4x weather leveldb splunk splunk-hec jackson kafka elasticsearch-rest-client graphql cbor rest-openapi openapi-java jolt jacksonxml lumberjack zeebe opensearch jsonpath aws chatscript metrics servicenow etcd3 wordpress micrometer knative stitch swift xj jsonata sap-netweaver azure dropbox huawei whatsapp telegram zookeeper-master azure salesforce bonita elytron cxf -- 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 (e4d9efb8a20 -> 838b40b1542)
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 e4d9efb8a20 (chores): cleanup duplicated code in camel-jta (#12653) add 838b40b1542 (chores) camel-netty-http: use StandardCharsets for decoding headers (#12655) No new revisions were added by this update. Summary of changes: .../netty/http/DefaultNettyHttpBinding.java| 45 +++--- 1 file changed, 31 insertions(+), 14 deletions(-)
(camel) branch main updated: (chores) camel-netty-http: use StandardCharsets for decoding headers (#12655)
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 838b40b1542 (chores) camel-netty-http: use StandardCharsets for
decoding headers (#12655)
838b40b1542 is described below
commit 838b40b15421d8b3f72d5d18c9b8f968d7c1bdb1
Author: Otavio Rodolfo Piske
AuthorDate: Thu Jan 4 14:36:51 2024 +0100
(chores) camel-netty-http: use StandardCharsets for decoding headers
(#12655)
---
.../netty/http/DefaultNettyHttpBinding.java| 45 +++---
1 file changed, 31 insertions(+), 14 deletions(-)
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
index b2cd67bfd84..43e1ca67438 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/DefaultNettyHttpBinding.java
@@ -25,6 +25,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URLDecoder;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -207,7 +208,7 @@ public class DefaultNettyHttpBinding implements
NettyHttpBinding, Cloneable {
Iterator it = ObjectHelper.createIterator(values, ",", true);
while (it.hasNext()) {
Object extracted = it.next();
-Object decoded = shouldUrlDecodeHeader(configuration, name,
extracted, "UTF-8");
+Object decoded = shouldUrlDecodeHeader(configuration, name,
extracted, StandardCharsets.UTF_8);
LOG.trace("HTTP-header: {}", extracted);
if (headerFilterStrategy != null
&&
!headerFilterStrategy.applyFilterToExternalHeaders(name, decoded, exchange)) {
@@ -233,7 +234,7 @@ public class DefaultNettyHttpBinding implements
NettyHttpBinding, Cloneable {
Iterator it = ObjectHelper.createIterator(values, ",",
true);
while (it.hasNext()) {
Object extracted = it.next();
-Object decoded = shouldUrlDecodeHeader(configuration,
name, extracted, "UTF-8");
+Object decoded = shouldUrlDecodeHeader(configuration,
name, extracted, StandardCharsets.UTF_8);
LOG.trace("URI-Parameter: {}", extracted);
if (headerFilterStrategy != null
&&
!headerFilterStrategy.applyFilterToExternalHeaders(name, decoded, exchange)) {
@@ -251,13 +252,11 @@ public class DefaultNettyHttpBinding implements
NettyHttpBinding, Cloneable {
.startsWith(NettyHttpConstants.CONTENT_TYPE_WWW_FORM_URLENCODED)
&& !configuration.isBridgeEndpoint() &&
!configuration.isHttpProxy() && request instanceof FullHttpRequest) {
-String charset = "UTF-8";
-
// Push POST form params into the headers to retain compatibility
with DefaultHttpBinding
String body;
ByteBuf buffer = ((FullHttpRequest) request).content().retain();
try {
-body = buffer.toString(Charset.forName(charset));
+body = buffer.toString(StandardCharsets.UTF_8);
} finally {
buffer.release();
}
@@ -265,8 +264,8 @@ public class DefaultNettyHttpBinding implements
NettyHttpBinding, Cloneable {
for (String param : body.split("&")) {
String[] pair = param.split("=", 2);
if (pair.length == 2) {
-String name = shouldUrlDecodeHeader(configuration, "",
pair[0], charset);
-String value = shouldUrlDecodeHeader(configuration,
name, pair[1], charset);
+String name = shouldUrlDecodeHeader(configuration, "",
pair[0], StandardCharsets.UTF_8);
+String value = shouldUrlDecodeHeader(configuration,
name, pair[1], StandardCharsets.UTF_8);
if (headerFilterStrategy != null
&&
!headerFilterStrategy.applyFilterToExternalHeaders(name, value, exchange)) {
NettyHttpHelper.appendHeader(headers, name, value);
@@ -310,17 +309,35 @@ public class DefaultNettyHttpBinding implements
NettyHttpBinding, Cloneable {
/**
* Decodes the header if needed to, or returns the header value as is.
*
- * @param configurationthe configuration
- * @param headerName the header name
- * @param value
Re: [PR] (chores) camel-netty-http: use StandardCharsets for decoding headers [camel]
orpiske merged PR #12655: URL: https://github.com/apache/camel/pull/12655 -- 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-netty-http: use StandardCharsets for decoding headers [camel]
github-actions[bot] commented on PR #12655: URL: https://github.com/apache/camel/pull/12655#issuecomment-1877095631 :robot: The Apache Camel test robot will run the tests for you :+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-netty-http: use StandardCharsets for decoding headers [camel]
apupier commented on PR #12655: URL: https://github.com/apache/camel/pull/12655#issuecomment-1877095001 /component-test netty-http -- 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 camel-main updated: Disabled consul because of #5635
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new ac13d5c533 Disabled consul because of #5635
ac13d5c533 is described below
commit ac13d5c533c295e4db2ddf922c90fdcb3ca83ade
Author: JiriOndrusek
AuthorDate: Thu Jan 4 14:01:11 2024 +0100
Disabled consul because of #5635
---
.../deployment/ConsulClientSupportProcessor.java | 6 ++---
extensions-support/consul-client/runtime/pom.xml | 2 +-
integration-tests/consul/pom.xml | 2 ++
.../component/consul/it/ConsulResource.java| 2 +-
.../quarkus/component/consul/it/ConsulTest.java| 2 ++
.../component/consul/it/ConsulTestResource.java| 2 +-
poms/bom/pom.xml | 30 +++---
poms/bom/src/main/generated/flattened-full-pom.xml | 30 +++---
.../src/main/generated/flattened-reduced-pom.xml | 30 +++---
.../generated/flattened-reduced-verbose-pom.xml| 30 +++---
10 files changed, 70 insertions(+), 66 deletions(-)
diff --git
a/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
b/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
index 4952f3fb2b..2548279528 100644
---
a/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
+++
b/extensions-support/consul-client/deployment/src/main/java/org/apache/camel/quarkus/support/consul/client/deployment/ConsulClientSupportProcessor.java
@@ -41,11 +41,11 @@ class ConsulClientSupportProcessor {
private static final DotName DOT_NAME_IMMUTABLE_MAP = DotName.createSimple(
"com.google.common.collect.ImmutableMap");
-private static final Pattern CLIENT_API_PATTERN =
Pattern.compile("com\\.orbitz\\.consul\\..*Client\\$Api");
+private static final Pattern CLIENT_API_PATTERN =
Pattern.compile("org\\.kiwiproject\\.consul\\..*Client\\$Api");
@BuildStep
AdditionalApplicationArchiveMarkerBuildItem applicationArchiveMarkers() {
-return new
AdditionalApplicationArchiveMarkerBuildItem("com/orbitz/consul");
+return new
AdditionalApplicationArchiveMarkerBuildItem("org/kiwiproject/consul");
}
@BuildStep
@@ -63,7 +63,7 @@ class ConsulClientSupportProcessor {
.map(AnnotationInstance::target)
.filter(item -> item.kind() == AnnotationTarget.Kind.CLASS)
.map(AnnotationTarget::asClass)
-.filter(item ->
item.name().prefix().toString().startsWith("com.orbitz.consul.model"))
+.filter(item ->
item.name().prefix().toString().startsWith("org.kiwiproject.consul.model"))
.flatMap(item ->
index.getIndex().getAllKnownSubclasses(item.name()).stream())
.map(item ->
ReflectiveClassBuildItem.builder(item.name().toString()).methods().build())
.forEach(reflectiveClasses::produce);
diff --git a/extensions-support/consul-client/runtime/pom.xml
b/extensions-support/consul-client/runtime/pom.xml
index 64e7eb2c57..ed2e7a43df 100644
--- a/extensions-support/consul-client/runtime/pom.xml
+++ b/extensions-support/consul-client/runtime/pom.xml
@@ -34,7 +34,7 @@
quarkus-core
-com.orbitz.consul
+org.kiwiproject
consul-client
diff --git a/integration-tests/consul/pom.xml b/integration-tests/consul/pom.xml
index 1850fb7d38..3cf9368a6a 100644
--- a/integration-tests/consul/pom.xml
+++ b/integration-tests/consul/pom.xml
@@ -75,6 +75,7 @@
+
virtualDependencies
diff --git
a/integration-tests/consul/src/main/java/org/apache/camel/quarkus/component/consul/it/ConsulResource.java
b/integration-tests/consul/src/main/java/org/apache/camel/quarkus/component/consul/it/ConsulResource.java
index 180cfd52dc..5d0bf5daff 100644
---
a/integration-tests/consul/src/main/java/org/apache/camel/quarkus/component/consul/it/ConsulResource.java
+++
b/integration-tests/consul/src/main/java/org/apache/camel/quarkus/component/consul/it/ConsulResource.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.quarkus.component.consul.it;
-import com.orbitz.consul.model.kv.ImmutableValue;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.Consumes;
@@ -29,6 +28,7 @@ import jakarta.ws.rs.core.MediaType;
import org.apache.camel.FluentProducerTemplate;
import org.apache.camel.component.consul.ConsulConstants;
import
(camel) branch regen_bot updated (d653bd008ce -> e4d9efb8a20)
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 d653bd008ce (chores): code cleanup in ExtendedExchangeExtension (#12652) add a445877dacf (ci): updating label configs to the new Labeler version add 20a2f6f7770 (ci): updated to use the branch labeling feature from the new Labeler add afa7b157d1a fixup! (ci): updated to use the branch labeling feature from the new Labeler add 05c7fd56874 (ci) fixed labeling branches add e4d9efb8a20 (chores): cleanup duplicated code in camel-jta (#12653) No new revisions were added by this update. Summary of changes: .github/workflows/generic-pr.yaml | 16 +--- .../workflows/generic-pr/label-config-camel-3.yml | 19 - .github/workflows/generic-pr/label-config-main.yml | 19 - .github/workflows/generic-pr/label-config.yml | 93 -- .../apache/camel/jta/TransactionErrorHandler.java | 63 +-- 5 files changed, 91 insertions(+), 119 deletions(-) delete mode 100644 .github/workflows/generic-pr/label-config-camel-3.yml delete mode 100644 .github/workflows/generic-pr/label-config-main.yml
Re: [PR] Backport CAMEL-20269 to Camel 4.0.x [camel]
orpiske closed pull request #12658: Backport CAMEL-20269 to Camel 4.0.x URL: https://github.com/apache/camel/pull/12658 -- 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] Do not merge [camel]
orpiske closed pull request #12659: Do not merge URL: https://github.com/apache/camel/pull/12659 -- 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: (chores): cleanup duplicated code in camel-jta (#12653)
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 e4d9efb8a20 (chores): cleanup duplicated code in camel-jta (#12653)
e4d9efb8a20 is described below
commit e4d9efb8a20e629a2956ad05871d8d62d9619e86
Author: Otavio Rodolfo Piske
AuthorDate: Thu Jan 4 13:52:11 2024 +0100
(chores): cleanup duplicated code in camel-jta (#12653)
---
.../apache/camel/jta/TransactionErrorHandler.java | 63 --
1 file changed, 22 insertions(+), 41 deletions(-)
diff --git
a/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
b/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
index 069b2cbd788..2958309726f 100644
---
a/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
+++
b/components/camel-jta/src/main/java/org/apache/camel/jta/TransactionErrorHandler.java
@@ -39,6 +39,7 @@ import org.apache.camel.support.service.ServiceHelper;
import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
/**
* Does transactional execution according given policy. This class is based on
@@ -268,51 +269,31 @@ public class TransactionErrorHandler extends
ErrorHandlerSupport
LOG.debug("Transaction commit ({}) redelivered({}) for {})",
transactionKey, redelivered, ids);
}
+public void doLog(String redelivered, String ids, Throwable e, boolean
rollbackOnly, Level level) {
+if (rollbackOnly) {
+LOG.atLevel(level).log("Transaction rollback ({}) redelivered({})
for {} due exchange was marked for rollbackOnly",
+transactionKey, redelivered, ids);
+} else {
+LOG.atLevel(level).log("Transaction rollback ({}) redelivered({})
for {} caught: {}",
+transactionKey, redelivered, ids, e.getMessage());
+}
+}
+
/**
* Logs the transaction rollback.
*/
private void logTransactionRollback(String redelivered, String ids,
Throwable e, boolean rollbackOnly) {
-if (rollbackLoggingLevel == LoggingLevel.OFF) {
-return;
-} else if (rollbackLoggingLevel == LoggingLevel.ERROR &&
LOG.isErrorEnabled()) {
-if (rollbackOnly) {
-LOG.error("Transaction rollback ({}) redelivered({}) for {}
due exchange was marked for rollbackOnly",
-transactionKey, redelivered, ids);
-} else {
-LOG.error("Transaction rollback ({}) redelivered({}) for {}
caught: {}",
-transactionKey, redelivered, ids, e.getMessage());
-}
-} else if (rollbackLoggingLevel == LoggingLevel.WARN &&
LOG.isWarnEnabled()) {
-if (rollbackOnly) {
-LOG.warn("Transaction rollback ({}) redelivered({}) for {} due
exchange was marked for rollbackOnly",
-transactionKey, redelivered, ids);
-} else {
-LOG.warn("Transaction rollback ({}) redelivered({}) for {}
caught: {}",
-transactionKey, redelivered, ids, e.getMessage());
-}
-} else if (rollbackLoggingLevel == LoggingLevel.INFO &&
LOG.isInfoEnabled()) {
-if (rollbackOnly) {
-LOG.info("Transaction rollback ({}) redelivered({}) for {} due
exchange was marked for rollbackOnly",
-transactionKey, redelivered, ids);
-} else {
-LOG.info("Transaction rollback ({}) redelivered({}) for {}
caught: {}",
-transactionKey, redelivered, ids, e.getMessage());
-}
-} else if (rollbackLoggingLevel == LoggingLevel.DEBUG &&
LOG.isDebugEnabled()) {
-if (rollbackOnly) {
-LOG.debug("Transaction rollback ({}) redelivered({}) for {}
due exchange was marked for rollbackOnly",
-transactionKey, redelivered, ids);
-} else {
-LOG.debug("Transaction rollback ({}) redelivered({}) for {}
caught: {}",
-transactionKey, redelivered, ids, e.getMessage());
-}
-} else if (rollbackLoggingLevel == LoggingLevel.TRACE &&
LOG.isTraceEnabled()) {
-if (rollbackOnly) {
-LOG.trace("Transaction rollback ({}) redelivered({}) for {}
due exchange was marked for rollbackOnly",
-transactionKey, redelivered, ids);
-} else {
-LOG.trace("Transaction rollback ({}) redelivered({}) for {}
caught: {}",
-transactionKey, redelivered, ids, e.getMessage());
+if (rollbackLoggingLevel != LoggingLevel.OFF) {
+if (rollbackLoggingLevel == LoggingLevel.ERROR &&
Re: [PR] (chores): cleanup duplicated code in camel-jta [camel]
orpiske merged PR #12653: URL: https://github.com/apache/camel/pull/12653 -- 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] Backport CAMEL-20269 to Camel 4.0.x [camel]
orpiske opened a new pull request, #12658: URL: https://github.com/apache/camel/pull/12658 (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
Re: [PR] Backport CAMEL-20269 to Camel 4.0.x [camel]
orpiske closed pull request #12657: Backport CAMEL-20269 to Camel 4.0.x URL: https://github.com/apache/camel/pull/12657 -- 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: (ci) fixed labeling branches
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 05c7fd56874 (ci) fixed labeling branches 05c7fd56874 is described below commit 05c7fd568742fb6a31ed6db8468d100ea5bb73d6 Author: Otavio Rodolfo Piske AuthorDate: Thu Jan 4 13:51:22 2024 +0100 (ci) fixed labeling branches --- .github/workflows/generic-pr/label-config.yml | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generic-pr/label-config.yml b/.github/workflows/generic-pr/label-config.yml index c64d517ace4..8ff57a7299e 100644 --- a/.github/workflows/generic-pr/label-config.yml +++ b/.github/workflows/generic-pr/label-config.yml @@ -17,12 +17,14 @@ camel-3: - base-branch: - - '^camel-3.x' + - 'camel-3.21.x' + - 'camel-3.22.x' + - 'camel-3.x' camel-4: - base-branch: - 'main' - - '^camel-4' + - 'camel-4.0.x' ci: - changed-files:
Re: [I] Add support for extended Knative trigger filters [camel-k]
eshepelyuk commented on issue #3378: URL: https://github.com/apache/camel-k/issues/3378#issuecomment-1877041994 Also, the "old" filter should be supported, currently they are not, only `type` is used to filter events from the `Broker` on materialized `Trigger` -- 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] Backport CAMEL-20269 to Camel 4.0.x [camel]
orpiske opened a new pull request, #12657: URL: https://github.com/apache/camel/pull/12657 (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
Re: [PR] Backport CAMEL-20269 to Camel 4.0.x [camel]
orpiske closed pull request #12656: Backport CAMEL-20269 to Camel 4.0.x URL: https://github.com/apache/camel/pull/12656 -- 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: fixup! (ci): updated to use the branch labeling feature from the new Labeler
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 afa7b157d1a fixup! (ci): updated to use the branch labeling feature from the new Labeler afa7b157d1a is described below commit afa7b157d1af646e408e51bc856445a7f128d4c2 Author: Otavio Rodolfo Piske AuthorDate: Thu Jan 4 13:42:01 2024 +0100 fixup! (ci): updated to use the branch labeling feature from the new Labeler --- .github/workflows/generic-pr/label-config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generic-pr/label-config.yml b/.github/workflows/generic-pr/label-config.yml index 37cd751a81d..c64d517ace4 100644 --- a/.github/workflows/generic-pr/label-config.yml +++ b/.github/workflows/generic-pr/label-config.yml @@ -22,7 +22,7 @@ camel-3: camel-4: - base-branch: - 'main' - - '^camel-4.x' + - '^camel-4' ci: - changed-files:
[PR] Backport CAMEL-20269 to Camel 4.0.x [camel]
orpiske opened a new pull request, #12656: URL: https://github.com/apache/camel/pull/12656 (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
[PR] (ci): updated to use the branch labeling feature from the new Labeler [camel]
orpiske opened a new pull request, #12655: URL: https://github.com/apache/camel/pull/12655 (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
Re: [PR] (ci): updated to use the branch labeling feature from the new Labeler [camel]
github-actions[bot] commented on PR #12655: URL: https://github.com/apache/camel/pull/12655#issuecomment-1877031980 :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 main updated: (ci): updated to use the branch labeling feature from the new Labeler
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 20a2f6f7770 (ci): updated to use the branch labeling feature from the
new Labeler
20a2f6f7770 is described below
commit 20a2f6f777082fd2884a397c1a4cd4bd2b5f7e39
Author: Otavio Rodolfo Piske
AuthorDate: Thu Jan 4 13:26:35 2024 +0100
(ci): updated to use the branch labeling feature from the new Labeler
---
.github/workflows/generic-pr.yaml | 16 +---
.../workflows/generic-pr/label-config-camel-3.yml | 21 -
.github/workflows/generic-pr/label-config-main.yml | 21 -
.github/workflows/generic-pr/label-config.yml | 9 +
4 files changed, 10 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/generic-pr.yaml
b/.github/workflows/generic-pr.yaml
index b1bcc9b440b..1c54b3c8641 100644
--- a/.github/workflows/generic-pr.yaml
+++ b/.github/workflows/generic-pr.yaml
@@ -46,18 +46,4 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/workflows/generic-pr/label-config.yml
- sync-labels: true
- - name: Label changes scope (Camel 4)
-if: github.ref == 'refs/heads/main'
-uses: actions/labeler@v5.0.0
-with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- configuration-path:
.github/workflows/generic-pr/label-config-main.yml
- sync-labels: true
- - name: Label changes scope (Camel 3)
-if: github.ref == 'refs/heads/camel-3.x'
-uses: actions/labeler@v5.0.0
-with:
- repo-token: ${{ secrets.GITHUB_TOKEN }}
- configuration-path:
.github/workflows/generic-pr/label-config-camel-3.yml
- sync-labels: true
+ sync-labels: true
\ No newline at end of file
diff --git a/.github/workflows/generic-pr/label-config-camel-3.yml
b/.github/workflows/generic-pr/label-config-camel-3.yml
deleted file mode 100644
index e9de5346af7..000
--- a/.github/workflows/generic-pr/label-config-camel-3.yml
+++ /dev/null
@@ -1,21 +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.
-#
-
-camel-3:
- - changed-files:
-- any-glob-to-any-file:
- - '**/*'
diff --git a/.github/workflows/generic-pr/label-config-main.yml
b/.github/workflows/generic-pr/label-config-main.yml
deleted file mode 100644
index 0ca2960f0e0..000
--- a/.github/workflows/generic-pr/label-config-main.yml
+++ /dev/null
@@ -1,21 +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.
-#
-
-camel-4:
- - changed-files:
- - any-glob-to-any-file:
-- '**/*'
diff --git a/.github/workflows/generic-pr/label-config.yml
b/.github/workflows/generic-pr/label-config.yml
index 6c469b28174..37cd751a81d 100644
--- a/.github/workflows/generic-pr/label-config.yml
+++ b/.github/workflows/generic-pr/label-config.yml
@@ -15,6 +15,15 @@
# limitations under the License.
#
+camel-3:
+ - base-branch:
+ - '^camel-3.x'
+
+camel-4:
+ - base-branch:
+ - 'main'
+ - '^camel-4.x'
+
ci:
- changed-files:
- any-glob-to-any-file:
Re: [PR] (chores): cleanup duplicated code in camel-jta [camel]
orpiske commented on PR #12653: URL: https://github.com/apache/camel/pull/12653#issuecomment-1877011766 I'm testing the new labeler in this PR ... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. 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: (ci): updating label configs to the new Labeler version
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 a445877dacf (ci): updating label configs to the new Labeler version a445877dacf is described below commit a445877dacf0770667831555498cff88a0ec9322 Author: Otavio Rodolfo Piske AuthorDate: Thu Jan 4 13:21:38 2024 +0100 (ci): updating label configs to the new Labeler version --- .../workflows/generic-pr/label-config-camel-3.yml | 4 +- .github/workflows/generic-pr/label-config-main.yml | 4 +- .github/workflows/generic-pr/label-config.yml | 82 +++--- 3 files changed, 63 insertions(+), 27 deletions(-) diff --git a/.github/workflows/generic-pr/label-config-camel-3.yml b/.github/workflows/generic-pr/label-config-camel-3.yml index 1a8ca7c335f..e9de5346af7 100644 --- a/.github/workflows/generic-pr/label-config-camel-3.yml +++ b/.github/workflows/generic-pr/label-config-camel-3.yml @@ -16,4 +16,6 @@ # camel-3: - - '**/*' + - changed-files: +- any-glob-to-any-file: + - '**/*' diff --git a/.github/workflows/generic-pr/label-config-main.yml b/.github/workflows/generic-pr/label-config-main.yml index 5f6f1cc8ba7..0ca2960f0e0 100644 --- a/.github/workflows/generic-pr/label-config-main.yml +++ b/.github/workflows/generic-pr/label-config-main.yml @@ -16,4 +16,6 @@ # camel-4: - - '**/*' + - changed-files: + - any-glob-to-any-file: +- '**/*' diff --git a/.github/workflows/generic-pr/label-config.yml b/.github/workflows/generic-pr/label-config.yml index 9361c5a32f5..6c469b28174 100644 --- a/.github/workflows/generic-pr/label-config.yml +++ b/.github/workflows/generic-pr/label-config.yml @@ -16,58 +16,90 @@ # ci: - - Jenkinsfile - - Jenkinsfile.* + - changed-files: + - any-glob-to-any-file: +- Jenkinsfile +- Jenkinsfile.* core: - - core/**/* + - changed-files: + - any-glob-to-any-file: +- core/**/* core-build-and-dependencies: - - apache-camel/** - - camel-dependencies/** - - parent/** + - changed-files: + - any-glob-to-any-file: +- apache-camel/** +- camel-dependencies/** +- parent/** core-build-tooling: - - buildingtools/**/* - - etc/**/* - - init/**/* + - changed-files: + - any-glob-to-any-file: +- buildingtools/**/* +- etc/**/* +- init/**/* catalog: - - catalog/**/* + - changed-files: + - any-glob-to-any-file: +- catalog/**/* components: - - components/**/* + - changed-files: + - any-glob-to-any-file: +- components/**/* components-aws: - - components/camel-aws/**/* + - changed-files: + - any-glob-to-any-file: +- components/camel-aws/**/* components-azure: - - components/camel-azure/**/* + - changed-files: + - any-glob-to-any-file: +- components/camel-azure/**/* components-kafka: - - components/camel-kafka/**/* + - changed-files: + - any-glob-to-any-file: +- components/camel-kafka/**/* components-jms: - - components/camel-*jms/**/* + - changed-files: + - any-glob-to-any-file: +- components/camel-*jms/**/* docs: - - docs/**/* - - '**.adoc' - - '**.md' + - changed-files: + - any-glob-to-any-file: +- docs/**/* +- '**.adoc' +- '**.md' dsl: - - dsl/**/* + - changed-files: + - any-glob-to-any-file: +- dsl/**/* test-infra: - - test-infra/**/* + - changed-files: + - any-glob-to-any-file: +- test-infra/**/* tests: - - tests/**/* - - '**/src/tests/**/*' + - changed-files: + - any-glob-to-any-file: +- tests/**/* +- '**/src/tests/**/*' tooling: - - tooling/**/* + - changed-files: + - any-glob-to-any-file: +- tooling/**/* tooling-maven: - - archetypes/**/* - - tooling/maven/**/* + - changed-files: + - any-glob-to-any-file: +- archetypes/**/* +- tooling/maven/**/*
Re: [PR] CAMEL-20295: Enable camel-grpc testing on additional platforms [camel]
github-actions[bot] commented on PR #12654: URL: https://github.com/apache/camel/pull/12654#issuecomment-1876972685 :robot: The Apache Camel test robot will run the tests for you :+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] CAMEL-20295: Enable camel-grpc testing on additional platforms [camel]
jamesnetherton commented on PR #12654: URL: https://github.com/apache/camel/pull/12654#issuecomment-1876972208 /component-test camel-grpc -- 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-20295: Enable camel-grpc testing on additional platforms [camel]
github-actions[bot] commented on PR #12654: URL: https://github.com/apache/camel/pull/12654#issuecomment-1876972117 :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
[PR] CAMEL-20295: Enable camel-grpc testing on additional platforms [camel]
jamesnetherton opened a new pull request, #12654: URL: https://github.com/apache/camel/pull/12654 (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
Re: [PR] Adding jenkinsfile(jdk11) for ppc64le [camel-spring-boot]
oscerd commented on PR #1055: URL: https://github.com/apache/camel-spring-boot/pull/1055#issuecomment-1876965773 I don't think it should be on main branch then -- 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] Improve pipe status when the pod is full of exceptions [camel-k]
squakez commented on issue #4977: URL: https://github.com/apache/camel-k/issues/4977#issuecomment-1876962139 I had a look and this is what happening. The `Pipe` creates an `Integration` which finally ends up in spinning up a `Pod`. The `Pod` is tried to restart if it fails for certain reasons: ``` k get pods NAME READY STATUS RESTARTS AGE aws-s3-source-pipe-7568b69c9b-q9gzx 0/1 CrashLoopBackOff 6 (42s ago) 6m31s ``` So, the Integration, therefore the Pipe, are having a very short period of time, likely a few seconds while the Pod is trying to restart that is in Running state, but eventually turn to the correct error state: ``` $ k get pipe -w NAME PHASE REPLICAS aws-s3-source-pipe Error 1 aws-s3-source-pipe Ready 1 aws-s3-source-pipe Error 1 aws-s3-source-pipe Ready 1 aws-s3-source-pipe Error 1 aws-s3-source-pipe Ready 1 aws-s3-source-pipe Error 1 aws-s3-source-pipe Ready 1 aws-s3-source-pipe Error 1 ``` I think this is the expected behavior in the sense that the Integration is running successfully until the Pod crashes. I am not sure if we can change this behavior, and, if that would make sense considering that eventually the Pipe and Integration are correctly set their status. Wdyt @lburgazzoli ? -- 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 main updated: Use Quarkus Derby DevServices for SQL integration test
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 61232e9ee0 Use Quarkus Derby DevServices for SQL integration test 61232e9ee0 is described below commit 61232e9ee046b471cd27853ce079450cd1a28226 Author: James Netherton AuthorDate: Thu Jan 4 09:31:58 2024 + Use Quarkus Derby DevServices for SQL integration test Fixes #5633 --- integration-tests-support/pom.xml | 1 - .../sql-derby-support/README.adoc | 3 - .../sql-derby-support/pom.xml | 42 -- integration-tests/sql/.gitignore | 1 + integration-tests/sql/pom.xml | 24 -- .../quarkus/component/sql/it/SqlDbInitializer.java | 6 -- .../storedproc/derby/NumberAddStoredProcedure.java | 10 +-- .../sql/src/main/resources/sql/derby/initDb.sql| 2 +- .../src/main/resources/sql/derby/initDb_docker.sql | 20 - .../component/sql/it/DerbyTestResource.java| 96 -- .../camel/quarkus/component/sql/it/SqlTest.java| 3 - pom.xml| 1 - poms/bom-test/pom.xml | 5 -- 13 files changed, 6 insertions(+), 208 deletions(-) diff --git a/integration-tests-support/pom.xml b/integration-tests-support/pom.xml index 3860e58fb3..b4a30c3ff6 100644 --- a/integration-tests-support/pom.xml +++ b/integration-tests-support/pom.xml @@ -51,7 +51,6 @@ kafka mongodb process-executor-support -sql-derby-support test-support mock-backend wiremock diff --git a/integration-tests-support/sql-derby-support/README.adoc b/integration-tests-support/sql-derby-support/README.adoc deleted file mode 100644 index 5b0da368d7..00 --- a/integration-tests-support/sql-derby-support/README.adoc +++ /dev/null @@ -1,3 +0,0 @@ -== SQL integration tests - -This module creates jar with stored procedure used in test from `sql` module (for derby database). \ No newline at end of file diff --git a/integration-tests-support/sql-derby-support/pom.xml b/integration-tests-support/sql-derby-support/pom.xml deleted file mode 100644 index 6e104dda61..00 --- a/integration-tests-support/sql-derby-support/pom.xml +++ /dev/null @@ -1,42 +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/xsd/maven-4.0.0.xsd;> - -org.apache.camel.quarkus -camel-quarkus-integration-tests-support -3.7.0-SNAPSHOT -../pom.xml - -4.0.0 - -camel-quarkus-integration-tests-support-sql-derby -Camel Quarkus :: Integration Tests :: Support :: Sql Derby - - -h2 - - - - -org.apache.camel.quarkus -camel-quarkus-sql - - - diff --git a/integration-tests/sql/.gitignore b/integration-tests/sql/.gitignore new file mode 100644 index 00..1298c5f0fe --- /dev/null +++ b/integration-tests/sql/.gitignore @@ -0,0 +1 @@ +derby.log diff --git a/integration-tests/sql/pom.xml b/integration-tests/sql/pom.xml index 01ec2d33ce..a89176655f 100644 --- a/integration-tests/sql/pom.xml +++ b/integration-tests/sql/pom.xml @@ -75,11 +75,6 @@ awaitility test - -org.apache.camel.quarkus - camel-quarkus-integration-tests-support-sql-derby -test - org.testcontainers testcontainers @@ -195,25 +190,6 @@ derby - - - -maven-dependency-plugin - - -process-sources - -copy-dependencies - - - camel-quarkus-integration-tests-support-sql-derby - target/test-classes/derby/ - - - - - - io.quarkus diff --git a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlDbInitializer.java b/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlDbInitializer.java index f711727736..fa2b9c24ea 100644 --- a/integration-tests/sql/src/main/java/org/apache/camel/quarkus/component/sql/it/SqlDbInitializer.java +++
Re: [I] Use Quarkus Derby DevServices for SQL integration test [camel-quarkus]
jamesnetherton closed issue #5633: Use Quarkus Derby DevServices for SQL integration test URL: https://github.com/apache/camel-quarkus/issues/5633 -- 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] Use Quarkus Derby DevServices for SQL integration test [camel-quarkus]
jamesnetherton merged PR #5634: URL: https://github.com/apache/camel-quarkus/pull/5634 -- 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): cleanup duplicated code in camel-jta [camel]
github-actions[bot] commented on PR #12653: URL: https://github.com/apache/camel/pull/12653#issuecomment-1876938364 :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
[PR] (chores): cleanup duplicated code in camel-jta [camel]
orpiske opened a new pull request, #12653: URL: https://github.com/apache/camel/pull/12653 (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
Re: [PR] Adding jenkinsfile(jdk11) for ppc64le [camel-spring-boot]
sanskruti1098 commented on PR #1055: URL: https://github.com/apache/camel-spring-boot/pull/1055#issuecomment-1876937030 Hi @davsclaus @oscerd we are trying to enable JDK11 jobs for power for camel3.x similar to x86 job -- 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 (1383acb7c85 -> d653bd008ce)
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 1383acb7c85 (chores): cleanup duplicated pattern matching code (#12649) add 64078a54554 Bump actions/labeler from 4.3.0 to 5.0.0 (#12310) add d653bd008ce (chores): code cleanup in ExtendedExchangeExtension (#12652) No new revisions were added by this update. Summary of changes: .github/workflows/generic-pr.yaml | 6 +++--- .../java/org/apache/camel/support/ExtendedExchangeExtension.java | 8 +--- 2 files changed, 8 insertions(+), 6 deletions(-)
(camel) branch main updated: (chores): code cleanup in ExtendedExchangeExtension (#12652)
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 d653bd008ce (chores): code cleanup in ExtendedExchangeExtension
(#12652)
d653bd008ce is described below
commit d653bd008cec75917b6af82cfdafd496eb5b8f37
Author: Otavio Rodolfo Piske
AuthorDate: Thu Jan 4 11:58:48 2024 +0100
(chores): code cleanup in ExtendedExchangeExtension (#12652)
- Added missing @Override
- Fixed formatting
---
.../java/org/apache/camel/support/ExtendedExchangeExtension.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
index c7da62bee23..bb41cac492f 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ExtendedExchangeExtension.java
@@ -75,6 +75,7 @@ public class ExtendedExchangeExtension implements
ExchangeExtension {
/**
* Is stream caching disabled on the given exchange
*/
+@Override
public boolean isStreamCacheDisabled() {
return this.streamCacheDisabled;
}
@@ -82,6 +83,7 @@ public class ExtendedExchangeExtension implements
ExchangeExtension {
/**
* Used to force disabling stream caching which some components can do in
special use-cases.
*/
+@Override
public void setStreamCacheDisabled(boolean streamCacheDisabled) {
this.streamCacheDisabled = streamCacheDisabled;
}
@@ -243,7 +245,7 @@ public class ExtendedExchangeExtension implements
ExchangeExtension {
this.transacted = transacted;
}
-public boolean isTransacted() {
+boolean isTransacted() {
return transacted;
}
@@ -289,6 +291,7 @@ public class ExtendedExchangeExtension implements
ExchangeExtension {
return this.exchange.getSafeCopyProperty(key, type);
}
+@Override
public void copySafeCopyPropertiesTo(ExchangeExtension target) {
if (exchange.safeCopyProperties != null &&
!exchange.safeCopyProperties.isEmpty()) {
exchange.safeCopyProperties.entrySet().stream()
@@ -306,7 +309,7 @@ public class ExtendedExchangeExtension implements
ExchangeExtension {
this.failureHandled = failureHandled;
}
-public UnitOfWork getUnitOfWork() {
+UnitOfWork getUnitOfWork() {
return unitOfWork;
}
@@ -319,7 +322,6 @@ public class ExtendedExchangeExtension implements
ExchangeExtension {
}
if (this.exchange.variableRepository != null) {
this.exchange.variableRepository.clear();
-;
}
setHistoryNodeId(null);
Re: [PR] (chores): code cleanup in ExtendedExchangeExtension [camel]
orpiske merged PR #12652: URL: https://github.com/apache/camel/pull/12652 -- 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 dependabot/github_actions/actions/labeler-5.0.0 deleted (was ac1d2693906)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/actions/labeler-5.0.0 in repository https://gitbox.apache.org/repos/asf/camel.git was ac1d2693906 Bump actions/labeler from 4.3.0 to 5.0.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) branch main updated: Bump actions/labeler from 4.3.0 to 5.0.0 (#12310)
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 64078a54554 Bump actions/labeler from 4.3.0 to 5.0.0 (#12310)
64078a54554 is described below
commit 64078a545544ecfea51a560cf32a5af801523824
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Jan 4 11:57:51 2024 +0100
Bump actions/labeler from 4.3.0 to 5.0.0 (#12310)
Bumps [actions/labeler](https://github.com/actions/labeler) from 4.3.0 to
5.0.0.
- [Release notes](https://github.com/actions/labeler/releases)
- [Commits](https://github.com/actions/labeler/compare/v4.3.0...v5.0.0)
---
updated-dependencies:
- dependency-name: actions/labeler
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/generic-pr.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/generic-pr.yaml
b/.github/workflows/generic-pr.yaml
index dd40e746dc2..b1bcc9b440b 100644
--- a/.github/workflows/generic-pr.yaml
+++ b/.github/workflows/generic-pr.yaml
@@ -42,21 +42,21 @@ jobs:
(github.event.action == 'opened' ||
github.event.action == 'reopened' ||
github.event.action == 'synchronize')
-uses: actions/labeler@v4.3.0
+uses: actions/labeler@v5.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/workflows/generic-pr/label-config.yml
sync-labels: true
- name: Label changes scope (Camel 4)
if: github.ref == 'refs/heads/main'
-uses: actions/labeler@v4.3.0
+uses: actions/labeler@v5.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path:
.github/workflows/generic-pr/label-config-main.yml
sync-labels: true
- name: Label changes scope (Camel 3)
if: github.ref == 'refs/heads/camel-3.x'
-uses: actions/labeler@v4.3.0
+uses: actions/labeler@v5.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path:
.github/workflows/generic-pr/label-config-camel-3.yml
Re: [PR] Bump actions/labeler from 4.3.0 to 5.0.0 [camel]
orpiske merged PR #12310: URL: https://github.com/apache/camel/pull/12310 -- 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-20044 remove lastResult from Kafka Camel component [camel]
orpiske commented on PR #12002: URL: https://github.com/apache/camel/pull/12002#issuecomment-1876901221 Hi, is this still valid? -- 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] Bump actions/labeler from 4.3.0 to 5.0.0 [camel]
orpiske commented on PR #12310: URL: https://github.com/apache/camel/pull/12310#issuecomment-1876898987 @dependabot rebase -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump actions/labeler from 4.3.0 to 5.0.0 [camel]
orpiske commented on PR #12310: URL: https://github.com/apache/camel/pull/12310#issuecomment-1876898390 Ok. Likely to break a few things, but let's merge and I'll fix if there's any problem. -- 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] Bump actions/labeler from 4.3.0 to 5.0.0 [camel]
orpiske commented on PR #12310: URL: https://github.com/apache/camel/pull/12310#issuecomment-1876893530 Looking at it now ... -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [Discussion] Camel K roadmap 2024 [camel-k]
squakez opened a new issue, #5019: URL: https://github.com/apache/camel-k/issues/5019 ### Requirement Dear community, first of all, happy 2024 to all of you. As usual, in this time of the year, we want to take the opportunity to reason and discuss which should be the project goals for the year. I will start this conversation and invite everybody to include their thoughts or their desires for this year development. ## Status of 2023 roadmap Last year we dedicated a lot of effort to redesign the core of the project which ended in the new Camel K 2.0. We have mainly worked around the possibility to make the build more enterprise ready and flexible enough to eventually onboard any runtime. We managed to have a first possibility to run and import any runtime (likely available in coming Camel K 2.2). We can say that we set the track for a simpler evolution of the project in that sense. ## Area of developments for 2024 We have some leftover from last year we may want to include in 2024 roadmap, above all to close the loop around a complete build experience for other runtimes. Additionally I'd like to set a main goal for this year around the possibility to **make Camel K as the technology that enables other tools in the Camel ecosystem on Kubernetes**. I'll come back on this point later. Here it follow an unsorted list of areas which I think we should deserve attention for 2024: * Expose meaningful status of Integrations for other tools to interact in a Kubernetes "native" way * Complete the build experience and let the user be able to build any Camel runtime * Remove `kamel` CLI in favour of other toolings * Enhance the project organization * Enhance quality of code * Discuss how to enable Kamelet versioning I'll try to add some context in words in order to ease the meaning of each point. ### Expose meaningful status of Integrations for other tools to interact in a Kubernetes "native" way This would encompass everything around the "observability" of a Camel application. Whether the application is built and run by the Camel K operator or externally we should be able to read the status and expose meaningful information in a Kubernetes "native" way. This will simplify the integration of other tools in Kubernetes which will be able to communicate via the Integration custom resource. Put in different words, any tool should be able to use the primitives available in Camel K in order to understand what's going on around a Camel application. ### Complete the build experience and let the user be able to build any Camel runtime We are just on the last mile to let this happen. We need to polish some aspect and be able to let the operator build other runtimes. At the same stage we must let the user choose how to build the application (even externally) and let the operator "operates" the Camel application. ### Remove `kamel` CLI in favour of other toolings Although it's a great utility, the `kamel` CLI is kind of limiting the development of the operator to a certain extent. We have already other initiatives ongoing which will simplify the creation of an Integration custom resource. Camel Jbang is one of them (we already started some plugin development on it). ### Enhance the project organization There are aspects of the project organization that require some attention. At this stage the main problem I see is the presence of Kamelets API definition in Camel K, whilst, it should be directly in the Kamelets catalog now that Kamelets are a Camel generic thing. ### Enhance quality of code Last year we have worked on a nice feature that will calculate the testing coverage of our project. I am not a big fan of putting gate numbers but I think that by increasing the coverage we'll definitely reduce the surface for bugs discovered by the users. We should also make more use of the unit test mocking the controllers vs e2e test as the second requires more resources to execute and delay a lot the feedback on each PR (not to say that some of them are known to be flaky). ### Discuss how to enable Kamelet versioning This is something that has not a high priority, but, during the year I'd like to kick off the discussion to get ideas around how we can have an opinionated way to have multiple version for Kamelets. We have suffered this problem in various way and I think we need to find a clear way to solve it. ### Problem a ### Proposal _No response_ ### Open questions _No response_ -- 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.apache.org For queries about this service, please contact Infrastructure at:
Re: [I] Multi arch operator default to AMD64 based image [camel-k]
squakez closed issue #4988: Multi arch operator default to AMD64 based image URL: https://github.com/apache/camel-k/issues/4988 -- 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): code cleanup in ExtendedExchangeExtension [camel]
github-actions[bot] commented on PR #12652: URL: https://github.com/apache/camel/pull/12652#issuecomment-1876873610 :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
[PR] (chores): code cleanup in ExtendedExchangeExtension [camel]
orpiske opened a new pull request, #12652: URL: https://github.com/apache/camel/pull/12652 - Added missing @Override - Fixed formatting -- 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 (ad5924da898 -> 1383acb7c85)
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 ad5924da898 Bump com.github.mwiede:jsch from 0.2.15 to 0.2.16 add d706385ba9e Bump elasticsearch-java-client-version from 8.10.4 to 8.11.3 add 1383acb7c85 (chores): cleanup duplicated pattern matching code (#12649) No new revisions were added by this update. Summary of changes: .../org/apache/camel/support/AbstractExchange.java | 18 +++-- .../org/apache/camel/support/DefaultMessage.java | 24 - .../org/apache/camel/support/PatternHelper.java| 30 ++ parent/pom.xml | 2 +- 4 files changed, 39 insertions(+), 35 deletions(-)
Re: [I] Multi arch operator default to AMD64 based image [camel-k]
gansheer commented on issue #4988: URL: https://github.com/apache/camel-k/issues/4988#issuecomment-1876856233 @squakez I guess this one is resolved. -- 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: (chores): cleanup duplicated pattern matching code (#12649)
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 1383acb7c85 (chores): cleanup duplicated pattern matching code (#12649)
1383acb7c85 is described below
commit 1383acb7c85cb244e8d960f5f68fe67f7711cde6
Author: Otavio Rodolfo Piske
AuthorDate: Thu Jan 4 11:18:53 2024 +0100
(chores): cleanup duplicated pattern matching code (#12649)
---
.../org/apache/camel/support/AbstractExchange.java | 18 +++--
.../org/apache/camel/support/DefaultMessage.java | 24 -
.../org/apache/camel/support/PatternHelper.java| 30 ++
3 files changed, 38 insertions(+), 34 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 50d4a1d170c..d3b9b282f23 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -18,7 +18,6 @@ package org.apache.camel.support;
import java.util.EnumMap;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -327,21 +326,10 @@ abstract class AbstractExchange implements Exchange {
// store keys to be removed as we cannot loop and remove at the same
time in implementations such as HashMap
if (properties != null) {
-Set toBeRemoved = null;
-for (String key : properties.keySet()) {
-if (PatternHelper.matchPattern(key, pattern)) {
-if (excludePatterns != null &&
PatternHelper.isExcludePatternMatch(key, excludePatterns)) {
-continue;
-}
-matches = true;
-if (toBeRemoved == null) {
-toBeRemoved = new HashSet<>();
-}
-toBeRemoved.add(key);
-}
-}
+Set toBeRemoved = PatternHelper.matchingSet(properties,
pattern, excludePatterns);
-if (matches && toBeRemoved != null) {
+if (toBeRemoved != null) {
+matches = true;
if (toBeRemoved.size() == properties.size()) {
// special optimization when all should be removed
properties.clear();
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
index 2336629c1df..fdec471fc0f 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/DefaultMessage.java
@@ -17,7 +17,6 @@
package org.apache.camel.support;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.function.Supplier;
@@ -242,24 +241,9 @@ public class DefaultMessage extends MessageSupport {
return true;
}
-boolean matches = false;
-// must use a set to store the keys to remove as we cannot walk using
entrySet and remove at the same time
-// due concurrent modification error
-Set toBeRemoved = null;
-for (String key : headers.keySet()) {
-if (PatternHelper.matchPattern(key, pattern)) {
-if (excludePatterns != null &&
PatternHelper.isExcludePatternMatch(key, excludePatterns)) {
-continue;
-}
-matches = true;
-if (toBeRemoved == null) {
-toBeRemoved = new HashSet<>();
-}
-toBeRemoved.add(key);
-}
-}
+final Set toBeRemoved = PatternHelper.matchingSet(headers,
pattern, excludePatterns);
-if (matches) {
+if (toBeRemoved != null) {
if (toBeRemoved.size() == headers.size()) {
// special optimization when all should be removed
headers.clear();
@@ -268,9 +252,11 @@ public class DefaultMessage extends MessageSupport {
headers.remove(key);
}
}
+
+return true;
}
-return matches;
+return false;
}
@Override
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PatternHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/PatternHelper.java
index a716b860ea5..a2412eae39d 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PatternHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PatternHelper.java
@@ -16,7 +16,10 @@
*/
Re: [PR] (chores): cleanup duplicated pattern matching code [camel]
orpiske merged PR #12649: URL: https://github.com/apache/camel/pull/12649 -- 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 (9cd9e5327c1 -> ad5924da898)
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 9cd9e5327c1 Bump io.camunda:zeebe-client-java from 8.3.4 to 8.4.0 add ad5924da898 Bump com.github.mwiede:jsch from 0.2.15 to 0.2.16 No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] Adding jenkinsfile for ppc64le [camel]
oscerd closed pull request #12651: Adding jenkinsfile for ppc64le URL: https://github.com/apache/camel/pull/12651 -- 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] Adding jenkinsfile for ppc64le [camel]
sanskruti1098 opened a new pull request, #12651: URL: https://github.com/apache/camel/pull/12651 (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
