[camel] branch main created (now bc89d8d2a5d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git at bc89d8d2a5d Regen for commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c (#8329) No new revisions were added by this update.
[GitHub] [camel] oscerd merged pull request #8333: Generated sources regen
oscerd merged PR #8333: URL: https://github.com/apache/camel/pull/8333 -- 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 (3775340d245 -> f86038f4ec8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 3775340d245 Regen for commit 60036bbf96caaa7a0690d9ed3dcca8bb122e75bf add 7e72f11c5ea Upgrade PostgreSQL JDBC Driver to 42.4.1 (#8330) add f86038f4ec8 Regen for commit 7e72f11c5ea1185ed82b7a87e8f1f9ffc5569d4e This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3775340d245) \ N -- N -- N refs/heads/regen_bot (f86038f4ec8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8333: Generated sources regen
github-actions[bot] opened a new pull request, #8333: URL: https://github.com/apache/camel/pull/8333 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main created (now bc89d8d2a5d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git at bc89d8d2a5d Regen for commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c (#8329) No new revisions were added by this update.
[GitHub] [camel] oscerd merged pull request #8332: Generated sources regen
oscerd merged PR #8332: URL: https://github.com/apache/camel/pull/8332 -- 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 (c29b30f942d -> 3775340d245)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit c29b30f942d Regen for commit ca8cff8ad7b0a25dc03fa062a14776b4ee6ad28f add 60036bbf96c Example Mojo: Considering Vault as middle folder add 3775340d245 Regen for commit 60036bbf96caaa7a0690d9ed3dcca8bb122e75bf This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c29b30f942d) \ N -- N -- N refs/heads/regen_bot (3775340d245) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8332: Generated sources regen
github-actions[bot] opened a new pull request, #8332: URL: https://github.com/apache/camel/pull/8332 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main created (now bc89d8d2a5d)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git at bc89d8d2a5d Regen for commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c (#8329) No new revisions were added by this update.
[GitHub] [camel] oscerd merged pull request #8331: Generated sources regen
oscerd merged PR #8331: URL: https://github.com/apache/camel/pull/8331 -- 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 (ca2025d9208 -> c29b30f942d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit ca2025d9208 Regen for commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c add dd7b2bf6cba Upgrade AWS SDK v2 to version 2.17.270 add ca8cff8ad7b Sync deps add c29b30f942d Regen for commit ca8cff8ad7b0a25dc03fa062a14776b4ee6ad28f This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ca2025d9208) \ N -- N -- N refs/heads/regen_bot (c29b30f942d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8331: Generated sources regen
github-actions[bot] opened a new pull request, #8331: URL: https://github.com/apache/camel/pull/8331 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi commented on issue #3449: Raise error when dependency could not be resolved via CamelCatalog
tadayosi commented on issue #3449: URL: https://github.com/apache/camel-k/issues/3449#issuecomment-1241516458 @claudio4j FYI there is `kamel local inspect ` that does similar check but locally. -- 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(trait): Provide the service type from the trait configuration
This is an automated email from the ASF dual-hosted git repository. tsato 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 4d248940a feat(trait): Provide the service type from the trait configuration 4d248940a is described below commit 4d248940a283e81dce6fa9845001d032889baef6 Author: Nicolas Filotto AuthorDate: Thu Sep 8 09:16:06 2022 +0200 feat(trait): Provide the service type from the trait configuration --- .../camel.apache.org_integrationplatforms.yaml | 16 ++-- .../crd/bases/camel.apache.org_integrations.yaml | 8 +++- .../bases/camel.apache.org_kameletbindings.yaml| 8 +++- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 18 + docs/modules/traits/pages/service.adoc | 5 +++ e2e/global/common/traits/service_test.go | 45 ++ helm/camel-k/crds/crd-integration-platform.yaml| 16 ++-- helm/camel-k/crds/crd-integration.yaml | 8 +++- helm/camel-k/crds/crd-kamelet-binding.yaml | 8 +++- pkg/apis/camel/v1/trait/service.go | 20 ++ pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 5 +++ pkg/resources/resources.go | 16 pkg/trait/service.go | 21 -- resources/traits.yaml | 7 +++- 14 files changed, 173 insertions(+), 28 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 62eab915b..da49d6aad 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1587,9 +1587,13 @@ spec: traits share this common property. type: boolean nodePort: -description: Enable Service to be exposed as NodePort (default - `false`). +description: 'Enable Service to be exposed as NodePort (default + `false`). Deprecated: Use service type instead.' type: boolean + type: +description: The type of service to be used, either 'ClusterIP', + 'NodePort' or 'LoadBalancer'. +type: string type: object service-binding: description: The configuration of Service Binding trait @@ -3220,9 +3224,13 @@ spec: traits share this common property. type: boolean nodePort: -description: Enable Service to be exposed as NodePort (default - `false`). +description: 'Enable Service to be exposed as NodePort (default + `false`). Deprecated: Use service type instead.' type: boolean + type: +description: The type of service to be used, either 'ClusterIP', + 'NodePort' or 'LoadBalancer'. +type: string type: object service-binding: description: The configuration of Service Binding trait diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index b7219f9f7..e7c6616a6 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -7278,9 +7278,13 @@ spec: traits share this common property. type: boolean nodePort: -description: Enable Service to be exposed as NodePort (default - `false`). +description: 'Enable Service to be exposed as NodePort (default + `false`). Deprecated: Use service type instead.' type: boolean + type: +description: The type of service to be used, either 'ClusterIP', + 'NodePort' or 'LoadBalancer'. +type: string type: object service-binding: description: The configuration of Service Binding trait diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml index dbc4fc967..333b762a2 100644 --- a/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -7578,9 +7578,13 @@ spec:
[GitHub] [camel-k] tadayosi closed issue #1070: Camel K doesn't support kubernetes services of type loadbalancer
tadayosi closed issue #1070: Camel K doesn't support kubernetes services of type loadbalancer URL: https://github.com/apache/camel-k/issues/1070 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi merged pull request #3618: feat(trait): Provide the service type from the trait configuration
tadayosi merged PR #3618: URL: https://github.com/apache/camel-k/pull/3618 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kameleon] davsclaus closed issue #36: Upgrade to Camel 3.18.2
davsclaus closed issue #36: Upgrade to Camel 3.18.2 URL: https://github.com/apache/camel-kameleon/issues/36 -- 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-kameleon] branch main updated: #36: Upgrade to Camel 3.18.2
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kameleon.git
The following commit(s) were added to refs/heads/main by this push:
new 306a6ea #36: Upgrade to Camel 3.18.2
306a6ea is described below
commit 306a6ea94e2759c423d1856c88b9e27d0de9a714
Author: Claus Ibsen
AuthorDate: Fri Sep 9 07:12:35 2022 +0200
#36: Upgrade to Camel 3.18.2
---
pom.xml | 2 +-
src/main/resources/kameleon.json | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index ca59a7a..0848b55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@ under the License.
2.12.0.Final
3.0.0-M5
2.12.0
-3.18.1
+3.18.2
0.9.0
3.8.5
diff --git a/src/main/resources/kameleon.json b/src/main/resources/kameleon.json
index 2ca1f17..7c1c155 100644
--- a/src/main/resources/kameleon.json
+++ b/src/main/resources/kameleon.json
@@ -6,7 +6,7 @@
"componentListTitle": "Camel components",
"versions": [
{
- "name": "3.18.1",
+ "name": "3.18.2",
"suffix": "LTS",
"javaVersions": ["11", "17"],
"defaultJava": "11",
@@ -40,7 +40,7 @@
"componentListTitle": "Camel components",
"versions": [
{
- "name": "3.18.1",
+ "name": "3.18.2",
"suffix": "LTS",
"javaVersions": ["11", "17"],
"defaultJava": "11",
@@ -74,7 +74,7 @@
"componentListTitle": "Camel components",
"versions": [
{
- "name": "3.18.1",
+ "name": "3.18.2",
"suffix": "LTS",
"javaVersions": ["11", "17"],
"defaultJava": "11",
@@ -124,7 +124,7 @@
"componentListTitle": "Kamelets",
"versions": [
{
- "name": "3.18.1",
+ "name": "3.18.2",
"suffix": "LTS",
"javaVersions": ["11", "17"],
"defaultJava": "11",
[camel-examples] branch main updated: Moved Vault examples to a Vault folder
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 986dcb10 Moved Vault examples to a Vault folder
986dcb10 is described below
commit 986dcb1008c7abe8d9eb447a44d89dfe435bc6ad
Author: Andrea Cosentino
AuthorDate: Fri Sep 9 06:36:04 2022 +0200
Moved Vault examples to a Vault folder
---
examples/aws/pom.xml | 2 --
examples/pom.xml | 1 +
.../aws-secrets-manager-reloading/README.adoc | 0
.../aws-secrets-manager-reloading/pom.xml | 2 +-
.../org/apache/camel/example/MyApplication.java| 0
.../org/apache/camel/example/MyRouteBuilder.java | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/logback.xml | 0
.../{aws => vault}/aws-secrets-manager/README.adoc | 0
.../{aws => vault}/aws-secrets-manager/pom.xml | 2 +-
.../org/apache/camel/example/MyApplication.java| 0
.../org/apache/camel/example/MyRouteBuilder.java | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/logback.xml | 0
examples/{aws => vault}/pom.xml| 33 ++
15 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/examples/aws/pom.xml b/examples/aws/pom.xml
index 6deaab1c..c27e5d89 100644
--- a/examples/aws/pom.xml
+++ b/examples/aws/pom.xml
@@ -37,8 +37,6 @@
-aws-secrets-manager
-aws-secrets-manager-reloading
main-endpointdsl-aws2
main-endpointdsl-aws2-s3
main-endpointdsl-aws2-s3-kafka
diff --git a/examples/pom.xml b/examples/pom.xml
index 07af974a..c7ad6d7c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -157,6 +157,7 @@
telegram
transformer-demo
twitter-websocket
+vault
widget-gadget-java
widget-gadget-xml
whatsapp
diff --git a/examples/aws/aws-secrets-manager-reloading/README.adoc
b/examples/vault/aws-secrets-manager-reloading/README.adoc
similarity index 100%
rename from examples/aws/aws-secrets-manager-reloading/README.adoc
rename to examples/vault/aws-secrets-manager-reloading/README.adoc
diff --git a/examples/aws/aws-secrets-manager-reloading/pom.xml
b/examples/vault/aws-secrets-manager-reloading/pom.xml
similarity index 98%
rename from examples/aws/aws-secrets-manager-reloading/pom.xml
rename to examples/vault/aws-secrets-manager-reloading/pom.xml
index 3ae35756..c7a7dc15 100644
--- a/examples/aws/aws-secrets-manager-reloading/pom.xml
+++ b/examples/vault/aws-secrets-manager-reloading/pom.xml
@@ -23,7 +23,7 @@
org.apache.camel.example
-camel-examples-aws-parent
+camel-examples-vault-parent
3.19.0-SNAPSHOT
diff --git
a/examples/aws/aws-secrets-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/vault/aws-secrets-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
similarity index 100%
rename from
examples/aws/aws-secrets-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
rename to
examples/vault/aws-secrets-manager-reloading/src/main/java/org/apache/camel/example/MyApplication.java
diff --git
a/examples/aws/aws-secrets-manager-reloading/src/main/java/org/apache/camel/example/MyRouteBuilder.java
b/examples/vault/aws-secrets-manager-reloading/src/main/java/org/apache/camel/example/MyRouteBuilder.java
similarity index 100%
rename from
examples/aws/aws-secrets-manager-reloading/src/main/java/org/apache/camel/example/MyRouteBuilder.java
rename to
examples/vault/aws-secrets-manager-reloading/src/main/java/org/apache/camel/example/MyRouteBuilder.java
diff --git
a/examples/aws/aws-secrets-manager-reloading/src/main/resources/application.properties
b/examples/vault/aws-secrets-manager-reloading/src/main/resources/application.properties
similarity index 100%
rename from
examples/aws/aws-secrets-manager-reloading/src/main/resources/application.properties
rename to
examples/vault/aws-secrets-manager-reloading/src/main/resources/application.properties
diff --git
a/examples/aws/aws-secrets-manager-reloading/src/main/resources/logback.xml
b/examples/vault/aws-secrets-manager-reloading/src/main/resources/logback.xml
similarity index 100%
rename from
examples/aws/aws-secrets-manager-reloading/src/main/resources/logback.xml
rename to
examples/vault/aws-secrets-manager-reloading/src/main/resources/logback.xml
diff --git a/examples/aws/aws-secrets-manager/README.adoc
b/examples/vault/aws-secrets-manager/README.adoc
similarity index 100%
rename from examples/aws/aws-secrets-manager/README.adoc
rename to examples/vault/aws-secrets-manager/README.adoc
diff --git a/examples/aws/aws-secrets-manager/pom.xml
[camel] branch main updated: Regen for commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c (#8329)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new bc89d8d2a5d Regen for commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c
(#8329)
bc89d8d2a5d is described below
commit bc89d8d2a5d3420b56888ec35d995f0db2c97598
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Sep 9 07:03:02 2022 +0200
Regen for commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c (#8329)
Signed-off-by: GitHub
Signed-off-by: GitHub
Co-authored-by: jamesnetherton
---
.../src/main/java/org/apache/camel/impl/console/RouteDevConsole.java | 1 -
.../java/org/apache/camel/main/DefaultConfigurationProperties.java| 4 ++--
.../src/main/java/org/apache/camel/main/KameletMain.java | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index a37c1044c79..7be50248e07 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -25,7 +25,6 @@ import java.util.function.Function;
import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.api.management.ManagedCamelContext;
-import org.apache.camel.api.management.mbean.ManagedCamelContextMBean;
import org.apache.camel.api.management.mbean.ManagedRouteMBean;
import org.apache.camel.spi.annotations.DevConsole;
import org.apache.camel.support.PatternHelper;
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
index 32543b30b1c..887973c35a2 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationProperties.java
@@ -815,8 +815,8 @@ public abstract class DefaultConfigurationProperties {
}
/**
- * Sets whether context load statistics is enabled (something like the
unix load average).
- * The statistics requires to have camel-management on the classpath as
JMX is required.
+ * Sets whether context load statistics is enabled (something like the
unix load average). The statistics requires
+ * to have camel-management on the classpath as JMX is required.
*
* The default value is false.
*/
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index a471467bc7e..f1b80f99a07 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -22,7 +22,6 @@ import java.util.Objects;
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.ManagementStatisticsLevel;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultCamelContext;
[GitHub] [camel] davsclaus merged pull request #8329: Generated sources regen
davsclaus merged PR #8329: URL: https://github.com/apache/camel/pull/8329 -- 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: Upgrade PostgreSQL JDBC Driver to 42.4.1 (#8330)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 7e72f11c5ea Upgrade PostgreSQL JDBC Driver to 42.4.1 (#8330) 7e72f11c5ea is described below commit 7e72f11c5ea1185ed82b7a87e8f1f9ffc5569d4e Author: Tom Cunningham AuthorDate: Fri Sep 9 01:02:48 2022 -0400 Upgrade PostgreSQL JDBC Driver to 42.4.1 (#8330) --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 84a8c0869ea..3496e6c2ba4 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -441,7 +441,7 @@ 1.2.5 2.7 2.0.26 -42.4.0 +42.4.1 0.8.9 4.6.3 2.0.7 diff --git a/parent/pom.xml b/parent/pom.xml index c58629b2665..77e4ba9aa44 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -428,7 +428,7 @@ 1.2.5 2.7 2.0.26 -42.4.0 +42.4.1 0.8.9 4.6.3 2.0.7
[GitHub] [camel] davsclaus merged pull request #8330: Upgrade PostgreSQL JDBC Driver to 42.4.1
davsclaus merged PR #8330: URL: https://github.com/apache/camel/pull/8330 -- 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 (ca8cff8ad7b -> 60036bbf96c)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from ca8cff8ad7b Sync deps add 60036bbf96c Example Mojo: Considering Vault as middle folder No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/maven/packaging/PrepareExampleMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] 01/02: Upgrade AWS SDK v2 to version 2.17.270
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit dd7b2bf6cbaaed934fa961e91218f2f840d3622a Author: Andrea Cosentino AuthorDate: Fri Sep 9 06:03:13 2022 +0200 Upgrade AWS SDK v2 to version 2.17.270 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8896c051d52..c58629b2665 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -82,7 +82,7 @@ 1.11.0 1.11.0 4.2.0 -2.17.269 +2.17.270 2.6.1 1.2.14 1.2.5
[camel] branch main updated (165f7cb3a25 -> ca8cff8ad7b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 165f7cb3a25 CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervised new dd7b2bf6cba Upgrade AWS SDK v2 to version 2.17.270 new ca8cff8ad7b Sync deps The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit ca8cff8ad7b0a25dc03fa062a14776b4ee6ad28f Author: Andrea Cosentino AuthorDate: Fri Sep 9 06:55:12 2022 +0200 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 6f45ed01547..84a8c0869ea 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -65,7 +65,7 @@ 1.11.0 1.11.0 4.2.0 -2.17.269 +2.17.270 2.6.1 1.2.14 1.2.5
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1241488851 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 3019118475-765-33eb8315-4a03-4f24-aaff-1546e611d459 * Camel Quarkus Commit: 169fd312fc132fca69b9c39cb40a4c02a1f2f767 * Camel Main Commit: 74e841a798f8f785908738545f93c8cbfc435be6 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/3019118475 -- 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-kafka-connector] branch automatic-periodic-sync updated (362fdcb08 -> a6dcabfeb)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git from 362fdcb08 Updated CHANGELOG.md add a6dcabfeb [create-pull-request] automated change No new revisions were added by this update. Summary of changes: .../awscloudwatchsink/CamelAwscloudwatchsinkSinkConnector.java | 3 ++- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkConnectorConfig.java | 3 ++- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkTask.java | 3 ++- .../camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java | 3 ++- .../kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java | 3 ++- .../awsddbstreamssource/CamelAwsddbstreamssourceSourceConnector.java | 3 ++- .../CamelAwsddbstreamssourceSourceConnectorConfig.java | 3 ++- .../awsddbstreamssource/CamelAwsddbstreamssourceSourceTask.java| 3 ++- .../camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnector.java | 3 ++- .../kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkTask.java | 3 ++- .../awseventbridgesink/CamelAwseventbridgesinkSinkConnector.java | 3 ++- .../awseventbridgesink/CamelAwseventbridgesinkSinkConnectorConfig.java | 3 ++- .../awseventbridgesink/CamelAwseventbridgesinkSinkTask.java| 3 ++- .../CamelAwskinesisfirehosesinkSinkConnector.java | 3 ++- .../CamelAwskinesisfirehosesinkSinkConnectorConfig.java| 3 ++- .../awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkTask.java| 3 ++- .../awskinesissink/CamelAwskinesissinkSinkConnector.java | 3 ++- .../awskinesissink/CamelAwskinesissinkSinkConnectorConfig.java | 3 ++- .../kafkaconnector/awskinesissink/CamelAwskinesissinkSinkTask.java | 3 ++- .../awskinesissource/CamelAwskinesissourceSourceConnector.java | 3 ++- .../awskinesissource/CamelAwskinesissourceSourceConnectorConfig.java | 3 ++- .../awskinesissource/CamelAwskinesissourceSourceTask.java | 3 ++- .../kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnector.java | 3 ++- .../awslambdasink/CamelAwslambdasinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkTask.java | 3 ++- .../awsredshiftsink/CamelAwsredshiftsinkSinkConnector.java | 3 ++- .../awsredshiftsink/CamelAwsredshiftsinkSinkConnectorConfig.java | 3 ++- .../kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkTask.java | 3 ++- .../awsredshiftsource/CamelAwsredshiftsourceSourceConnector.java | 3 ++- .../awsredshiftsource/CamelAwsredshiftsourceSourceConnectorConfig.java | 3 ++- .../awsredshiftsource/CamelAwsredshiftsourceSourceTask.java| 3 ++- .../camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnector.java| 3 ++- .../kafkaconnector/awss3sink/CamelAwss3sinkSinkConnectorConfig.java| 3 ++- .../apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkTask.java | 3 ++- .../kafkaconnector/awss3source/CamelAwss3sourceSourceConnector.java| 3 ++- .../awss3source/CamelAwss3sourceSourceConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awss3source/CamelAwss3sourceSourceTask.java | 3 ++- .../CamelAwss3streaminguploadsinkSinkConnector.java| 3 ++- .../CamelAwss3streaminguploadsinkSinkConnectorConfig.java | 3 ++- .../CamelAwss3streaminguploadsinkSinkTask.java | 3 ++- .../awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnector.java | 3 ++- .../CamelAwssecretsmanagersinkSinkConnectorConfig.java | 3 ++- .../awssecretsmanagersink/CamelAwssecretsmanagersinkSinkTask.java | 3 ++- .../camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java | 3 ++- .../kafkaconnector/awssessink/CamelAwssessinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java | 3 ++- .../awssnsfifosink/CamelAwssnsfifosinkSinkConnector.java | 3 ++- .../awssnsfifosink/CamelAwssnsfifosinkSinkConnectorConfig.java | 3 ++- .../kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkTask.java | 3 ++- .../camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnector.java | 3 ++- .../kafkaconnector/awssnssink/CamelAwssnssinkSinkConnectorConfig.java | 3 ++- .../camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkTask.java | 3 ++- .../awssqsbatchsink/CamelAwssqsbatchsinkSinkConnector.java | 3 ++- .../awssqsbatchsink/CamelAwssqsbatchsinkSinkConnectorConfig.java | 3 ++- .../kafkaconnector/awssqsbatchsink/CamelAwssqsbatchsinkSinkTask.java | 3 ++- .../awssqsfifosink/CamelAwssqsfifosinkSinkConnector.java
[GitHub] [camel-kafka-connector] github-actions[bot] opened a new pull request, #1431: [Github Actions] Periodic Sync Camel-kafka-connector main Branch
github-actions[bot] opened a new pull request, #1431: URL: https://github.com/apache/camel-kafka-connector/pull/1431 Periodic Sync of Camel Kafka connector main Branch with main Camel Main. see https://github.com/apache/camel-kafka-connector/blob/main/.github/workflows/automatic-sync-camel-main.yml -- 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: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new e686318969 Updated CHANGELOG.md e686318969 is described below commit e68631896943e06e06ac83c5cb0509b68eccbf76 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Sep 9 03:57:17 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36e07dd5bb..9944e51d14 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ **Merged pull requests:** +- update virtual profiles [\#4079](https://github.com/apache/camel-quarkus/pull/4079) ([aldettinger](https://github.com/aldettinger)) - master: add test with openshift \#4077 [\#4078](https://github.com/apache/camel-quarkus/pull/4078) ([aldettinger](https://github.com/aldettinger)) - CXF test fails in Quarkus Platform because of hard-coded absolute loc… [\#4074](https://github.com/apache/camel-quarkus/pull/4074) ([ppalaga](https://github.com/ppalaga)) - Use AsciiDoc attributes to conditionally include content [\#4073](https://github.com/apache/camel-quarkus/pull/4073) ([jamesnetherton](https://github.com/jamesnetherton))
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new b5e38af1e Updated CHANGELOG.md b5e38af1e is described below commit b5e38af1e4277fc71d63eae5feb0740d49da68fd Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Sep 9 03:54:32 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d1b93e36..d1d393378 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,11 @@ **Closed issues:** -- Nightly release 1.9.x missing tests [\#3613](https://github.com/apache/camel-k/issues/3613) - Parametrize kaniko executor image to point to private registry [\#3350](https://github.com/apache/camel-k/issues/3350) - Configure parallel container image layers push based on CPU quota [\#3340](https://github.com/apache/camel-k/issues/3340) - Configure Maven builds based on CPU quota [\#3339](https://github.com/apache/camel-k/issues/3339) - Flaky E2E tests identified in 1.9.x [\#3234](https://github.com/apache/camel-k/issues/3234) - kamel log tail option [\#3004](https://github.com/apache/camel-k/issues/3004) -- Support Knative Sinks [\#1834](https://github.com/apache/camel-k/issues/1834) - Ability to set labels on knative service \(for things like "cluster-local"\) [\#1712](https://github.com/apache/camel-k/issues/1712) - Auto-install knative broker by trigger annotation [\#1456](https://github.com/apache/camel-k/issues/1456) - kamel CLI - Allow to specify a namespace to use instead of default [\#1184](https://github.com/apache/camel-k/issues/1184)
[camel-spring-boot] branch automatic-periodic-sync updated (4a7f46316e7 -> c02cd8b512a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 4a7f46316e7 CAMEL-18478 - Support Secrets Reload from Vault/Cloud Service in camel-spring-boot add c02cd8b512a camel-jbang - Add load average statistics No new revisions were added by this update. Summary of changes: core/camel-spring-boot/src/main/docs/spring-boot.json | 7 +++ .../apache/camel/spring/boot/CamelConfigurationProperties.java| 8 2 files changed, 15 insertions(+)
[GitHub] [camel-k] github-actions[bot] commented on issue #3342: kamel uninstall --all does not remove Kamelets
github-actions[bot] commented on issue #3342: URL: https://github.com/apache/camel-k/issues/3342#issuecomment-1241361588 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8330: Upgrade PostgreSQL JDBC Driver to 42.4.1
github-actions[bot] commented on PR #8330: URL: https://github.com/apache/camel/pull/8330#issuecomment-1241296181 :no_entry_sign: There are (likely) no components to be tested 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
[GitHub] [camel-k] claudio4j commented on issue #3449: Raise error when dependency could not be resolved via CamelCatalog
claudio4j commented on issue #3449: URL: https://github.com/apache/camel-k/issues/3449#issuecomment-1241277671 It seems to me there should be a parameter of `kamel run --verify-deps=` to allow the integration to run and provide feedback to the user in the case the integrations uses a dependency not in the catalog but is a resolvable one. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] claudio4j commented on issue #1122: Make integrations addressable (Knative SinkBinding)
claudio4j commented on issue #1122: URL: https://github.com/apache/camel-k/issues/1122#issuecomment-1241270866 Sure, [setting the integration as a knative addressable resource](https://knative.dev/v1.6-docs/eventing/sinks/#using-custom-resources-as-sinks) adds more opportunity to knative users to add camel-k integrations as destinations of SinkBindings. However the target integration must be aware of the CloudEvents spec as it is going to be the message protocol. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] claudio4j commented on issue #1456: Auto-install knative broker by trigger annotation
claudio4j commented on issue #1456: URL: https://github.com/apache/camel-k/issues/1456#issuecomment-1241261498 I would say yes, as the [trigger annotations](https://knative.dev/v1.6-docs/eventing/broker/triggers/#trigger-annotations) may be set in he [CreateTrigger function](https://github.com/apache/camel-k/blob/main/pkg/util/knative/knative.go#L90), this way the knative sugar controller takes care of it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] cunningt opened a new pull request, #8330: Upgrade PostgreSQL JDBC Driver to 42.4.1
cunningt opened a new pull request, #8330: URL: https://github.com/apache/camel/pull/8330 Upgrade PostgreSQL JDBC Driver to 42.4.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
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/reference/repos#update-a-repository"}
[camel-website-pub] branch asf-site updated (1a189e779 -> 0091d9433)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard 1a189e779 Website updated to 820457c9a698a120c76ccc20bd806725ef47a258 discard 8bee798bf Website updated to 325e929157412b27394080f4d4dba3d821476ddf new f8d2dfa27 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 0091d9433 Website updated to 41e78f6f68ef69d08e8eaf32613c42d4b02d4233 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1a189e779) \ N -- N -- N refs/heads/asf-site (0091d9433) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .htaccess |72 +- .well-known/security.txt | 2 +- .../09/RELEASE-3.18.2}/featured.png| Bin ...d316c94_3975989_800x0_resize_q95_gaussian_3.png | Bin blog/2022/09/RELEASE-3.18.2/index.html | 1 + blog/2022/09/camel-k-release-1-10/index.html | 2 +- blog/index.html| 2 +- blog/index.xml |15 +- blog/page/10/index.html| 2 +- blog/page/11/index.html| 2 +- blog/page/12/index.html| 2 +- blog/page/13/index.html| 2 +- blog/page/14/index.html| 2 +- blog/page/15/index.html| 2 +- blog/page/16/index.html| 2 +- blog/page/17/index.html| 2 +- blog/page/18/index.html| 2 +- blog/page/19/index.html| 2 +- blog/page/2/index.html | 2 +- blog/page/20/index.html| 2 +- blog/page/21/index.html| 2 +- blog/page/22/index.html| 2 +- blog/page/23/index.html| 2 +- blog/page/24/index.html| 2 +- blog/page/25/index.html| 2 +- blog/page/26/index.html| 2 +- blog/page/27/index.html| 2 +- blog/page/28/index.html| 2 +- blog/page/29/index.html| 2 +- blog/page/3/index.html | 2 +- blog/page/30/index.html| 2 +- blog/page/31/index.html| 2 +- blog/page/32/index.html| 2 +- blog/page/33/index.html| 2 +- blog/page/34/index.html| 2 +- blog/page/35/index.html| 2 +- blog/page/36/index.html| 2 +- blog/page/37/index.html| 2 +- blog/page/38/index.html| 2 +- blog/page/39/index.html| 2 +- blog/page/4/index.html | 2 +- blog/page/40/index.html| 2 +- blog/page/41/index.html| 2 +- blog/page/42/index.html| 2 +- blog/page/43/index.html| 2 +- blog/page/44/index.html| 2 +- blog/page/45/index.html| 2 +- blog/page/46/index.html| 2 +- blog/page/47/index.html| 2 +- blog/page/48/index.html| 2 +- blog/page/49/index.html| 2 +- blog/page/5/index.html | 2 +- blog/page/50/index.html| 2 +- blog/page/51/index.html| 2 +- blog/page/52/index.html| 2 +- blog/page/53/index.html| 2 +-
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/reference/repos#update-a-repository"}
[camel-website-pub] branch asf-site updated (753e21434 -> 1a189e779)
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git
discard 753e21434 Website updated to 8b3788b4e8fb0b1054b6cfdf83cb2dd5237a7a5c
discard 1713fe738 Website updated to 325e929157412b27394080f4d4dba3d821476ddf
new 8bee798bf Website updated to 325e929157412b27394080f4d4dba3d821476ddf
new 1a189e779 Website updated to 820457c9a698a120c76ccc20bd806725ef47a258
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (753e21434)
\
N -- N -- N refs/heads/asf-site (1a189e779)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.htaccess |64 +-
.well-known/security.txt | 2 +-
camel-spring-boot/next/spring-boot.html| 2 +-
components/next/dataformats/bindy-dataformat.html | 2 +-
components/next/others/main.html | 2 +-
...print-3.18.0.xsd => camel-blueprint-3.18.2.xsd} | 0
...0.0-M2.xsd => camel-spring-security-3.18.2.xsd} | 0
...-xml-3.18.1.xsd => camel-spring-xml-3.18.2.xsd} | 0
...-M2.xsd => camel-spring-integration-3.18.2.xsd} | 0
site-manifest.json | 2 +-
sitemap-camel-k.xml| 1110 +-
sitemap-camel-kafka-connector.xml | 1784 ++--
sitemap-camel-kamelets.xml | 1816 ++--
sitemap-camel-karaf.xml| 102 +-
sitemap-camel-quarkus.xml | 4780 -
sitemap-camel-spring-boot.xml |78 +-
sitemap-components.xml | 10226 +--
sitemap-manual.xml | 398 +-
18 files changed, 10184 insertions(+), 10184 deletions(-)
copy schema/blueprint/{camel-blueprint-3.18.0.xsd =>
camel-blueprint-3.18.2.xsd} (100%)
copy schema/spring-security/{camel-spring-security-3.0.0-M2.xsd =>
camel-spring-security-3.18.2.xsd} (100%)
copy schema/spring-xml/{camel-spring-xml-3.18.1.xsd =>
camel-spring-xml-3.18.2.xsd} (100%)
copy schema/spring/integration/{camel-spring-integration-3.0.0-M2.xsd =>
camel-spring-integration-3.18.2.xsd} (100%)
[camel-website] branch regen_bot updated (820457c9 -> 41e78f6f)
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-website.git
from 820457c9 Add XML schemas for Camel 3.18.2
add 41e78f6f Add release notes and blog entry for Camel 3.18.2
No new revisions were added by this update.
Summary of changes:
.../09/RELEASE-3.18.2}/featured.png| Bin
.../{08/RELEASE-3.18.1 => 09/RELEASE-3.18.2}/index.md | 10 +-
content/releases/release-3.18.2.md | 17 +
3 files changed, 22 insertions(+), 5 deletions(-)
copy content/blog/{2020/04/Camel32-Whatsnew =>
2022/09/RELEASE-3.18.2}/featured.png (100%)
copy content/blog/2022/{08/RELEASE-3.18.1 => 09/RELEASE-3.18.2}/index.md (68%)
create mode 100644 content/releases/release-3.18.2.md
[camel-website] branch regen_bot updated (8b3788b4 -> 820457c9)
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-website.git
from 8b3788b4 Fix Camel 3.18 LTS is 1 year support (3.14.x is special with
2 years)
add 820457c9 Add XML schemas for Camel 3.18.2
No new revisions were added by this update.
Summary of changes:
.../blueprint/{camel-blueprint-3.18.0.xsd => camel-blueprint-3.18.2.xsd} | 0
...amel-spring-security-3.0.0-M2.xsd => camel-spring-security-3.18.2.xsd} | 0
.../{camel-spring-xml-3.18.1.xsd => camel-spring-xml-3.18.2.xsd} | 0
...pring-integration-3.0.0-M2.xsd => camel-spring-integration-3.18.2.xsd} | 0
4 files changed, 0 insertions(+), 0 deletions(-)
copy static/schema/blueprint/{camel-blueprint-3.18.0.xsd =>
camel-blueprint-3.18.2.xsd} (100%)
copy static/schema/spring-security/{camel-spring-security-3.0.0-M2.xsd =>
camel-spring-security-3.18.2.xsd} (100%)
copy static/schema/spring-xml/{camel-spring-xml-3.18.1.xsd =>
camel-spring-xml-3.18.2.xsd} (100%)
copy static/schema/spring/integration/{camel-spring-integration-3.0.0-M2.xsd
=> camel-spring-integration-3.18.2.xsd} (100%)
[camel-website] branch main updated: Add release notes and blog entry for Camel 3.18.2
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new 41e78f6f Add release notes and blog entry for Camel 3.18.2 41e78f6f is described below commit 41e78f6f68ef69d08e8eaf32613c42d4b02d4233 Author: Gregor Zurowski AuthorDate: Thu Sep 8 21:40:56 2022 +0200 Add release notes and blog entry for Camel 3.18.2 --- content/blog/2022/09/RELEASE-3.18.2/featured.png | Bin 0 -> 3975989 bytes content/blog/2022/09/RELEASE-3.18.2/index.md | 18 ++ content/releases/release-3.18.2.md | 17 + 3 files changed, 35 insertions(+) diff --git a/content/blog/2022/09/RELEASE-3.18.2/featured.png b/content/blog/2022/09/RELEASE-3.18.2/featured.png new file mode 100644 index ..e5077f55 Binary files /dev/null and b/content/blog/2022/09/RELEASE-3.18.2/featured.png differ diff --git a/content/blog/2022/09/RELEASE-3.18.2/index.md b/content/blog/2022/09/RELEASE-3.18.2/index.md new file mode 100644 index ..0b89abae --- /dev/null +++ b/content/blog/2022/09/RELEASE-3.18.2/index.md @@ -0,0 +1,18 @@ +--- +title: "RELEASE 3.18.2" +date: 2022-09-08 +draft: false +authors: [gzurowski] +categories: ["Releases"] +preview: "The Camel community announces the immediate availability of the new Camel 3.18.2 LTS release" +--- + + +The Camel community announces the immediate availability of Camel 3.18.2, a new patch release with 50 improvements and fixes. + +The artifacts are published and ready for you to download from the Central Maven repository. For more details please take a look at the [release notes](/releases/release-3.18.2/). + +Many thanks to all who made this release possible. + +On behalf of the Camel PMC, +Gregor Zurowski diff --git a/content/releases/release-3.18.2.md b/content/releases/release-3.18.2.md new file mode 100644 index ..3586d467 --- /dev/null +++ b/content/releases/release-3.18.2.md @@ -0,0 +1,17 @@ +--- +date: 2022-09-08 +eol: 2023-08-11 +draft: false +type: release-note +version: 3.18.2 +title: "Release 3.18.2" +preview: "New LTS release 3.18.2" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12352166 +category: camel +kind: lts +jdk: [11,17] +--- + +This release is the new Camel 3.18.2 LTS patch release.
[camel-spring-boot] branch release/3.18.2 deleted (was c027a3eae39)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.18.2 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was c027a3eae39 [maven-release-plugin] prepare for next development iteration 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 release/3.18.2 deleted (was a222c1b3f5a)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.18.2 in repository https://gitbox.apache.org/repos/asf/camel.git was a222c1b3f5a [maven-release-plugin] prepare for next development iteration 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-karaf] branch release/3.18.2 deleted (was 8327f29f)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.18.2 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 8327f29f [maven-release-plugin] prepare for next development iteration 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-karaf] 01/02: Merge branch 'release/3.18.2' into camel-karaf-3.18.x
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-karaf-3.18.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit 2629659f1a5b82ea3ac9f26433dfcef76fc79fb7 Merge: bcb9b85e 8327f29f Author: Gregor Zurowski AuthorDate: Thu Sep 8 19:36:10 2022 + Merge branch 'release/3.18.2' into camel-karaf-3.18.x archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 2 +- catalog/pom.xml| 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint-junit5/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 2 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 8 tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 38 files changed, 41 insertions(+), 41 deletions(-)
[camel-karaf] branch camel-karaf-3.18.x updated (bcb9b85e -> 815fe50e)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch camel-karaf-3.18.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from bcb9b85e Fix camel-protobuf due to recent change - osgi import problem with guava :( add c3ef4f79 Target Camel 3.18.2 for release add 92563ffd [maven-release-plugin] prepare release camel-karaf-3.18.2 add 8327f29f [maven-release-plugin] prepare for next development iteration new 2629659f Merge branch 'release/3.18.2' into camel-karaf-3.18.x new 815fe50e Target Camel 3.18.3-SNAPSHOT for development The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 2 +- catalog/pom.xml| 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint-junit5/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 2 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 8 tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 38 files changed, 41 insertions(+), 41 deletions(-)
[camel-karaf] 02/02: Target Camel 3.18.3-SNAPSHOT for development
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-karaf-3.18.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit 815fe50e06c198469770cfcc16a00f886280cfc8 Author: Gregor Zurowski AuthorDate: Thu Sep 8 19:36:44 2022 + Target Camel 3.18.3-SNAPSHOT for development --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e332368a..a369f30b 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.18.2 +3.18.3-SNAPSHOT org.apache.camel.karaf @@ -108,7 +108,7 @@ 4.3.7 -3.18.2 +3.18.3-SNAPSHOT 1.7.0_6 3.5.2_1 @@ -775,7 +775,7 @@ dev -3.18.2 +3.18.3-SNAPSHOT
[camel-spring-boot] 01/02: Merge branch 'release/3.18.2' into camel-spring-boot-3.18.x
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-spring-boot-3.18.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit d6a11b453c5a94b06b13c372dbad41dc76e1f463 Merge: ee4501501dc c027a3eae39 Author: Gregor Zurowski AuthorDate: Thu Sep 8 19:34:02 2022 + Merge branch 'release/3.18.2' into camel-spring-boot-3.18.x archetypes/camel-archetype-spring-boot/pom.xml | 2 +- archetypes/pom.xml | 2 +- catalog/camel-catalog-provider-springboot/pom.xml | 2 +- catalog/pom.xml| 2 +- components-starter/camel-activemq-starter/pom.xml | 2 +- components-starter/camel-ahc-starter/pom.xml | 2 +- components-starter/camel-ahc-ws-starter/pom.xml| 2 +- components-starter/camel-amqp-starter/pom.xml | 2 +- components-starter/camel-any23-starter/pom.xml | 2 +- components-starter/camel-arangodb-starter/pom.xml | 2 +- components-starter/camel-as2-starter/pom.xml | 2 +- components-starter/camel-asn1-starter/pom.xml | 2 +- components-starter/camel-asterisk-starter/pom.xml | 2 +- components-starter/camel-atlasmap-starter/pom.xml | 2 +- components-starter/camel-atmos-starter/pom.xml | 2 +- .../camel-atmosphere-websocket-starter/pom.xml | 2 +- components-starter/camel-atom-starter/pom.xml | 2 +- components-starter/camel-avro-rpc-starter/pom.xml | 2 +- components-starter/camel-avro-starter/pom.xml | 2 +- .../camel-aws-secrets-manager-starter/pom.xml | 2 +- components-starter/camel-aws-xray-starter/pom.xml | 2 +- .../camel-aws2-athena-starter/pom.xml | 2 +- components-starter/camel-aws2-cw-starter/pom.xml | 2 +- components-starter/camel-aws2-ddb-starter/pom.xml | 2 +- components-starter/camel-aws2-ec2-starter/pom.xml | 2 +- components-starter/camel-aws2-ecs-starter/pom.xml | 2 +- components-starter/camel-aws2-eks-starter/pom.xml | 2 +- .../camel-aws2-eventbridge-starter/pom.xml | 2 +- components-starter/camel-aws2-iam-starter/pom.xml | 2 +- .../camel-aws2-kinesis-starter/pom.xml | 2 +- components-starter/camel-aws2-kms-starter/pom.xml | 2 +- .../camel-aws2-lambda-starter/pom.xml | 2 +- components-starter/camel-aws2-mq-starter/pom.xml | 2 +- components-starter/camel-aws2-msk-starter/pom.xml | 2 +- components-starter/camel-aws2-s3-starter/pom.xml | 2 +- components-starter/camel-aws2-ses-starter/pom.xml | 2 +- components-starter/camel-aws2-sns-starter/pom.xml | 2 +- components-starter/camel-aws2-sqs-starter/pom.xml | 2 +- components-starter/camel-aws2-sts-starter/pom.xml | 2 +- .../camel-aws2-translate-starter/pom.xml | 2 +- .../camel-azure-cosmosdb-starter/pom.xml | 2 +- .../camel-azure-eventhubs-starter/pom.xml | 2 +- .../camel-azure-key-vault-starter/pom.xml | 2 +- .../camel-azure-servicebus-starter/pom.xml | 2 +- .../camel-azure-storage-blob-starter/pom.xml | 2 +- .../camel-azure-storage-datalake-starter/pom.xml | 2 +- .../camel-azure-storage-queue-starter/pom.xml | 2 +- components-starter/camel-barcode-starter/pom.xml | 2 +- components-starter/camel-base64-starter/pom.xml| 2 +- components-starter/camel-bean-starter/pom.xml | 2 +- .../camel-bean-validator-starter/pom.xml | 2 +- components-starter/camel-bindy-starter/pom.xml | 2 +- components-starter/camel-bonita-starter/pom.xml| 2 +- components-starter/camel-box-starter/pom.xml | 2 +- components-starter/camel-braintree-starter/pom.xml | 2 +- components-starter/camel-browse-starter/pom.xml| 2 +- .../camel-caffeine-lrucache-starter/pom.xml| 2 +- components-starter/camel-caffeine-starter/pom.xml | 2 +- .../camel-cassandraql-starter/pom.xml | 2 +- components-starter/camel-cbor-starter/pom.xml | 2 +- .../camel-chatscript-starter/pom.xml | 2 +- components-starter/camel-chunk-starter/pom.xml | 2 +- .../camel-cloudevents-starter/pom.xml | 2 +- components-starter/camel-cm-sms-starter/pom.xml| 2 +- components-starter/camel-cmis-starter/pom.xml | 2 +- components-starter/camel-coap-starter/pom.xml | 2 +- components-starter/camel-cometd-starter/pom.xml| 2 +- components-starter/camel-console-starter/pom.xml | 2 +- components-starter/camel-consul-starter/pom.xml| 2 +- .../camel-controlbus-starter/pom.xml | 2 +- components-starter/camel-corda-starter/pom.xml | 2 +- components-starter/camel-core-starter/pom.xml | 2 +- components-starter/camel-couchbase-starter/pom.xml | 2 +- components-starter/camel-couchdb-starter/pom.xml | 2 +- components-starter/camel-cron-starter/pom.xml | 2 +-
[camel-spring-boot] 02/02: Target Camel 3.18.3-SNAPSHOT for development
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-spring-boot-3.18.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 1f6d56c8f5ba7781e96e888a2f153ad833215e37 Author: Gregor Zurowski AuthorDate: Thu Sep 8 19:34:56 2022 + Target Camel 3.18.3-SNAPSHOT for development --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e97e7155d96..e83c9b71139 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.18.2 +3.18.3-SNAPSHOT org.apache.camel.springboot @@ -111,7 +111,7 @@ 2.7.3 -3.18.2 +3.18.3-SNAPSHOT 1.0.2.v20150114 @@ -453,7 +453,7 @@ dev -3.18.2 +3.18.3-SNAPSHOT
[camel-spring-boot] branch camel-spring-boot-3.18.x updated (ee4501501dc -> 1f6d56c8f5b)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch camel-spring-boot-3.18.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from ee4501501dc CAMEL-18427: camel-debezium - Fix DBZ moved class in a patch release causing the Camel components to not work out of the box. add 934701c19db Target Camel 3.18.2 for release add afe91a4a2fd [maven-release-plugin] prepare release camel-spring-boot-3.18.2 add c027a3eae39 [maven-release-plugin] prepare for next development iteration new d6a11b453c5 Merge branch 'release/3.18.2' into camel-spring-boot-3.18.x new 1f6d56c8f5b Target Camel 3.18.3-SNAPSHOT for development The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- archetypes/pom.xml | 2 +- catalog/camel-catalog-provider-springboot/pom.xml | 2 +- catalog/pom.xml| 2 +- components-starter/camel-activemq-starter/pom.xml | 2 +- components-starter/camel-ahc-starter/pom.xml | 2 +- components-starter/camel-ahc-ws-starter/pom.xml| 2 +- components-starter/camel-amqp-starter/pom.xml | 2 +- components-starter/camel-any23-starter/pom.xml | 2 +- components-starter/camel-arangodb-starter/pom.xml | 2 +- components-starter/camel-as2-starter/pom.xml | 2 +- components-starter/camel-asn1-starter/pom.xml | 2 +- components-starter/camel-asterisk-starter/pom.xml | 2 +- components-starter/camel-atlasmap-starter/pom.xml | 2 +- components-starter/camel-atmos-starter/pom.xml | 2 +- .../camel-atmosphere-websocket-starter/pom.xml | 2 +- components-starter/camel-atom-starter/pom.xml | 2 +- components-starter/camel-avro-rpc-starter/pom.xml | 2 +- components-starter/camel-avro-starter/pom.xml | 2 +- .../camel-aws-secrets-manager-starter/pom.xml | 2 +- components-starter/camel-aws-xray-starter/pom.xml | 2 +- .../camel-aws2-athena-starter/pom.xml | 2 +- components-starter/camel-aws2-cw-starter/pom.xml | 2 +- components-starter/camel-aws2-ddb-starter/pom.xml | 2 +- components-starter/camel-aws2-ec2-starter/pom.xml | 2 +- components-starter/camel-aws2-ecs-starter/pom.xml | 2 +- components-starter/camel-aws2-eks-starter/pom.xml | 2 +- .../camel-aws2-eventbridge-starter/pom.xml | 2 +- components-starter/camel-aws2-iam-starter/pom.xml | 2 +- .../camel-aws2-kinesis-starter/pom.xml | 2 +- components-starter/camel-aws2-kms-starter/pom.xml | 2 +- .../camel-aws2-lambda-starter/pom.xml | 2 +- components-starter/camel-aws2-mq-starter/pom.xml | 2 +- components-starter/camel-aws2-msk-starter/pom.xml | 2 +- components-starter/camel-aws2-s3-starter/pom.xml | 2 +- components-starter/camel-aws2-ses-starter/pom.xml | 2 +- components-starter/camel-aws2-sns-starter/pom.xml | 2 +- components-starter/camel-aws2-sqs-starter/pom.xml | 2 +- components-starter/camel-aws2-sts-starter/pom.xml | 2 +- .../camel-aws2-translate-starter/pom.xml | 2 +- .../camel-azure-cosmosdb-starter/pom.xml | 2 +- .../camel-azure-eventhubs-starter/pom.xml | 2 +- .../camel-azure-key-vault-starter/pom.xml | 2 +- .../camel-azure-servicebus-starter/pom.xml | 2 +- .../camel-azure-storage-blob-starter/pom.xml | 2 +- .../camel-azure-storage-datalake-starter/pom.xml | 2 +- .../camel-azure-storage-queue-starter/pom.xml | 2 +- components-starter/camel-barcode-starter/pom.xml | 2 +- components-starter/camel-base64-starter/pom.xml| 2 +- components-starter/camel-bean-starter/pom.xml | 2 +- .../camel-bean-validator-starter/pom.xml | 2 +- components-starter/camel-bindy-starter/pom.xml | 2 +- components-starter/camel-bonita-starter/pom.xml| 2 +- components-starter/camel-box-starter/pom.xml | 2 +- components-starter/camel-braintree-starter/pom.xml | 2 +- components-starter/camel-browse-starter/pom.xml| 2 +- .../camel-caffeine-lrucache-starter/pom.xml| 2 +- components-starter/camel-caffeine-starter/pom.xml | 2 +- .../camel-cassandraql-starter/pom.xml | 2 +- components-starter/camel-cbor-starter/pom.xml | 2 +- .../camel-chatscript-starter/pom.xml | 2 +- components-starter/camel-chunk-starter/pom.xml | 2 +- .../camel-cloudevents-starter/pom.xml | 2 +- components-starter/camel-cm-sms-starter/pom.xml| 2 +- components-starter/camel-cmis-starter/pom.xml | 2 +- components-starter/camel-coap-starter/pom.xml | 2
[camel] branch camel-3.18.x updated (e233b5bcf8e -> ea5485b1988)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git from e233b5bcf8e CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervised add 318bfdee255 [maven-release-plugin] prepare release camel-3.18.2 add a222c1b3f5a [maven-release-plugin] prepare for next development iteration new ea5485b1988 Merge branch 'release/3.18.2' into camel-3.18.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: apache-camel/pom.xml | 2 +- archetypes/camel-archetype-api-component/pom.xml | 2 +- archetypes/camel-archetype-cdi/pom.xml | 2 +- archetypes/camel-archetype-component/pom.xml | 2 +- archetypes/camel-archetype-dataformat/pom.xml | 2 +- archetypes/camel-archetype-java/pom.xml| 2 +- archetypes/camel-archetype-main/pom.xml| 2 +- archetypes/camel-archetype-spring/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-bom/pom.xml | 2 +- bom/pom.xml| 2 +- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 23 +++--- catalog/camel-allcomponents/pom.xml| 2 +- catalog/camel-catalog-console/pom.xml | 2 +- catalog/camel-catalog-lucene/pom.xml | 2 +- catalog/camel-catalog-maven/pom.xml| 2 +- catalog/camel-catalog/pom.xml | 2 +- catalog/camel-csimple-maven-plugin/pom.xml | 2 +- catalog/camel-report-maven-plugin/pom.xml | 2 +- catalog/camel-route-parser/pom.xml | 2 +- catalog/dummy-component/pom.xml| 2 +- catalog/pom.xml| 2 +- components/camel-activemq/pom.xml | 2 +- components/camel-ahc-ws/pom.xml| 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-any23/pom.xml | 2 +- components/camel-arangodb/pom.xml | 2 +- components/camel-as2/camel-as2-api/pom.xml | 2 +- components/camel-as2/camel-as2-component/pom.xml | 2 +- components/camel-as2/pom.xml | 2 +- components/camel-asn1/pom.xml | 2 +- components/camel-asterisk/pom.xml | 2 +- components/camel-atlasmap/pom.xml | 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-attachments/pom.xml | 2 +- .../camel-avro-rpc-component/pom.xml | 2 +- .../camel-avro-rpc/camel-avro-rpc-jetty/pom.xml| 2 +- .../camel-avro-rpc/camel-avro-rpc-spi/pom.xml | 2 +- components/camel-avro-rpc/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- .../camel-aws/camel-aws-secrets-manager/pom.xml| 2 +- components/camel-aws/camel-aws-xray/pom.xml| 2 +- components/camel-aws/camel-aws2-athena/pom.xml | 2 +- components/camel-aws/camel-aws2-cw/pom.xml | 2 +- components/camel-aws/camel-aws2-ddb/pom.xml| 2 +- components/camel-aws/camel-aws2-ec2/pom.xml| 2 +- components/camel-aws/camel-aws2-ecs/pom.xml| 2 +- components/camel-aws/camel-aws2-eks/pom.xml| 2 +- .../camel-aws/camel-aws2-eventbridge/pom.xml | 2 +- components/camel-aws/camel-aws2-iam/pom.xml| 2 +- components/camel-aws/camel-aws2-kinesis/pom.xml| 2 +- components/camel-aws/camel-aws2-kms/pom.xml| 2 +- components/camel-aws/camel-aws2-lambda/pom.xml | 2 +- components/camel-aws/camel-aws2-mq/pom.xml | 2 +- components/camel-aws/camel-aws2-msk/pom.xml| 2 +- components/camel-aws/camel-aws2-s3/pom.xml | 2 +- components/camel-aws/camel-aws2-ses/pom.xml| 2 +- components/camel-aws/camel-aws2-sns/pom.xml| 2 +- components/camel-aws/camel-aws2-sqs/pom.xml| 2 +- components/camel-aws/camel-aws2-sts/pom.xml| 2 +- components/camel-aws/camel-aws2-translate/pom.xml | 2 +- components/camel-aws/pom.xml | 2 +- .../camel-azure/camel-azure-cosmosdb/pom.xml | 2 +- .../camel-azure/camel-azure-eventhubs/pom.xml | 2 +- .../camel-azure/camel-azure-key-vault/pom.xml | 2 +-
[camel] 01/01: Merge branch 'release/3.18.2' into camel-3.18.x
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git commit ea5485b1988f5c3f9c7a4d2bc885d377e0a2c6ba Merge: e233b5bcf8e a222c1b3f5a Author: Gregor Zurowski AuthorDate: Thu Sep 8 19:32:32 2022 + Merge branch 'release/3.18.2' into camel-3.18.x apache-camel/pom.xml | 2 +- archetypes/camel-archetype-api-component/pom.xml | 2 +- archetypes/camel-archetype-cdi/pom.xml | 2 +- archetypes/camel-archetype-component/pom.xml | 2 +- archetypes/camel-archetype-dataformat/pom.xml | 2 +- archetypes/camel-archetype-java/pom.xml| 2 +- archetypes/camel-archetype-main/pom.xml| 2 +- archetypes/camel-archetype-spring/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-bom/pom.xml | 2 +- bom/pom.xml| 2 +- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 23 +++--- catalog/camel-allcomponents/pom.xml| 2 +- catalog/camel-catalog-console/pom.xml | 2 +- catalog/camel-catalog-lucene/pom.xml | 2 +- catalog/camel-catalog-maven/pom.xml| 2 +- catalog/camel-catalog/pom.xml | 2 +- catalog/camel-csimple-maven-plugin/pom.xml | 2 +- catalog/camel-report-maven-plugin/pom.xml | 2 +- catalog/camel-route-parser/pom.xml | 2 +- catalog/dummy-component/pom.xml| 2 +- catalog/pom.xml| 2 +- components/camel-activemq/pom.xml | 2 +- components/camel-ahc-ws/pom.xml| 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-any23/pom.xml | 2 +- components/camel-arangodb/pom.xml | 2 +- components/camel-as2/camel-as2-api/pom.xml | 2 +- components/camel-as2/camel-as2-component/pom.xml | 2 +- components/camel-as2/pom.xml | 2 +- components/camel-asn1/pom.xml | 2 +- components/camel-asterisk/pom.xml | 2 +- components/camel-atlasmap/pom.xml | 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-attachments/pom.xml | 2 +- .../camel-avro-rpc-component/pom.xml | 2 +- .../camel-avro-rpc/camel-avro-rpc-jetty/pom.xml| 2 +- .../camel-avro-rpc/camel-avro-rpc-spi/pom.xml | 2 +- components/camel-avro-rpc/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- .../camel-aws/camel-aws-secrets-manager/pom.xml| 2 +- components/camel-aws/camel-aws-xray/pom.xml| 2 +- components/camel-aws/camel-aws2-athena/pom.xml | 2 +- components/camel-aws/camel-aws2-cw/pom.xml | 2 +- components/camel-aws/camel-aws2-ddb/pom.xml| 2 +- components/camel-aws/camel-aws2-ec2/pom.xml| 2 +- components/camel-aws/camel-aws2-ecs/pom.xml| 2 +- components/camel-aws/camel-aws2-eks/pom.xml| 2 +- .../camel-aws/camel-aws2-eventbridge/pom.xml | 2 +- components/camel-aws/camel-aws2-iam/pom.xml| 2 +- components/camel-aws/camel-aws2-kinesis/pom.xml| 2 +- components/camel-aws/camel-aws2-kms/pom.xml| 2 +- components/camel-aws/camel-aws2-lambda/pom.xml | 2 +- components/camel-aws/camel-aws2-mq/pom.xml | 2 +- components/camel-aws/camel-aws2-msk/pom.xml| 2 +- components/camel-aws/camel-aws2-s3/pom.xml | 2 +- components/camel-aws/camel-aws2-ses/pom.xml| 2 +- components/camel-aws/camel-aws2-sns/pom.xml| 2 +- components/camel-aws/camel-aws2-sqs/pom.xml| 2 +- components/camel-aws/camel-aws2-sts/pom.xml| 2 +- components/camel-aws/camel-aws2-translate/pom.xml | 2 +- components/camel-aws/pom.xml | 2 +- .../camel-azure/camel-azure-cosmosdb/pom.xml | 2 +- .../camel-azure/camel-azure-eventhubs/pom.xml | 2 +- .../camel-azure/camel-azure-key-vault/pom.xml | 2 +- .../camel-azure/camel-azure-servicebus/pom.xml | 2 +- .../camel-azure/camel-azure-storage-blob/pom.xml | 2 +- .../camel-azure-storage-datalake/pom.xml | 2 +- .../camel-azure/camel-azure-storage-queue/pom.xml | 2 +- components/camel-azure/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml| 2 +-
svn commit: r56749 - /release/camel/apache-camel/3.18.1/
Author: gzurowski Date: Thu Sep 8 18:08:18 2022 New Revision: 56749 Log: Removed the old release Removed: release/camel/apache-camel/3.18.1/
svn commit: r56748 - in /release/camel/apache-camel/3.18.2: apache-camel-3.18.2-src.zip apache-camel-3.18.2-src.zip.asc apache-camel-3.18.2-src.zip.sha512 apache-camel-3.18.2.pom apache-camel-3.18.2.p
Author: gzurowski Date: Thu Sep 8 18:07:34 2022 New Revision: 56748 Log: Apache Camel 3.18.2 released artifacts. Added: release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip (with props) release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip.asc release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip.sha512 release/camel/apache-camel/3.18.2/apache-camel-3.18.2.pom release/camel/apache-camel/3.18.2/apache-camel-3.18.2.pom.asc release/camel/apache-camel/3.18.2/apache-camel-3.18.2.pom.sha512 Added: release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip == Binary file - no diff available. Propchange: release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip -- svn:mime-type = application/octet-stream Added: release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip.asc == --- release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip.asc (added) +++ release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip.asc Thu Sep 8 18:07:34 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEYOzvJGEf6DJxT4aqnVvv+llCwEkFAmMVq18ACgkQnVvv+llC +wEmXDw//amOBReyv0p2l+NYlbHF9pjU4146pficqTz8H+pCD3ec1Jq9SxfAYzMA3 +ayM1DxdJQNjmqk0emfwG6NtGnagnErsrOgHji7MlBxeLxauaPilKHk3s7RMpKFSW +qowDiIxfYBtBtG+Grgj612Qsvy8cFDBdgWz6/3OYL6rubVO5ItPUXn1xKUKVmWGY +UTDGfLUwH4sgRDqs3ldjxk2kEp2uG5HTgKhuh8agT6ER5Fs5R+m58eEpP/hZWcCP +XGFmNJUYeV1Xsqbty4IvMitW/OzyfnxsMsHgosTmEqMcintHYRhReBE//ESduBeh +gWRhR78y94cjUdbtqjVl2ZB/GSSfqo+rtTKrzoi87QM1QD8jq75cYXpQXtpCggeP +1HSQfWERdr2cSoUQKe3/8uWcifb2wf+vHbMHpf9qonqmKxAWi2p1Xhb4d2vfkvzw +uSwbmCSF8aBaKyghupPqaonuY/QcPY5o8XrIKLQXzmRzfAL3+pYyS/xjmiDWX6Qt +Sn2vR6wbJSj8cyrlU65BeRJ1h+pPlyBLdtjhcpthMcEd+rvYqcDqkDx7gTi8djrW +/l+CPN1rfH+SlPejFke734bUjcMHfJU5ZlDTO3SX/LE4xmEn/rb2SqKY/6pMKuur +KZgeUCiSaMcaxCczw/xwMGGPr83YHKZQtvtIJWJ+2zi6zZglbyA= +=6L5+ +-END PGP SIGNATURE- Added: release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip.sha512 == --- release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip.sha512 (added) +++ release/camel/apache-camel/3.18.2/apache-camel-3.18.2-src.zip.sha512 Thu Sep 8 18:07:34 2022 @@ -0,0 +1 @@ +4d9c26fc7da745cd2c5b0ded9461d040ffa77d76e207eb237742b205a808f42be0679f8927a2253171cafde914e4815bf2225be832e3ff75c2de66bf571b4895 apache-camel-3.18.2-src.zip Added: release/camel/apache-camel/3.18.2/apache-camel-3.18.2.pom == --- release/camel/apache-camel/3.18.2/apache-camel-3.18.2.pom (added) +++ release/camel/apache-camel/3.18.2/apache-camel-3.18.2.pom Thu Sep 8 18:07:34 2022 @@ -0,0 +1,300 @@ + + +http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +org.apache.camel +camel-parent +3.18.2 +../parent + + org.apache.camel + apache-camel + 3.18.2 + pom + Camel :: Assembly + Apache Camel Assembly + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + +false +true +gnu +true + + + + org.apache.camel + camel-api + 3.18.2 + compile + + + org.apache.camel + camel-util + 3.18.2 + compile + + + org.apache.camel + camel-management-api + 3.18.2 + compile + + + org.apache.camel + camel-management + 3.18.2 + compile + + + org.apache.camel + camel-base + 3.18.2 + compile + + + org.apache.camel + camel-base-engine + 3.18.2 + compile + + + org.apache.camel + camel-support + 3.18.2 + compile + + + org.apache.camel + camel-core + 3.18.2 + compile + + + org.apache.camel + camel-core-engine + 3.18.2 + compile + + + org.apache.camel + camel-core-model + 3.18.2 + compile + + + org.apache.camel + camel-core-processor + 3.18.2 + compile + + + org.apache.camel + camel-core-reifier + 3.18.2 + compile + + + org.apache.camel + camel-core-languages + 3.18.2 + compile + + + org.apache.camel + camel-core-xml + 3.18.2 + compile + + + org.apache.camel + camel-core-catalog + 3.18.2 + compile + + + org.apache.camel + camel-cloud + 3.18.2 + compile + + + org.apache.camel + camel-cluster + 3.18.2 + compile + + +
[GitHub] [camel-k] essobedo commented on issue #2850: Provide a command to add a repo for custom Kamelet catalog
essobedo commented on issue #2850: URL: https://github.com/apache/camel-k/issues/2850#issuecomment-1241038305 Should be fixed by https://github.com/apache/camel-k/pull/3623 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] essobedo opened a new pull request, #3623: feat(cli): Add add-repo command to add a repo for custom Kamelet catalog
essobedo opened a new pull request, #3623: URL: https://github.com/apache/camel-k/pull/3623 fixes #2850 ## Motivation Up to now, the only way to define a Kamelet repository is to edit the integration platform to add it manually which is not really convenient. The idea of the improvement is to add a new command to be able to add Kamelet repositories. ## Modifications: * Add a new sub-command of `kamelet` called `add-repo` * Align the code of some commands regarding how to run them with the rest of the commands (not directly related) **Release Note** ```release-note feat(cli): Add add-repo command to add a repo for custom Kamelet catalog ``` -- 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] 01/01: feat(cli): Add add-repo command to add a repo for custom Kamelet catalog
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch 2850/add-custom-kamelet-catalog
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f4facf6e6e444a70ef2795ba24a0aadae47b4e44
Author: Nicolas Filotto
AuthorDate: Thu Sep 8 19:18:31 2022 +0200
feat(cli): Add add-repo command to add a repo for custom Kamelet catalog
---
.../files/TimerCustomKameletIntegration.java | 28 ++
e2e/global/common/kamelet_test.go | 46 ++---
pkg/cmd/kamelet.go | 1 +
pkg/cmd/kamelet_add_repo.go| 111 +
pkg/cmd/kamelet_get.go | 5 +-
pkg/cmd/kit_get.go | 5 +-
6 files changed, 176 insertions(+), 20 deletions(-)
diff --git a/e2e/global/common/files/TimerCustomKameletIntegration.java
b/e2e/global/common/files/TimerCustomKameletIntegration.java
new file mode 100644
index 0..9f749d834
--- /dev/null
+++ b/e2e/global/common/files/TimerCustomKameletIntegration.java
@@ -0,0 +1,28 @@
+/*
+ * 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 java.lang.Exception;
+import java.lang.Override;
+import org.apache.camel.builder.RouteBuilder;
+
+public class TimerCustomKameletIntegration extends RouteBuilder {
+@Override
+public void configure() throws Exception {
+from("kamelet:timer-custom-source?message=great%20message")
+.to("log:info");
+}
+}
diff --git a/e2e/global/common/kamelet_test.go
b/e2e/global/common/kamelet_test.go
index d255f7319..c9e08e251 100644
--- a/e2e/global/common/kamelet_test.go
+++ b/e2e/global/common/kamelet_test.go
@@ -41,18 +41,40 @@ func TestKameletClasspathLoading(t *testing.T) {
Eventually(Kamelet(kameletName, ns)).Should(BeNil())
- Expect(KamelRunWithID(operatorID, ns,
"files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
- "--resource",
"file:files/timer-source.kamelet.yaml@/kamelets/timer-source.kamelet.yaml",
- "-p camel.component.kamelet.location=file:/kamelets",
- "-d", "camel:yaml-dsl",
- // kamelet dependencies
- "-d", "camel:timer").Execute()).To(Succeed())
- Eventually(IntegrationPodPhase(ns,
"timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
-
- Eventually(IntegrationLogs(ns,
"timer-kamelet-integration")).Should(ContainSubstring("important message"))
-
- // Cleanup
- Expect(Kamel("delete", "--all", "-n",
ns).Execute()).Should(BeNil())
+ // Basic
+ t.Run("test basic case", func(t *testing.T) {
+
+ Expect(KamelRunWithID(operatorID, ns,
"files/TimerKameletIntegration.java", "-t", "kamelets.enabled=false",
+ "--resource",
"file:files/timer-source.kamelet.yaml@/kamelets/timer-source.kamelet.yaml",
+ "-p
camel.component.kamelet.location=file:/kamelets",
+ "-d", "camel:yaml-dsl",
+ // kamelet dependencies
+ "-d", "camel:timer").Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns,
"timer-kamelet-integration"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
+
+ Eventually(IntegrationLogs(ns,
"timer-kamelet-integration")).Should(ContainSubstring("important message"))
+
+ // Cleanup
+ Expect(Kamel("delete", "--all", "-n",
ns).Execute()).Should(BeNil())
+ })
+
+ // Custom repo
+ t.Run("test custom Kamelet repository", func(t *testing.T) {
+
+ // Add the custom repository
+ Expect(Kamel("kamelet", "add-repo",
"github:essobedo/camel-k-test/kamelets", "-n", ns, "-x",
operatorID).Execute()).To(Succeed())
+
+ Expect(KamelRunWithID(operatorID, ns,
"files/TimerCustomKameletIntegration.java",
+
[camel-k] branch 2850/add-custom-kamelet-catalog created (now f4facf6e6)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch 2850/add-custom-kamelet-catalog in repository https://gitbox.apache.org/repos/asf/camel-k.git at f4facf6e6 feat(cli): Add add-repo command to add a repo for custom Kamelet catalog This branch includes the following new commits: new f4facf6e6 feat(cli): Add add-repo command to add a repo for custom Kamelet catalog 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 (c7089f77e2b -> ca2025d9208)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit c7089f77e2b Regen for commit 838646711ca8cad2b41cdfdb1b893ea8fce31f04 add 165f7cb3a25 CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervised add ca2025d9208 Regen for commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c7089f77e2b) \ N -- N -- N refs/heads/regen_bot (ca2025d9208) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel-microprofile-health/pom.xml | 5 ++ .../CamelMicroProfileHealthCheckRegistry.java | 27 +-- ...MicroProfileHealthSupervisedRoutesMainTest.java | 90 ++ .../health/CamelMicroProfileHealthTestHelper.java | 78 +++ .../health/CamelMicroProfileHealthTestSupport.java | 34 ++-- 5 files changed, 199 insertions(+), 35 deletions(-) create mode 100644 components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthSupervisedRoutesMainTest.java create mode 100644 components/camel-microprofile/camel-microprofile-health/src/test/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthTestHelper.java
svn commit: r56747 - /release/camel/apache-camel/3.18.2/
Author: gzurowski Date: Thu Sep 8 16:50:26 2022 New Revision: 56747 Log: Apache Camel 3.18.2 release distro placeholder. Added: release/camel/apache-camel/3.18.2/
[GitHub] [camel-quarkus] jamesnetherton commented on issue #3989: Enabling supervised route controller prevents registration of route & consumer health checks
jamesnetherton commented on issue #3989: URL: https://github.com/apache/camel-quarkus/issues/3989#issuecomment-1240947620 https://issues.apache.org/jira/browse/CAMEL-18483 -- 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-3.18.x updated: CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervised
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new e233b5bcf8e CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry
registration for routes and consumers health checks when routes are supervised
e233b5bcf8e is described below
commit e233b5bcf8e726829360b1bdc1062e441f5bb473
Author: James Netherton
AuthorDate: Thu Sep 8 10:01:37 2022 +0100
CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for
routes and consumers health checks when routes are supervised
---
.../camel-microprofile-health/pom.xml | 5 ++
.../CamelMicroProfileHealthCheckRegistry.java | 27 +--
...MicroProfileHealthSupervisedRoutesMainTest.java | 90 ++
.../health/CamelMicroProfileHealthTestHelper.java | 78 +++
.../health/CamelMicroProfileHealthTestSupport.java | 34 ++--
5 files changed, 199 insertions(+), 35 deletions(-)
diff --git a/components/camel-microprofile/camel-microprofile-health/pom.xml
b/components/camel-microprofile/camel-microprofile-health/pom.xml
index 0875de79baa..8fd24e71055 100644
--- a/components/camel-microprofile/camel-microprofile-health/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-health/pom.xml
@@ -62,6 +62,11 @@
camel-test-junit5
test
+
+org.apache.camel
+camel-main
+test
+
diff --git
a/components/camel-microprofile/camel-microprofile-health/src/main/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRegistry.java
b/components/camel-microprofile/camel-microprofile-health/src/main/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRegistry.java
index 84e8882857f..b339d57d978 100644
---
a/components/camel-microprofile/camel-microprofile-health/src/main/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRegistry.java
+++
b/components/camel-microprofile/camel-microprofile-health/src/main/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRegistry.java
@@ -27,8 +27,10 @@ import org.apache.camel.StartupListener;
import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
+import org.apache.camel.impl.health.ConsumersHealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.impl.health.HealthCheckRegistryRepository;
+import org.apache.camel.impl.health.RoutesHealthCheckRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +68,7 @@ public class CamelMicroProfileHealthCheckRegistry extends
DefaultHealthCheckRegi
}
} else {
HealthCheckRepository repository = (HealthCheckRepository) obj;
-if (repository.stream().findAny().isPresent()) {
+if (canRegister(repository)) {
registerRepositoryChecks(repository);
} else {
// Try health check registration again on CamelContext started
@@ -134,7 +136,7 @@ public class CamelMicroProfileHealthCheckRegistry extends
DefaultHealthCheckRegi
// Register each check individually for
HealthCheckRegistryRepository or where the repository contains
// a mix or readiness and liveness checks
repository.stream()
-.filter(healthCheck -> healthCheck.isEnabled())
+.filter(HealthCheck::isEnabled)
.forEach(this::registerMicroProfileHealthCheck);
} else {
// Since the number of potential checks for consumers / routes
etc is non-deterministic
@@ -147,12 +149,20 @@ public class CamelMicroProfileHealthCheckRegistry extends
DefaultHealthCheckRegi
CamelMicroProfileRepositoryHealthCheck repositoryHealthCheck
= new
CamelMicroProfileRepositoryHealthCheck(getCamelContext(), repository,
healthCheckName);
-if (isAllChecksLiveness) {
-getLivenessRegistry().register(repository.getId(),
repositoryHealthCheck);
-}
-if (isAllChecksReadiness) {
+if (repository instanceof RoutesHealthCheckRepository ||
repository instanceof ConsumersHealthCheckRepository) {
+// Eagerly register routes & consumers
HealthCheckRepository since routes may be supervised
+// and added with an initial delay. E.g
repository.stream() may be empty initially but will eventually
+// return some results
getReadinessRegistry().register(repository.getId(),
repositoryHealthCheck);
+}
[camel] branch main updated: CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervised
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.git
The following commit(s) were added to refs/heads/main by this push:
new 165f7cb3a25 CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry
registration for routes and consumers health checks when routes are supervised
165f7cb3a25 is described below
commit 165f7cb3a257b95196f8b3795f5b15c1f310c86c
Author: James Netherton
AuthorDate: Thu Sep 8 10:01:37 2022 +0100
CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for
routes and consumers health checks when routes are supervised
---
.../camel-microprofile-health/pom.xml | 5 ++
.../CamelMicroProfileHealthCheckRegistry.java | 27 +--
...MicroProfileHealthSupervisedRoutesMainTest.java | 90 ++
.../health/CamelMicroProfileHealthTestHelper.java | 78 +++
.../health/CamelMicroProfileHealthTestSupport.java | 34 ++--
5 files changed, 199 insertions(+), 35 deletions(-)
diff --git a/components/camel-microprofile/camel-microprofile-health/pom.xml
b/components/camel-microprofile/camel-microprofile-health/pom.xml
index 24c31ab8af0..6bd4462fef0 100644
--- a/components/camel-microprofile/camel-microprofile-health/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-health/pom.xml
@@ -62,6 +62,11 @@
camel-test-junit5
test
+
+org.apache.camel
+camel-main
+test
+
diff --git
a/components/camel-microprofile/camel-microprofile-health/src/main/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRegistry.java
b/components/camel-microprofile/camel-microprofile-health/src/main/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRegistry.java
index 84e8882857f..b339d57d978 100644
---
a/components/camel-microprofile/camel-microprofile-health/src/main/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRegistry.java
+++
b/components/camel-microprofile/camel-microprofile-health/src/main/java/org/apache/camel/microprofile/health/CamelMicroProfileHealthCheckRegistry.java
@@ -27,8 +27,10 @@ import org.apache.camel.StartupListener;
import org.apache.camel.health.HealthCheck;
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
+import org.apache.camel.impl.health.ConsumersHealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.impl.health.HealthCheckRegistryRepository;
+import org.apache.camel.impl.health.RoutesHealthCheckRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +68,7 @@ public class CamelMicroProfileHealthCheckRegistry extends
DefaultHealthCheckRegi
}
} else {
HealthCheckRepository repository = (HealthCheckRepository) obj;
-if (repository.stream().findAny().isPresent()) {
+if (canRegister(repository)) {
registerRepositoryChecks(repository);
} else {
// Try health check registration again on CamelContext started
@@ -134,7 +136,7 @@ public class CamelMicroProfileHealthCheckRegistry extends
DefaultHealthCheckRegi
// Register each check individually for
HealthCheckRegistryRepository or where the repository contains
// a mix or readiness and liveness checks
repository.stream()
-.filter(healthCheck -> healthCheck.isEnabled())
+.filter(HealthCheck::isEnabled)
.forEach(this::registerMicroProfileHealthCheck);
} else {
// Since the number of potential checks for consumers / routes
etc is non-deterministic
@@ -147,12 +149,20 @@ public class CamelMicroProfileHealthCheckRegistry extends
DefaultHealthCheckRegi
CamelMicroProfileRepositoryHealthCheck repositoryHealthCheck
= new
CamelMicroProfileRepositoryHealthCheck(getCamelContext(), repository,
healthCheckName);
-if (isAllChecksLiveness) {
-getLivenessRegistry().register(repository.getId(),
repositoryHealthCheck);
-}
-if (isAllChecksReadiness) {
+if (repository instanceof RoutesHealthCheckRepository ||
repository instanceof ConsumersHealthCheckRepository) {
+// Eagerly register routes & consumers
HealthCheckRepository since routes may be supervised
+// and added with an initial delay. E.g
repository.stream() may be empty initially but will eventually
+// return some results
getReadinessRegistry().register(repository.getId(),
repositoryHealthCheck);
+} else {
+
[GitHub] [camel] jamesnetherton merged pull request #8327: CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervised
jamesnetherton merged PR #8327: URL: https://github.com/apache/camel/pull/8327 -- 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 (7bb41db36a5 -> c7089f77e2b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 7bb41db36a5 Regen for commit 0ea9f0eab41af67c36af6f11249be64a35f7c3e7 add dd3fa683309 camel-jbang - Add load average statistics add 838646711ca Regen for commit d537cc7e089e641db82139027459e464c207da27 (#8328) add c7089f77e2b Regen for commit 838646711ca8cad2b41cdfdb1b893ea8fce31f04 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7bb41db36a5) \ N -- N -- N refs/heads/regen_bot (c7089f77e2b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../core/commands/process/CamelContextTop.java | 38 +- .../core/commands/process/CamelRouteStatus.java| 58 ++ .../jbang/core/commands/process/CamelRouteTop.java | 47 ++ 3 files changed, 122 insertions(+), 21 deletions(-)
[camel] branch regen_bot updated (7230c7308ea -> 7bb41db36a5)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git
omit 7230c7308ea Regen for commit d537cc7e089e641db82139027459e464c207da27
add dea274f3a9c CAMEL-18456: created a test infra module for embedded Jetty
add 0398b41c1b3 CAMEL-18456: converted camel-ahc-ws tests to
camel-test-infra-jetty
add 0ea9f0eab41 camel-jbang - Add load average statistics
add 7bb41db36a5 Regen for commit 0ea9f0eab41af67c36af6f11249be64a35f7c3e7
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7230c7308ea)
\
N -- N -- N refs/heads/regen_bot (7bb41db36a5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../main/camel-main-configuration-metadata.json| 1 +
components/camel-ahc-ws/pom.xml| 33 +++---
.../component/ahc/ws/WsProducerConsumerTest.java | 62 ---
.../camel/component/ahc/ws/WsProducerTest.java | 26 +++--
.../camel/component/ahc/ws/WsProducerTestBase.java | 44 +---
.../ahc/ws/WsProducerUsingStreamingTest.java | 27 -
.../camel/component/ahc/ws/WssProducerTest.java| 46 +---
.../src/test/resources/log4j2.properties | 3 +
.../camel/impl/console/ContextDevConsole.java | 38 ++-
.../apache/camel/impl/console/RouteDevConsole.java | 36 +-
.../MainConfigurationPropertiesConfigurer.java | 6 +
.../camel-main-configuration-metadata.json | 1 +
core/camel-main/src/main/docs/main.adoc| 3 +-
.../camel/main/DefaultConfigurationConfigurer.java | 2 +
.../camel/main/DefaultConfigurationProperties.java | 25 +
.../java/org/apache/camel/main/KameletMain.java| 1 +
test-infra/camel-test-infra-jetty/pom.xml | 70
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../test/infra/jetty/common/JettyProperties.java | 22 ++--
.../infra/jetty/services/JettyConfiguration.java | 117 +++
.../jetty/services/JettyConfigurationBuilder.java | 75 +
.../infra/jetty/services/JettyEmbeddedService.java | 124 +
.../test/infra/jetty/services/JettyService.java| 41 ---
test-infra/pom.xml | 1 +
24 files changed, 637 insertions(+), 167 deletions(-)
create mode 100644 test-infra/camel-test-infra-jetty/pom.xml
copy {init/camel-bundle-plugin =>
test-infra/camel-test-infra-jetty}/src/main/resources/META-INF/MANIFEST.MF
(100%)
copy
components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerTest.java
=>
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java
(64%)
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfigurationBuilder.java
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
copy
components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerUsingStreamingTest.java
=>
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyService.java
(53%)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8329: Generated sources regen
github-actions[bot] opened a new pull request, #8329: URL: https://github.com/apache/camel/pull/8329 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8327: CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervis
github-actions[bot] commented on PR #8327: URL: https://github.com/apache/camel/pull/8327#issuecomment-1240829014 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **1 component(s) tested** -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #8327: CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervised
davsclaus commented on PR #8327: URL: https://github.com/apache/camel/pull/8327#issuecomment-1240827944 Great work on this -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #8328: Generated sources regen
davsclaus merged PR #8328: URL: https://github.com/apache/camel/pull/8328 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit d537cc7e089e641db82139027459e464c207da27 (#8328)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 838646711ca Regen for commit d537cc7e089e641db82139027459e464c207da27 (#8328) 838646711ca is described below commit 838646711ca8cad2b41cdfdb1b893ea8fce31f04 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Sep 8 16:50:58 2022 +0200 Regen for commit d537cc7e089e641db82139027459e464c207da27 (#8328) Signed-off-by: GitHub Signed-off-by: GitHub Co-authored-by: davsclaus --- .../camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java| 2 +- .../test/java/org/apache/camel/impl/CamelContextReloadStrategyTest.java | 2 +- .../camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java | 2 +- .../main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java index d26bc96a7ee..7d4a4385e16 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyPropertiesFunctionTest.java @@ -20,10 +20,10 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.support.DefaultContextReloadStrategy; import org.apache.camel.spi.ContextReloadStrategy; import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.PropertiesFunction; +import org.apache.camel.support.DefaultContextReloadStrategy; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyTest.java index f5e047eee23..80070aa3025 100644 --- a/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/impl/CamelContextReloadStrategyTest.java @@ -20,10 +20,10 @@ import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.support.DefaultContextReloadStrategy; import org.apache.camel.spi.ContextReloadStrategy; import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.PropertiesSource; +import org.apache.camel.support.DefaultContextReloadStrategy; import org.apache.camel.support.service.ServiceHelper; import org.apache.camel.support.service.ServiceSupport; import org.junit.jupiter.api.Assertions; diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java index 651461fb7b1..a388a797e96 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java @@ -48,7 +48,6 @@ import org.apache.camel.console.DevConsoleRegistry; import org.apache.camel.health.HealthCheck; import org.apache.camel.health.HealthCheckRegistry; import org.apache.camel.health.HealthCheckRepository; -import org.apache.camel.support.DefaultContextReloadStrategy; import org.apache.camel.saga.CamelSagaService; import org.apache.camel.spi.AutowiredLifecycleStrategy; import org.apache.camel.spi.CamelBeanPostProcessor; @@ -62,6 +61,7 @@ import org.apache.camel.spi.PropertiesComponent; import org.apache.camel.spi.RouteTemplateParameterSource; import org.apache.camel.spi.StartupStepRecorder; import org.apache.camel.support.CamelContextHelper; +import org.apache.camel.support.DefaultContextReloadStrategy; import org.apache.camel.support.EventNotifierSupport; import org.apache.camel.support.LifecycleStrategySupport; import org.apache.camel.support.PropertyBindingSupport; diff --git a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java index 1f61ae5f9f7..7b6c84d9b18 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/DefaultConfigurationConfigurer.java @@ -34,7 +34,6 @@ import org.apache.camel.console.DevConsoleRegistry; import org.apache.camel.health.HealthCheckRegistry;
[camel] branch main updated: camel-jbang - Add load average statistics
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new dd3fa683309 camel-jbang - Add load average statistics
dd3fa683309 is described below
commit dd3fa68330928983cf2845122633dd2c30370cb8
Author: Claus Ibsen
AuthorDate: Thu Sep 8 16:47:06 2022 +0200
camel-jbang - Add load average statistics
---
.../core/commands/process/CamelContextTop.java | 38 +-
.../core/commands/process/CamelRouteStatus.java| 58 ++
.../jbang/core/commands/process/CamelRouteTop.java | 47 ++
3 files changed, 122 insertions(+), 21 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
index 638b45edc12..7a2b096b07d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
@@ -19,6 +19,7 @@ package org.apache.camel.dsl.jbang.core.commands.process;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import com.github.freva.asciitable.AsciiTable;
import com.github.freva.asciitable.Column;
@@ -72,7 +73,21 @@ public class CamelContextTop extends ProcessBaseCommand {
row.javaVersion = runtime != null ?
runtime.getString("javaVersion") : null;
row.state = context.getInteger("phase");
row.camelVersion = context.getString("version");
-
+Map stats = context.getMap("statistics");
+if (stats != null) {
+Object load = stats.get("load01");
+if (load != null) {
+row.load01 = load.toString();
+}
+load = stats.get("load05");
+if (load != null) {
+row.load05 = load.toString();
+}
+load = stats.get("load15");
+if (load != null) {
+row.load15 = load.toString();
+}
+}
JsonObject mem = (JsonObject) root.get("memory");
if (mem != null) {
row.heapMemUsed = mem.getLong("heapMemoryUsed");
@@ -113,6 +128,8 @@ public class CamelContextTop extends ProcessBaseCommand {
new
Column().header("STATUS").headerAlign(HorizontalAlign.CENTER)
.with(r -> extractState(r.state)),
new
Column().header("AGE").headerAlign(HorizontalAlign.CENTER).with(r -> r.ago),
+new
Column().header("LOAD").headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.CENTER)
+.with(this::getLoad),
new
Column().header("HEAP").headerAlign(HorizontalAlign.CENTER).with(this::getHeapMemory),
new
Column().header("NON-HEAP").headerAlign(HorizontalAlign.CENTER).with(this::getNonHeapMemory),
new
Column().header("GC").headerAlign(HorizontalAlign.CENTER).dataAlign(HorizontalAlign.LEFT)
@@ -197,6 +214,22 @@ public class CamelContextTop extends ProcessBaseCommand {
return v;
}
+private String getLoad(Row r) {
+String s1 = r.load01 != null ? r.load01 : "-";
+String s2 = r.load05 != null ? r.load05 : "-";
+String s3 = r.load15 != null ? r.load15 : "-";
+if ("0.00".equals(s1)) {
+s1 = "-";
+}
+if ("0.00".equals(s2)) {
+s2 = "-";
+}
+if ("0.00".equals(s3)) {
+s3 = "-";
+}
+return s1 + "/" + s2 + "/" + s3;
+}
+
private static long asMegaBytesOneDigit(long bytes) {
return bytes / 1000 / 1000;
}
@@ -211,6 +244,9 @@ public class CamelContextTop extends ProcessBaseCommand {
int state;
String ago;
long uptime;
+String load01;
+String load05;
+String load15;
long heapMemUsed;
long heapMemCommitted;
long heapMemMax;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
index c984d7bff92..90c7140bc37 100644
---
[camel] branch regen_bot updated (d4ecd4b5c74 -> 7230c7308ea)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit d4ecd4b5c74 Regen for commit 0398b41c1b33b864a00b67122ac637093906f375 omit 0398b41c1b3 CAMEL-18456: converted camel-ahc-ws tests to camel-test-infra-jetty omit dea274f3a9c CAMEL-18456: created a test infra module for embedded Jetty add 7230c7308ea Regen for commit d537cc7e089e641db82139027459e464c207da27 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d4ecd4b5c74) \ N -- N -- N refs/heads/regen_bot (7230c7308ea) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: components/camel-ahc-ws/pom.xml| 33 +++--- .../component/ahc/ws/WsProducerConsumerTest.java | 62 +++ .../camel/component/ahc/ws/WsProducerTest.java | 26 ++--- .../camel/component/ahc/ws/WsProducerTestBase.java | 44 +++- .../ahc/ws/WsProducerUsingStreamingTest.java | 27 + .../camel/component/ahc/ws/WssProducerTest.java| 46 +++- .../src/test/resources/log4j2.properties | 3 - test-infra/camel-test-infra-jetty/pom.xml | 70 .../src/main/resources/META-INF/MANIFEST.MF| 0 .../test/infra/jetty/common/JettyProperties.java | 29 - .../infra/jetty/services/JettyConfiguration.java | 117 --- .../jetty/services/JettyConfigurationBuilder.java | 75 - .../infra/jetty/services/JettyEmbeddedService.java | 124 - .../test/infra/jetty/services/JettyService.java| 44 test-infra/pom.xml | 1 - 15 files changed, 127 insertions(+), 574 deletions(-) delete mode 100644 test-infra/camel-test-infra-jetty/pom.xml delete mode 100644 test-infra/camel-test-infra-jetty/src/main/resources/META-INF/MANIFEST.MF delete mode 100644 test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java delete mode 100644 test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java delete mode 100644 test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfigurationBuilder.java delete mode 100644 test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java delete mode 100644 test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyService.java
[camel-k] 05/05: chore(test): Update unit test environments
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 3c59920d06d40d73d10e41d95d137b114e1b47ed
Author: Antonin Stefanutti
AuthorDate: Thu Sep 8 10:04:07 2022 +0200
chore(test): Update unit test environments
---
pkg/trait/camel_test.go| 23 ++-
pkg/trait/container_probes_test.go | 15 ---
pkg/trait/container_test.go| 27 ++-
pkg/trait/cron_test.go | 30 --
pkg/trait/environment_test.go | 6 ++
pkg/trait/istio_test.go| 6 ++
pkg/trait/knative_service_test.go | 18 ++
pkg/trait/knative_test.go | 4
pkg/trait/logging_test.go | 8
pkg/trait/mount_test.go| 4
pkg/trait/route_test.go| 4
pkg/trait/service_test.go | 16
pkg/trait/trait_test.go| 6 ++
13 files changed, 156 insertions(+), 11 deletions(-)
diff --git a/pkg/trait/camel_test.go b/pkg/trait/camel_test.go
index 20e555975..80fd1d43b 100644
--- a/pkg/trait/camel_test.go
+++ b/pkg/trait/camel_test.go
@@ -53,7 +53,11 @@ func TestConfigureDisabledCamelTraitFails(t *testing.T) {
func TestApplyCamelTraitSucceeds(t *testing.T) {
trait, environment := createNominalCamelTest()
- err := trait.Apply(environment)
+ configured, err := trait.Configure(environment)
+ assert.Nil(t, err)
+ assert.True(t, configured)
+
+ err = trait.Apply(environment)
assert.Nil(t, err)
assert.Equal(t, "0.0.1", environment.RuntimeVersion)
assert.Equal(t, "0.0.1", environment.Integration.Status.RuntimeVersion)
@@ -66,7 +70,11 @@ func
TestApplyCamelTraitWithoutEnvironmentCatalogAndUnmatchableVersionFails(t *t
environment.Integration.Status.RuntimeVersion = "Unmatchable version"
environment.Integration.Status.RuntimeProvider =
v1.RuntimeProviderQuarkus
- err := trait.Apply(environment)
+ configured, err := trait.Configure(environment)
+ assert.Nil(t, err)
+ assert.True(t, configured)
+
+ err = trait.Apply(environment)
assert.NotNil(t, err)
assert.Equal(t, "unable to find catalog matching version requirement:
runtime=Unmatchable version, provider=quarkus", err.Error())
}
@@ -119,9 +127,14 @@ func createNominalCamelTest() (*camelTrait, *Environment) {
}
func TestApplyCamelTraitWithProperties(t *testing.T) {
- camelTrait, environment := createNominalCamelTest()
- camelTrait.Properties = []string{"a=b", "c=d"}
- err := camelTrait.Apply(environment)
+ trait, environment := createNominalCamelTest()
+ trait.Properties = []string{"a=b", "c=d"}
+
+ configured, err := trait.Configure(environment)
+ assert.Nil(t, err)
+ assert.True(t, configured)
+
+ err = trait.Apply(environment)
assert.Nil(t, err)
userPropertiesCm := environment.Resources.GetConfigMap(func(cm
*corev1.ConfigMap) bool {
diff --git a/pkg/trait/container_probes_test.go
b/pkg/trait/container_probes_test.go
index 2642f032d..55c1c6287 100644
--- a/pkg/trait/container_probes_test.go
+++ b/pkg/trait/container_probes_test.go
@@ -41,9 +41,18 @@ func newTestProbesEnv(t *testing.T, integration
*v1.Integration) Environment {
traitCatalog := NewCatalog(nil)
return Environment{
- Catalog: traitCatalog,
- CamelCatalog: catalog,
- Platform: {},
+ Catalog: traitCatalog,
+ CamelCatalog: catalog,
+ Platform: {
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ IntegrationPlatformSpec:
v1.IntegrationPlatformSpec{
+ Build: v1.IntegrationPlatformBuildSpec{
+ RuntimeVersion:
catalog.Runtime.Version,
+ },
+ },
+ },
+ },
Integration: integration,
Resources: kubernetes.NewCollection(),
ApplicationProperties: make(map[string]string),
diff --git a/pkg/trait/container_test.go b/pkg/trait/container_test.go
index 54d2157b5..4109653de 100644
--- a/pkg/trait/container_test.go
+++ b/pkg/trait/container_test.go
@@ -69,8 +69,12 @@ func TestContainerWithDefaults(t *testing.T) {
Build: v1.IntegrationPlatformBuildSpec{
PublishStrategy:
v1.IntegrationPlatformBuildPublishStrategyS2I,
Registry:
v1.RegistrySpec{Address: "registry"},
+
[camel-k] 01/05: fix: deployment trait should not run when waiting for platform
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8c599e6934f7d9e999dfd2f510f76be2ca62c9d2
Author: Antonin Stefanutti
AuthorDate: Wed Sep 7 15:12:23 2022 +0200
fix: deployment trait should not run when waiting for platform
---
pkg/trait/deployment.go | 19 ++-
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
index 35a3eeada..ae4386372 100644
--- a/pkg/trait/deployment.go
+++ b/pkg/trait/deployment.go
@@ -46,16 +46,17 @@ func newDeploymentTrait() Trait {
}
func (t *deploymentTrait) Configure(e *Environment) (bool, error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, true) {
- if e.Integration != nil {
- e.Integration.Status.SetCondition(
- v1.IntegrationConditionDeploymentAvailable,
- corev1.ConditionFalse,
-
v1.IntegrationConditionDeploymentAvailableReason,
- "explicitly disabled",
- )
- }
+ if !e.IntegrationInRunningPhases() {
+ return false, nil
+ }
+ if !pointer.BoolDeref(t.Enabled, true) {
+ e.Integration.Status.SetCondition(
+ v1.IntegrationConditionDeploymentAvailable,
+ corev1.ConditionFalse,
+ v1.IntegrationConditionDeploymentAvailableReason,
+ "explicitly disabled",
+ )
return false, nil
}
[camel-k] branch main updated (d4362ded9 -> 3c59920d0)
This is an automated email from the ASF dual-hosted git repository. astefanutti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from d4362ded9 Helm: Fixed index.yaml new 8c599e693 fix: deployment trait should not run when waiting for platform new 327f06dda fix: OpenAPI trait should not run when waiting for platform new 8f830deba fix: camel trait should fail-fast when runtime version is nil new 6b7e83934 fix: check platform readiness before calling traits that require it new 3c59920d0 chore(test): Update unit test environments The 5 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: pkg/trait/builder_test.go | 3 +++ pkg/trait/camel.go | 39 ++ pkg/trait/camel_test.go| 23 +- pkg/trait/container_probes_test.go | 15 --- pkg/trait/container_test.go| 27 +- pkg/trait/cron_test.go | 30 +++-- pkg/trait/deployment.go| 19 ++- pkg/trait/environment_test.go | 6 ++ pkg/trait/istio_test.go| 6 ++ pkg/trait/knative_service_test.go | 18 ++ pkg/trait/knative_test.go | 4 pkg/trait/logging_test.go | 8 pkg/trait/mount_test.go| 4 pkg/trait/openapi.go | 2 +- pkg/trait/route_test.go| 4 pkg/trait/service_test.go | 16 pkg/trait/trait_catalog.go | 6 +++--- pkg/trait/trait_test.go| 6 ++ pkg/trait/trait_types.go | 14 ++ 19 files changed, 210 insertions(+), 40 deletions(-)
[camel-k] 03/05: fix: camel trait should fail-fast when runtime version is nil
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8f830deba4e77c38be2b94cfea804d82c89a85ab
Author: Antonin Stefanutti
AuthorDate: Wed Sep 7 15:14:58 2022 +0200
fix: camel trait should fail-fast when runtime version is nil
---
pkg/trait/camel.go | 39 +++
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index 17f847560..82f0e91c2 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -24,6 +24,7 @@ import (
"strings"
"github.com/pkg/errors"
+
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"
@@ -52,20 +53,26 @@ func (t *camelTrait) Configure(e *Environment) (bool,
error) {
return false, errors.New("trait camel cannot be disabled")
}
+ if t.RuntimeVersion == "" {
+ t.RuntimeVersion = determineRuntimeVersion(e)
+ }
+
return true, nil
}
func (t *camelTrait) Apply(e *Environment) error {
- rv := t.determineRuntimeVersion(e)
+ if t.RuntimeVersion == "" {
+ return errors.New("unable to determine runtime version")
+ }
if e.CamelCatalog == nil {
- err := t.loadOrCreateCatalog(e, rv)
+ err := t.loadOrCreateCatalog(e, t.RuntimeVersion)
if err != nil {
return err
}
}
- e.RuntimeVersion = rv
+ e.RuntimeVersion = t.RuntimeVersion
if e.Integration != nil {
e.Integration.Status.RuntimeVersion =
e.CamelCatalog.Runtime.Version
@@ -144,19 +151,6 @@ func (t *camelTrait) loadOrCreateCatalog(e *Environment,
runtimeVersion string)
return nil
}
-func (t *camelTrait) determineRuntimeVersion(e *Environment) string {
- if t.RuntimeVersion != "" {
- return t.RuntimeVersion
- }
- if e.Integration != nil && e.Integration.Status.RuntimeVersion != "" {
- return e.Integration.Status.RuntimeVersion
- }
- if e.IntegrationKit != nil && e.IntegrationKit.Status.RuntimeVersion !=
"" {
- return e.IntegrationKit.Status.RuntimeVersion
- }
- return e.Platform.Status.Build.RuntimeVersion
-}
-
// IsPlatformTrait overrides base class method.
func (t *camelTrait) IsPlatformTrait() bool {
return true
@@ -287,3 +281,16 @@ func (t *camelTrait) computeConfigMaps(e *Environment)
[]ctrl.Object {
return maps
}
+
+func determineRuntimeVersion(e *Environment) string {
+ if e.Integration != nil && e.Integration.Status.RuntimeVersion != "" {
+ return e.Integration.Status.RuntimeVersion
+ }
+ if e.IntegrationKit != nil && e.IntegrationKit.Status.RuntimeVersion !=
"" {
+ return e.IntegrationKit.Status.RuntimeVersion
+ }
+ if e.Platform != nil && e.Platform.Status.Build.RuntimeVersion != "" {
+ return e.Platform.Status.Build.RuntimeVersion
+ }
+ return ""
+}
[camel-k] 04/05: fix: check platform readiness before calling traits that require it
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6b7e83934fbc61d83962b593808251a86c6eb233
Author: Antonin Stefanutti
AuthorDate: Wed Sep 7 15:22:38 2022 +0200
fix: check platform readiness before calling traits that require it
---
pkg/trait/builder_test.go | 3 +++
pkg/trait/trait_catalog.go | 6 +++---
pkg/trait/trait_types.go | 14 ++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/pkg/trait/builder_test.go b/pkg/trait/builder_test.go
index ad7f8e861..c444d4d54 100644
--- a/pkg/trait/builder_test.go
+++ b/pkg/trait/builder_test.go
@@ -138,6 +138,9 @@ func createBuilderTestEnv(cluster
v1.IntegrationPlatformCluster, strategy v1.Int
KanikoBuildCache: ,
},
},
+ Status: v1.IntegrationPlatformStatus{
+ Phase: v1.IntegrationPlatformPhaseReady,
+ },
},
EnvVars:make([]corev1.EnvVar, 0),
ExecutedTraits: make([]Trait, 0),
diff --git a/pkg/trait/trait_catalog.go b/pkg/trait/trait_catalog.go
index 807bd4055..5acbaf94c 100644
--- a/pkg/trait/trait_catalog.go
+++ b/pkg/trait/trait_catalog.go
@@ -96,7 +96,7 @@ func (c *Catalog) apply(environment *Environment) error {
applicable := false
for _, trait := range traits {
- if environment.Platform == nil &&
trait.RequiresIntegrationPlatform() {
+ if
!environment.PlatformInPhase(v1.IntegrationPlatformPhaseReady) &&
trait.RequiresIntegrationPlatform() {
c.L.Debugf("Skipping trait because of missing
integration platform: %s", trait.ID())
continue
@@ -131,8 +131,8 @@ func (c *Catalog) apply(environment *Environment) error {
}
c.L.Debugf("Applied traits: %s", strings.Join(traitIds, ","))
- if !applicable && environment.Platform == nil {
- return errors.New("no trait can be executed because of no
integration platform found")
+ if !applicable &&
environment.PlatformInPhase(v1.IntegrationPlatformPhaseReady) {
+ return errors.New("no trait can be executed because of no ready
platform found")
}
for _, processor := range environment.PostProcessors {
diff --git a/pkg/trait/trait_types.go b/pkg/trait/trait_types.go
index 82aa32ecd..c420e0095 100644
--- a/pkg/trait/trait_types.go
+++ b/pkg/trait/trait_types.go
@@ -251,6 +251,20 @@ func (e *Environment) IntegrationKitInPhase(phases
...v1.IntegrationKitPhase) bo
return false
}
+func (e *Environment) PlatformInPhase(phases ...v1.IntegrationPlatformPhase)
bool {
+ if e.Platform == nil {
+ return false
+ }
+
+ for _, phase := range phases {
+ if e.Platform.Status.Phase == phase {
+ return true
+ }
+ }
+
+ return false
+}
+
func (e *Environment) InPhase(c v1.IntegrationKitPhase, i v1.IntegrationPhase)
bool {
return e.IntegrationKitInPhase(c) && e.IntegrationInPhase(i)
}
[camel-k] 02/05: fix: OpenAPI trait should not run when waiting for platform
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 327f06dda351b4f32d076b0ab27057897c9e0eeb
Author: Antonin Stefanutti
AuthorDate: Wed Sep 7 15:13:57 2022 +0200
fix: OpenAPI trait should not run when waiting for platform
---
pkg/trait/openapi.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkg/trait/openapi.go b/pkg/trait/openapi.go
index 36425b004..813bf5205 100644
--- a/pkg/trait/openapi.go
+++ b/pkg/trait/openapi.go
@@ -65,7 +65,7 @@ func (t *openAPITrait) IsPlatformTrait() bool {
}
func (t *openAPITrait) Configure(e *Environment) (bool, error) {
- if e.Integration == nil || !pointer.BoolDeref(t.Enabled, true) {
+ if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization) ||
!pointer.BoolDeref(t.Enabled, true) {
return false, nil
}
[GitHub] [camel-k] astefanutti merged pull request #3616: Fix panics when integration is waiting for platform
astefanutti merged PR #3616: URL: https://github.com/apache/camel-k/pull/3616 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] JiriOndrusek commented on pull request #8326: CAMEL-18484 Camel-xchange: Enable mock testing without real account
JiriOndrusek commented on PR #8326: URL: https://github.com/apache/camel/pull/8326#issuecomment-1240780523 Build error is caused by this PR I'll fix it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: camel-jbang - Add load average statistics
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0ea9f0eab41 camel-jbang - Add load average statistics
0ea9f0eab41 is described below
commit 0ea9f0eab41af67c36af6f11249be64a35f7c3e7
Author: Claus Ibsen
AuthorDate: Thu Sep 8 16:13:35 2022 +0200
camel-jbang - Add load average statistics
---
.../main/camel-main-configuration-metadata.json| 1 +
.../camel/impl/console/ContextDevConsole.java | 38 +-
.../apache/camel/impl/console/RouteDevConsole.java | 37 -
.../MainConfigurationPropertiesConfigurer.java | 6
.../camel-main-configuration-metadata.json | 1 +
core/camel-main/src/main/docs/main.adoc| 3 +-
.../camel/main/DefaultConfigurationConfigurer.java | 2 ++
.../camel/main/DefaultConfigurationProperties.java | 25 ++
.../java/org/apache/camel/main/KameletMain.java| 2 ++
9 files changed, 112 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 3c49d0982d8..895849bf2e0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -59,6 +59,7 @@
{ "name": "camel.main.jmxManagementStatisticsLevel", "description": "Sets
the JMX statistics level, the level can be set to Extended to gather additional
information The default value is Default.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "object",
"javaType": "org.apache.camel.ManagementStatisticsLevel", "defaultValue":
"Default", "enum": [ "Extended", "Default", "RoutesOnly", "Off" ] },
{ "name": "camel.main.lightweight", "description": "Configure the context
to be lightweight. This will trigger some optimizations and memory reduction
options. Lightweight context have some limitations. At this moment, dynamic
endpoint destinations are not supported.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.loadHealthChecks", "description": "Whether to load
custom health checks by scanning classpath.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
+{ "name": "camel.main.loadStatisticsEnabled", "description": "Sets whether
context load statistics is enabled (something like the unix load average). The
statistics requires to have camel-management on the classpath as JMX is
required. The default value is false.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.loadTypeConverters", "description": "Whether to load
custom type converters by scanning classpath. This is used for backwards
compatibility with Camel 2.x. Its recommended to migrate to use fast type
converter loading by setting Converter(loader = true) on your custom type
converter classes.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.main.logDebugMaxChars", "description": "Is used to limit
the maximum length of the logging Camel message bodies. If the message body is
longer than the limit, the log message is clipped. Use -1 to have unlimited
length. Use for example 1000 to log at most 1000 characters.", "sourceType":
"org.apache.camel.main.DefaultConfigurationProperties", "type": "integer",
"javaType": "int" },
{ "name": "camel.main.logExhaustedMessageBody", "description": "Sets
whether to log exhausted message body with message history. Default is false.",
"sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java
index 6610d482ca2..0f1cafa1196 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/ContextDevConsole.java
@@ -60,6 +60,12 @@ public class ContextDevConsole extends AbstractDevConsole {
if (crs != null) {
reloaded += crs.getReloadCounter();
[camel] branch regen_bot updated (95c36bf2d0c -> d4ecd4b5c74)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git
omit 95c36bf2d0c Regen for commit a9700259b0e4a3ff5bd78399cd517efd491de7cf
add 88d60c260bc Upgrade MongoDB Driver Sync to version 4.7.1
add dded3ead06d Sync deps
add 15924b82693 camel-jbang - Add reset-stats command
add d537cc7e089 camel-jbang - Add reset-stats command
add dea274f3a9c CAMEL-18456: created a test infra module for embedded Jetty
add 0398b41c1b3 CAMEL-18456: converted camel-ahc-ws tests to
camel-test-infra-jetty
add d4ecd4b5c74 Regen for commit 0398b41c1b33b864a00b67122ac637093906f375
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (95c36bf2d0c)
\
N -- N -- N refs/heads/regen_bot (d4ecd4b5c74)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
components/camel-ahc-ws/pom.xml| 33 +++---
.../component/ahc/ws/WsProducerConsumerTest.java | 62 ---
.../camel/component/ahc/ws/WsProducerTest.java | 26 +++--
.../camel/component/ahc/ws/WsProducerTestBase.java | 44 +---
.../ahc/ws/WsProducerUsingStreamingTest.java | 27 -
.../camel/component/ahc/ws/WssProducerTest.java| 46 +---
.../src/test/resources/log4j2.properties | 3 +
.../camel/cli/connector/LocalCliConnector.java | 6 +
.../dsl/jbang/core/commands/CamelJBangMain.java| 2 +
.../commands/action/CamelResetStatsAction.java | 51 +
parent/pom.xml | 2 +-
test-infra/camel-test-infra-jetty/pom.xml | 70
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../test/infra/jetty/common/JettyProperties.java | 22 ++--
.../infra/jetty/services/JettyConfiguration.java | 117 +++
.../jetty/services/JettyConfigurationBuilder.java | 75 +
.../infra/jetty/services/JettyEmbeddedService.java | 124 +
.../test/infra/jetty/services/JettyService.java| 41 ---
test-infra/pom.xml | 1 +
20 files changed, 588 insertions(+), 166 deletions(-)
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
create mode 100644 test-infra/camel-test-infra-jetty/pom.xml
copy {init/camel-bundle-plugin =>
test-infra/camel-test-infra-jetty}/src/main/resources/META-INF/MANIFEST.MF
(100%)
copy
components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerTest.java
=>
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java
(64%)
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfigurationBuilder.java
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
copy
components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerUsingStreamingTest.java
=>
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyService.java
(53%)
[camel-spring-boot] branch main updated: camel-jbang - Add load average statistics
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new c02cd8b512a camel-jbang - Add load average statistics
c02cd8b512a is described below
commit c02cd8b512a38fece9aacdceb396758ae7f35262
Author: Claus Ibsen
AuthorDate: Thu Sep 8 16:13:02 2022 +0200
camel-jbang - Add load average statistics
---
core/camel-spring-boot/src/main/docs/spring-boot.json | 7 +++
.../apache/camel/spring/boot/CamelConfigurationProperties.java| 8
2 files changed, 15 insertions(+)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index c0338b4a39c..c5c02c8b3f5 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -729,6 +729,13 @@
"sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
"defaultValue": false
},
+{
+ "name": "camel.springboot.load-statistics-enabled",
+ "type": "java.lang.Boolean",
+ "description": "Sets whether context load statistics is enabled
(something like the unix load average). The statistics requires to have
camel-management on the classpath as JMX is required. The default value is
false.",
+ "sourceType":
"org.apache.camel.spring.boot.CamelConfigurationProperties",
+ "defaultValue": false
+},
{
"name": "camel.springboot.load-type-converters",
"type": "java.lang.Boolean",
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
index 5690a21f418..af18ba63965 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java
@@ -496,6 +496,14 @@ public class CamelConfigurationProperties extends
DefaultConfigurationProperties
*/
private boolean endpointRuntimeStatisticsEnabled;
+/**
+ * Sets whether context load statistics is enabled (something like the
unix load average).
+ * The statistics requires to have camel-management on the classpath as
JMX is required.
+ *
+ * The default value is false.
+ */
+private boolean loadStatisticsEnabled;
+
/**
* Allows for bridging the consumer to the Camel routing Error Handler,
which mean any exceptions occurred while
* the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and
[camel] branch regen_bot updated (2005f135b37 -> 95c36bf2d0c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 2005f135b37 Regen for commit dded3ead06d3507216b66069ccad658c82790eb8 omit dded3ead06d Sync deps omit 88d60c260bc Upgrade MongoDB Driver Sync to version 4.7.1 add 95c36bf2d0c Regen for commit a9700259b0e4a3ff5bd78399cd517efd491de7cf This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2005f135b37) \ N -- N -- N refs/heads/regen_bot (95c36bf2d0c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (058d51a6fc7 -> 2005f135b37)
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 058d51a6fc7 camel-aws - Add dev console for AWS secrets
add a9700259b0e camel-jbang - Add reload command
add 88d60c260bc Upgrade MongoDB Driver Sync to version 4.7.1
add dded3ead06d Sync deps
add 2005f135b37 Regen for commit dded3ead06d3507216b66069ccad658c82790eb8
No new revisions were added by this update.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
.../impl/CamelContextReloadStrategyPropertiesFunctionTest.java | 2 +-
.../org/apache/camel/impl/CamelContextReloadStrategyTest.java | 2 +-
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 2 +-
.../org/apache/camel/main/DefaultConfigurationConfigurer.java | 2 +-
.../apache/camel/support}/DefaultContextReloadStrategy.java| 6 --
.../java/org/apache/camel/cli/connector/LocalCliConnector.java | 9 +
.../apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 2 ++
.../action/{CamelGCAction.java => CamelReloadAction.java} | 10 +-
parent/pom.xml | 2 +-
10 files changed, 26 insertions(+), 13 deletions(-)
rename core/{camel-base-engine/src/main/java/org/apache/camel/impl/engine =>
camel-support/src/main/java/org/apache/camel/support}/DefaultContextReloadStrategy.java
(97%)
copy
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/{CamelGCAction.java
=> CamelReloadAction.java} (86%)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8328: Generated sources regen
github-actions[bot] opened a new pull request, #8328: URL: https://github.com/apache/camel/pull/8328 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8327: CAMEL-18483: Fix CamelMicroProfileHealthCheckRegistry registration for routes and consumers health checks when routes are supervis
github-actions[bot] commented on PR #8327: URL: https://github.com/apache/camel/pull/8327#issuecomment-1240762035 :warning: This PR changes Camel components and will be tested automatically. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #8326: CAMEL-18484 Camel-xchange: Enable mock testing without real account
github-actions[bot] commented on PR #8326: URL: https://github.com/apache/camel/pull/8326#issuecomment-1240724710 :x: Finished component verification: **1 component(s) test failed** out of 1 component(s) tested -- 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 (d537cc7e089 -> 0398b41c1b3)
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 d537cc7e089 camel-jbang - Add reset-stats command
new dea274f3a9c CAMEL-18456: created a test infra module for embedded Jetty
new 0398b41c1b3 CAMEL-18456: converted camel-ahc-ws tests to
camel-test-infra-jetty
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-ahc-ws/pom.xml| 33 +++---
.../component/ahc/ws/WsProducerConsumerTest.java | 62 ---
.../camel/component/ahc/ws/WsProducerTest.java | 26 +++--
.../camel/component/ahc/ws/WsProducerTestBase.java | 44 +---
.../ahc/ws/WsProducerUsingStreamingTest.java | 27 -
.../camel/component/ahc/ws/WssProducerTest.java| 46 +---
.../src/test/resources/log4j2.properties | 3 +
test-infra/camel-test-infra-jetty/pom.xml | 70
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../test/infra/jetty/common/JettyProperties.java | 22 ++--
.../infra/jetty/services/JettyConfiguration.java | 117 +++
.../jetty/services/JettyConfigurationBuilder.java | 75 +
.../infra/jetty/services/JettyEmbeddedService.java | 124 +
.../test/infra/jetty/services/JettyService.java| 41 ---
test-infra/pom.xml | 1 +
15 files changed, 527 insertions(+), 164 deletions(-)
create mode 100644 test-infra/camel-test-infra-jetty/pom.xml
copy {init/camel-bundle-plugin =>
test-infra/camel-test-infra-jetty}/src/main/resources/META-INF/MANIFEST.MF
(100%)
copy
components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerTest.java
=>
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java
(64%)
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfigurationBuilder.java
create mode 100644
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyEmbeddedService.java
copy
components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerUsingStreamingTest.java
=>
test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyService.java
(53%)
[camel] 01/02: CAMEL-18456: created a test infra module for embedded Jetty
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 dea274f3a9c30bfb66dafc3f6b92f1f7f8972376
Author: Otavio Rodolfo Piske
AuthorDate: Wed Sep 7 17:38:25 2022 +0200
CAMEL-18456: created a test infra module for embedded Jetty
---
test-infra/camel-test-infra-jetty/pom.xml | 70
.../src/main/resources/META-INF/MANIFEST.MF| 0
.../test/infra/jetty/common/JettyProperties.java | 29 +
.../infra/jetty/services/JettyConfiguration.java | 117 +++
.../jetty/services/JettyConfigurationBuilder.java | 75 +
.../infra/jetty/services/JettyEmbeddedService.java | 124 +
.../test/infra/jetty/services/JettyService.java| 44
test-infra/pom.xml | 1 +
8 files changed, 460 insertions(+)
diff --git a/test-infra/camel-test-infra-jetty/pom.xml
b/test-infra/camel-test-infra-jetty/pom.xml
new file mode 100644
index 000..6ec3bbb5e3b
--- /dev/null
+++ b/test-infra/camel-test-infra-jetty/pom.xml
@@ -0,0 +1,70 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+camel-test-infra-parent
+org.apache.camel
+../camel-test-infra-parent/pom.xml
+3.19.0-SNAPSHOT
+
+
+4.0.0
+
+camel-test-infra-jetty
+Camel :: Test Infra :: Jetty
+
+
+
+org.apache.camel
+camel-test-infra-common
+${project.version}
+test-jar
+
+
+
+org.awaitility
+awaitility
+
+
+
+org.eclipse.jetty
+jetty-servlet
+${jetty-version}
+
+
+org.eclipse.jetty
+jetty-server
+${jetty-version}
+
+
+
+
+
+
+org.apache.maven.plugins
+maven-jar-plugin
+
+
+
+
+
+
diff --git
a/test-infra/camel-test-infra-jetty/src/main/resources/META-INF/MANIFEST.MF
b/test-infra/camel-test-infra-jetty/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 000..e69de29bb2d
diff --git
a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java
b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java
new file mode 100644
index 000..d01b0604022
--- /dev/null
+++
b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/common/JettyProperties.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.test.infra.jetty.common;
+
+public final class JettyProperties {
+/**
+ * The Jetty server address in the format host:port
+ */
+public static final String JETTY_ADDRESS = "jetty.address";
+
+private JettyProperties() {
+
+}
+}
diff --git
a/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
new file mode 100644
index 000..22d11728d45
--- /dev/null
+++
b/test-infra/camel-test-infra-jetty/src/test/java/org/apache/camel/test/infra/jetty/services/JettyConfiguration.java
@@ -0,0 +1,117 @@
+/*
+ * 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
[camel] 02/02: CAMEL-18456: converted camel-ahc-ws tests to camel-test-infra-jetty
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 0398b41c1b33b864a00b67122ac637093906f375
Author: Otavio Rodolfo Piske
AuthorDate: Thu Sep 8 13:57:08 2022 +0200
CAMEL-18456: converted camel-ahc-ws tests to camel-test-infra-jetty
---
components/camel-ahc-ws/pom.xml| 33 ++--
.../component/ahc/ws/WsProducerConsumerTest.java | 62 +-
.../camel/component/ahc/ws/WsProducerTest.java | 26 ++---
.../camel/component/ahc/ws/WsProducerTestBase.java | 44 ++-
.../ahc/ws/WsProducerUsingStreamingTest.java | 27 --
.../camel/component/ahc/ws/WssProducerTest.java| 46 +---
.../src/test/resources/log4j2.properties | 3 ++
7 files changed, 114 insertions(+), 127 deletions(-)
diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml
index 8863c0c6e87..fca718e9b3c 100644
--- a/components/camel-ahc-ws/pom.xml
+++ b/components/camel-ahc-ws/pom.xml
@@ -70,34 +70,31 @@
test
-
+
-org.eclipse.jetty.websocket
-websocket-api
-${jetty-version}
-test
+org.apache.camel
+camel-test-infra-common
+${project.version}
+test-jar
+
-org.eclipse.jetty.websocket
-websocket-server
-${jetty-version}
-test
+org.apache.camel
+camel-test-infra-jetty
+${project.version}
+test-jar
+
+
org.eclipse.jetty.websocket
-websocket-servlet
-${jetty-version}
-test
-
-
-org.eclipse.jetty
-jetty-servlet
+websocket-api
${jetty-version}
test
-org.eclipse.jetty
-jetty-server
+org.eclipse.jetty.websocket
+websocket-server
${jetty-version}
test
diff --git
a/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
b/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
index c6e18ef4a65..b0be9ccf8bb 100644
---
a/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
+++
b/components/camel-ahc-ws/src/test/java/org/apache/camel/component/ahc/ws/WsProducerConsumerTest.java
@@ -22,59 +22,44 @@ import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.infra.jetty.services.JettyConfiguration;
+import org.apache.camel.test.infra.jetty.services.JettyConfigurationBuilder;
+import org.apache.camel.test.infra.jetty.services.JettyEmbeddedService;
import org.apache.camel.test.junit5.CamelTestSupport;
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.servlet.ServletContextHandler;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertTrue;
-/**
- *
- */
+@Timeout(30)
public class WsProducerConsumerTest extends CamelTestSupport {
protected static final String TEST_MESSAGE = "Hello World!";
protected static final String TEST_CONNECTED_MESSAGE = "Connected!";
-protected static final int PORT = AvailablePortFinder.getNextAvailable();
private static final Logger LOG =
LoggerFactory.getLogger(WsProducerConsumerTest.class);
-protected Server server;
-
-protected List messages;
-
-public void startTestServer() throws Exception {
-// start a simple websocket echo service
-server = new Server(PORT);
-Connector connector = new ServerConnector(server);
-server.addConnector(connector);
-
-ServletContextHandler ctx = new ServletContextHandler();
-ctx.setContextPath("/");
-ctx.addServlet(TestServletFactory.class.getName(), "/*");
+private static final JettyConfiguration JETTY_CONFIGURATION =
JettyConfigurationBuilder
+.emptyTemplate()
+.withPort(AvailablePortFinder.getNextAvailable())
+.withContextPath(JettyConfiguration.ROOT_CONTEXT_PATH)
+.addServletConfiguration(new
JettyConfiguration.ServletConfiguration(
+TestServletFactory.class.getName(),
[GitHub] [camel] orpiske merged pull request #8325: CAMEL-18456: consolidate Jetty usages in test code
orpiske merged PR #8325: URL: https://github.com/apache/camel/pull/8325 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on pull request #8325: CAMEL-18456: consolidate Jetty usages in test code
orpiske commented on PR #8325: URL: https://github.com/apache/camel/pull/8325#issuecomment-1240718091 Checkstyle failing because the new test infra module is not on the repos yet. It should be fine to go. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: camel-jbang - Add reset-stats command
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d537cc7e089 camel-jbang - Add reset-stats command
d537cc7e089 is described below
commit d537cc7e089e641db82139027459e464c207da27
Author: Claus Ibsen
AuthorDate: Thu Sep 8 15:27:07 2022 +0200
camel-jbang - Add reset-stats command
---
.../camel/dsl/jbang/core/commands/action/CamelReloadAction.java | 6 +++---
.../camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
index 1430a5aac8b..b62933a8f83 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.dsl.jbang.core.commands.action;
+import java.io.File;
+import java.util.List;
+
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
-import java.io.File;
-import java.util.List;
-
@CommandLine.Command(name = "reload",
description = "Trigger reloading Camel")
public class CamelReloadAction extends ActionBaseCommand {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
index ff23a705597..34a00c1414a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.dsl.jbang.core.commands.action;
+import java.io.File;
+import java.util.List;
+
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
-import java.io.File;
-import java.util.List;
-
@CommandLine.Command(name = "reset-stats",
description = "Reset performance statistics")
public class CamelResetStatsAction extends ActionBaseCommand {
