[camel] branch main updated: camel-jbang - run from clipbard, fix if java has package name
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 04805f108c5 camel-jbang - run from clipbard, fix if java has package name 04805f108c5 is described below commit 04805f108c599296baad30dcbd65d6d8403b8590 Author: Claus Ibsen AuthorDate: Tue Nov 29 08:54:56 2022 +0100 camel-jbang - run from clipbard, fix if java has package name --- .../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java| 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index 4a4a09dbf09..efc5b3879d5 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -616,7 +616,12 @@ class Run extends CamelCommand { throw new IllegalArgumentException( "Cannot determine the Java class name from the source in the clipboard"); } -fn = fqn + ".java"; +// drop package in file name +String cn = fqn; +if (fqn.contains(".")) { +cn = cn.substring(cn.lastIndexOf('.') + 1); +} +fn = cn + ".java"; } Files.write(Paths.get(fn), t.toString().getBytes(StandardCharsets.UTF_8)); file = "file:" + fn;
[GitHub] [camel-k] tadayosi opened a new pull request, #3856: fix(source): dataformat dependencies not resolved
tadayosi opened a new pull request, #3856: URL: https://github.com/apache/camel-k/pull/3856 This fixes an issue reported by @brunoNetId that Camel K doesn't resolve dataformat dependencies correctly unless doing explicitly `kamel run route.xml -d camel:jackson` for the following DSLs: ```xml ``` ```xml ``` ```xml ``` **Release Note** ```release-note fix(source): dataformat dependencies not resolved ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tobiasoort commented on pull request #3855: Added support for multi-arch building of Operator image
tobiasoort commented on PR #3855: URL: https://github.com/apache/camel-k/pull/3855#issuecomment-1330218963 One test failed, due to: ``` Expected [3114](https://github.com/apache/camel-k/actions/runs/3567995319/jobs/6001875342#step:4:3256) : [3115](https://github.com/apache/camel-k/actions/runs/3567995319/jobs/6001875342#step:4:3257) to equal [3116](https://github.com/apache/camel-k/actions/runs/3567995319/jobs/6001875342#step:4:3258) : \"\" ``` I'm pretty sure that's a bug in that test with some escaping gone awry. -- 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: Fixed CS
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 e326f747f1f Fixed CS e326f747f1f is described below commit e326f747f1feb07c479d4b9ef6e3c9b097294413 Author: Claus Ibsen AuthorDate: Tue Nov 29 08:46:36 2022 +0100 Fixed CS --- .../java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java | 5 - 1 file changed, 5 deletions(-) diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java index ebc578d4f32..dd94994f2d1 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareParentPomMojo.java @@ -20,14 +20,10 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.nio.file.Path; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import java.util.stream.Collectors; import org.apache.camel.tooling.util.PackageHelper; import org.apache.camel.tooling.util.Strings; @@ -42,7 +38,6 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; -import org.apache.maven.shared.utils.xml.pull.XmlPullParserException; /** * Prepares the parent/pom.xml to keep the Camel artifacts up-to-date.
[GitHub] [camel] davsclaus closed pull request #8790: Generated sources regen
davsclaus closed pull request #8790: Generated sources regen URL: https://github.com/apache/camel/pull/8790 -- 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 (651ed1eb5b2 -> 1450d8aa1c3)
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 651ed1eb5b2 camel-jbang - Upgrade to latest SB/quarkus add 941c5f6326c CAMEL-18757 Specify type for pom-only artifacts like camel-*-parent (#8783) add 1450d8aa1c3 Regen for commit 941c5f6326c588479f088e07435c0232824990fe No new revisions were added by this update. Summary of changes: bom/camel-bom/pom.xml | 81 +- camel-dependencies/pom.xml |1 + parent/pom.xml | 2291 ++-- tooling/maven/camel-package-maven-plugin/pom.xml |5 + .../maven/packaging/PrepareParentPomMojo.java | 63 +- 5 files changed, 2227 insertions(+), 214 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8790: Generated sources regen
github-actions[bot] opened a new pull request, #8790: URL: https://github.com/apache/camel/pull/8790 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] tobiasoort commented on pull request #3855: Added support for multi-arch building of Operator image
tobiasoort commented on PR #3855: URL: https://github.com/apache/camel-k/pull/3855#issuecomment-1330209521 > Why do we need to also make `make images` multi-arch even though we already have `make images-arch` which obviously builds images for multi-arch? A couple of reasons! First of all, because 'it is the way'. Users expect dockerimages to be multi-arch and not ponder about what arch their system/cluster is on. Even the upstream containers like `ubi-quarkus-mandrel-builder-image` do this. Second, because it allows you to think about the _pipeline_ and not about specific arch builds. This also means that this multi-arch image would get pushed to dockerhub, 'business as usual'. Third: the multi-arch build depends on graalvm instead of quarkus (https://github.com/apache/camel-k/blob/3be0ab83ac6682c2412319a5778167d9dec08671/build/Dockerfile.arch#L16) because the right upstream image 'just for arm64' isnt there. This puts a split in the project dependencies and can cause weird issues downstream that are hard to reproduce. My suggestion would be to remove the 'images-arch' after this PR. It was a good way to get all the plumbing in place, but with official docker support for multi-arch and also upstream support from quarkus, we don't need that 'fork in the road' anymore. -- 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 WillemJiang-patch-1 updated (d515d4b22e5 -> ec4178b4a56)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch WillemJiang-patch-1 in repository https://gitbox.apache.org/repos/asf/camel.git from d515d4b22e5 Fix the camel project export dir option typo add ec4178b4a56 Update the camel export to use --directory option No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
[camel-quarkus] 03/04: Disable DatasonnetIT due to #4284
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6c1f5bcd18dd40e72be8372495df961f21c6f530 Author: James Netherton AuthorDate: Mon Nov 21 08:51:08 2022 + Disable DatasonnetIT due to #4284 --- .../org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/integration-tests/datasonnet/src/test/java/org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java b/integration-tests/datasonnet/src/test/java/org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java index 124bb7e75e..31fbf1e959 100644 --- a/integration-tests/datasonnet/src/test/java/org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java +++ b/integration-tests/datasonnet/src/test/java/org/apache/camel/quarkus/component/datasonnet/it/DatasonnetIT.java @@ -17,7 +17,9 @@ package org.apache.camel.quarkus.component.datasonnet.it; import io.quarkus.test.junit.QuarkusIntegrationTest; +import org.junit.jupiter.api.Disabled; +@Disabled("https://github.com/apache/camel-quarkus/issues/4284;) @QuarkusIntegrationTest class DatasonnetIT extends DatasonnetTest {
[camel-quarkus] branch quarkus-main updated (ab01cf97b4 -> 30d8f32a48)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard ab01cf97b4 Add temporary dependency override for JSONata4Java #4294 discard 2486aef4e9 Disable DatasonnetIT due to #4284 discard 7c9636a92b Disable microprofile-fault-tolerance testing due to #4225 discard 18cb6414bd Upgrade Quarkus to 2.15.0.CR1 add b913f4f68c Add CXF WS-SecurityPolicy test add a87deeefb5 Show a workaround for #4291 SoapFault: BSP:R3227: A SECURITY_HEADER MUST NOT contain more than one TIMESTAMP add b1917613ac Add WS-Trust test for CXF SOAP add d027701e9c WS-Trust workaround for #4291 SoapFault: BSP:R3227: A SECURITY_HEADER MUST NOT contain more than one TIMESTAMP add e22b2c34db Upgrade to Quarkiverse CXF 1.6.0 add 4f0317ce38 Reformat poms by running mvn process-resources -Pformat -N add 281c127acb Updated CHANGELOG.md new 439cce4753 Upgrade Quarkus to 2.15.0.CR1 new 5f93c44fb1 Disable microprofile-fault-tolerance testing due to #4225 new 6c1f5bcd18 Disable DatasonnetIT due to #4284 new 30d8f32a48 Add temporary dependency override for JSONata4Java #4294 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 (ab01cf97b4) \ N -- N -- N refs/heads/quarkus-main (30d8f32a48) 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 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 1 + .../cxf-soap/cxf-soap-mtom-awt/pom.xml | 2 +- .../cxf-soap/cxf-soap-mtom/pom.xml | 2 +- .../cxf-soap-ws-security-server/README.adoc| 19 + .../cxf-soap/cxf-soap-ws-security-server/pom.xml | 246 +++ .../way/it/WsSecurityPolicyServerRoutesCxfWay.java | 33 ++ .../it/WssSecurityPolicyHelloServiceCxfWay.java| 27 ++ .../WssSecurityPolicyHelloServiceCxfWayImpl.java | 44 ++ .../server/it/PasswordCallbackHandler.java | 55 +++ .../server/it/WsSecurityPolicyServerRoutes.java| 54 +++ .../server/it/WssSecurityPolicyHelloService.java | 27 ++ .../it/WssSecurityPolicyHelloServiceImpl.java | 39 ++ .../{application.properties => alice.properties} | 7 +- .../src/main/resources/application.properties | 4 + .../{application.properties => bob.properties} | 7 +- .../src/main/resources/encrypt-sign-policy.xml | 75 .../way/it/CxfWssSecurityPolicyServerCxfWayIT.java | 24 ++ .../it/CxfWssSecurityPolicyServerCxfWayTest.java | 215 ++ .../server/it/CxfWssSecurityPolicyServerIT.java| 24 ++ .../server/it/CxfWssSecurityPolicyServerTest.java | 216 ++ .../pom.xml| 31 +- .../ws/trust/common/PasswordCallbackHandler.java | 52 +++ .../it/ws/trust/server/ServerCallbackHandler.java | 30 ++ .../soap/it/ws/trust/server/StsLoggingFeature.java | 33 ++ .../soap/it/ws/trust/server/TrustHelloService.java | 34 ++ .../it/ws/trust/server/WsTrustServerRoutes.java| 70 .../server/cxf/way/TrustHelloServiceCxfWay.java| 34 ++ .../cxf/way/TrustHelloServiceCxfWayImpl.java | 43 ++ .../server/cxf/way/WsTrustServerRoutesCxfWay.java | 34 ++ .../cxf/soap/it/ws/trust/sts/SampleSTS.java| 87 .../soap/it/ws/trust/sts/StsCallbackHandler.java | 32 ++ .../src/main/resources/AsymmetricSAML2Policy.xml | 102 + .../src/main/resources/Input_Policy.xml| 48 +++ .../src/main/resources/Output_Policy.xml | 48 +++ .../src/main/resources/TrustHelloService.wsdl | 182 + .../main/resources/TrustHelloService_schema1.xsd | 36 ++ .../src/main/resources/application.properties | 8 +- .../src/main/resources/serviceKeystore.properties | 40 ++ .../src/main/resources/servicestore.jks| Bin 0 -> 3475 bytes .../src/main/resources/stsKeystore.properties | 39 ++ .../src/main/resources/stsstore.jks| Bin 0 -> 5570 bytes .../src/main/resources/ws-trust-1.4-service.wsdl | 303 ++ .../soap/it/ws/trust/ClientCallbackHandler.java| 50 +++ .../cxf/soap/it/ws/trust/CxfWsTrustIT.java | 24 ++
[camel-quarkus] 01/04: Upgrade Quarkus to 2.15.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 439cce4753edd40b2ebe5776108c2adb096bbb6a Author: James Netherton AuthorDate: Fri Oct 28 07:24:15 2022 +0100 Upgrade Quarkus to 2.15.0.CR1 --- docs/antora.yml| 2 +- pom.xml| 14 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 12 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +- .../src/main/generated/flattened-reduced-verbose-pom.xml | 10 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 347e2c9a10..66590918f5 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,7 +30,7 @@ asciidoc: # Project versions camel-version: 3.18.2 # replace ${camel.version} camel-docs-version: 3.18.x # replace ${camel.docs.components.version} -quarkus-version: 2.14.0.Final # replace ${quarkus.version} +quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} graalvm-version: 22.2.0 # replace ${graalvm.version} graalvm-docs-version: 22.2 min-maven-version: 3.8.2 # replace ${min-maven-version} diff --git a/pom.xml b/pom.xml index 11047a34e8..7b3d634e88 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 1.0.4 1.0.6 1.0.3 -2.14.0.Final +999-SNAPSHOT 3.0.0 0.39.0 @@ -95,15 +95,15 @@ 1.111 1.7.0 ${google-oauth-client-version} -22.2.0 -1.50.2 +22.3.0 +1.51.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} 4.2.0 ${hbase-version} 4.2.0-incubating -14.0.1.Final +14.0.2.Final ${influx-java-driver-version} 1.9.13 ${jackson1.version} @@ -124,7 +124,7 @@ 2.4.7 3.3.1 ${kudu-version} -1.7.20 +1.7.21 2.24.0 ${libthrift-version} 1.13.1 @@ -132,11 +132,11 @@ ${squareup-okio-version} 0.31.0 0.25.0 -3.19.6 +3.21.9 3.4.22 ${reactor-netty-version} 2.5.0 - 3.21.0 + 3.22.0 ${spring5-version} 1.33 0.43.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index c7ca68a085..5b3e051f2a 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -10069,7 +10069,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel -3.21.0 +3.22.0 jakarta.activation @@ -10326,12 +10326,12 @@ org.graalvm.js js -22.2.0 +22.3.0 org.graalvm.js js-scriptengine -22.2.0 +22.3.0 org.influxdb @@ -10346,17 +10346,17 @@ org.jetbrains.kotlin kotlin-script-util -1.7.20 +1.7.21 org.jetbrains.kotlin kotlin-scripting-jvm -1.7.20 +1.7.21 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.7.20 +1.7.21 org.jruby.jcodings diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 149cdb7d6a..a4633c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -10069,7 +10069,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel -3.21.0 +3.22.0 jakarta.activation @@ -10321,7 +10321,7 @@ org.graalvm.js js -22.2.0 +22.3.0 org.influxdb @@ -10336,17 +10336,17 @@ org.jetbrains.kotlin kotlin-script-util -1.7.20 +1.7.21 org.jetbrains.kotlin kotlin-scripting-jvm -1.7.20 +1.7.21 org.jetbrains.kotlin kotlin-scripting-jvm-host -1.7.20 +1.7.21 org.jruby.jcodings diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index cee98cfa8e..91f16ce100 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -10069,7 +10069,7 @@ io.smallrye.reactive smallrye-reactive-messaging-camel -
[camel-quarkus] 04/04: Add temporary dependency override for JSONata4Java #4294
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 30d8f32a487a0d6585b1cde96b7f549d3560b0e2 Author: James Netherton AuthorDate: Fri Nov 25 08:24:15 2022 + Add temporary dependency override for JSONata4Java #4294 --- pom.xml | 1 + poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml| 5 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 + poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 + 5 files changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index 7b3d634e88..00e11f91f8 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ 6.3.0.202209071007-r 5.6.0 2.1.2 +2.2.4 ${json-path-version} 2.4.7 3.3.1 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 3b660bfc6c..3a67785200 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -9920,6 +9920,11 @@ core ${zxing.version} + +com.ibm.jsonata4java +JSONata4Java +${jsonata4java.version} + com.jayway.jsonpath json-path diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 5b3e051f2a..f2581fb674 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -9854,6 +9854,11 @@ core 3.3.3 + +com.ibm.jsonata4java +JSONata4Java +2.2.4 + com.jayway.jsonpath json-path diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a4633c..c2bd6fbd1d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -9854,6 +9854,11 @@ core 3.3.3 + +com.ibm.jsonata4java +JSONata4Java +2.2.4 + com.jayway.jsonpath json-path diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 91f16ce100..7df75aed3f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -9854,6 +9854,11 @@ core 3.3.3 + +com.ibm.jsonata4java +JSONata4Java +2.2.4 + com.jayway.jsonpath json-path
[camel-quarkus] 02/04: Disable microprofile-fault-tolerance testing due to #4225
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 5f93c44fb186e9df7febd3c63436d6ce45501662 Author: James Netherton AuthorDate: Mon Oct 31 08:56:00 2022 + Disable microprofile-fault-tolerance testing due to #4225 --- .../it/CoreFaultToleranceProducers.java| 35 -- integration-tests/foundation-grouped/pom.xml | 6 +++- integration-tests/microprofile/pom.xml | 2 ++ .../MicroProfileFaultToleranceRoutes.java | 20 ++--- .../MicroprofileFaultToleranceIT.java | 2 ++ .../MicroprofileFaultToleranceTest.java| 2 ++ tooling/scripts/group-tests.groovy | 6 +++- 7 files changed, 58 insertions(+), 15 deletions(-) diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java index aa9394108c..67f580041d 100644 --- a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java +++ b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java @@ -18,29 +18,32 @@ package org.apache.camel.quarkus.core.faulttolerance.it; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Disposes; import javax.inject.Named; import io.smallrye.faulttolerance.core.FaultToleranceStrategy; import io.smallrye.faulttolerance.core.InvocationContext; import io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker; import io.smallrye.faulttolerance.core.stopwatch.SystemStopwatch; +import io.smallrye.faulttolerance.core.timer.ThreadTimer; import io.smallrye.faulttolerance.core.util.ExceptionDecision; public class CoreFaultToleranceProducers { @ApplicationScoped @Named("customCircuitBreaker") -CircuitBreaker produceCustomCircuitBreaker() { +CircuitBreaker produceCustomCircuitBreaker(ThreadTimer threadTimer) { FaultToleranceStrategy delegate = new FaultToleranceStrategy() { @Override public Integer apply(InvocationContext ctx) { return null; } }; -return new CircuitBreaker(delegate, "description", ExceptionDecision.ALWAYS_FAILURE, 10, 40, 0.1, -2, new SystemStopwatch()) { +return new CircuitBreaker<>(delegate, "description", ExceptionDecision.ALWAYS_FAILURE, 10, 40, 0.1, +2, SystemStopwatch.INSTANCE, threadTimer) { @Override public String toString() { return "customCircuitBreaker"; @@ -54,4 +57,30 @@ public class CoreFaultToleranceProducers { return Executors.newFixedThreadPool(2); } +@ApplicationScoped +@Named("threadTimer") +ThreadTimer threadTimer(@Named("threadTimerExecutor") ExecutorService executorService) { +return new ThreadTimer(executorService); +} + +@ApplicationScoped +@Named("threadTimerExecutor") +ExecutorService threadTimerExecutor() { +return Executors.newSingleThreadExecutor(); +} + +void disposeThreadTimerExecutor(@Disposes @Named("threadTimerExecutor") ExecutorService threadTimerExecutor, +ThreadTimer timer) { +try { +timer.shutdown(); +} catch (InterruptedException e) { +Thread.currentThread().interrupt(); +} + +try { +threadTimerExecutor.awaitTermination(10, TimeUnit.SECONDS); +} catch (InterruptedException e) { +Thread.currentThread().interrupt(); +} +} } diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml index 70cf7efb29..741e00836a 100644 --- a/integration-tests/foundation-grouped/pom.xml +++ b/integration-tests/foundation-grouped/pom.xml @@ -96,10 +96,12 @@ org.apache.camel.quarkus camel-quarkus-log + org.apache.camel.quarkus camel-quarkus-mock @@ -210,7 +212,9 @@ ${maven.multiModuleProjectDirectory}/integration-test-groups/foundation ${project.basedir} - src/main/resources/application.properties + src/main/resources/application.properties + +
[camel] branch regen_bot updated (98da53bac70 -> 651ed1eb5b2)
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 98da53bac70 Regen for commit 17ca68c2a58e9349518b5422431ffcd7a1c5dc37 add 651ed1eb5b2 camel-jbang - Upgrade to latest SB/quarkus No new revisions were added by this update. Summary of changes: .../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] davsclaus merged pull request #8783: CAMEL-18757 Specify type for pom-only artifacts like camel-*-parent
davsclaus merged PR #8783: URL: https://github.com/apache/camel/pull/8783 -- 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 - Upgrade to latest SB/quarkus
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 651ed1eb5b2 camel-jbang - Upgrade to latest SB/quarkus 651ed1eb5b2 is described below commit 651ed1eb5b221324375a88a2f073b9b59d3cdf3b Author: Claus Ibsen AuthorDate: Tue Nov 29 07:22:03 2022 +0100 camel-jbang - Upgrade to latest SB/quarkus --- .../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java index 8219f6438a3..9dbfc47336d 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java @@ -87,7 +87,7 @@ abstract class ExportBaseCommand extends CamelCommand { protected String localKameletDir; @CommandLine.Option(names = { "--spring-boot-version" }, description = "Spring Boot version", -defaultValue = "2.7.5") +defaultValue = "2.7.6") protected String springBootVersion; @CommandLine.Option(names = { "--camel-spring-boot-version" }, description = "Camel version to use with Spring Boot") @@ -102,7 +102,7 @@ abstract class ExportBaseCommand extends CamelCommand { protected String quarkusArtifactId; @CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version", -defaultValue = "2.14.1.Final") +defaultValue = "2.14.2.Final") protected String quarkusVersion; @CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
[GitHub] [camel-quarkus] davsclaus opened a new issue, #4300: camel-quarkus-http - ClassNotFoundException - javax.servlet.http.HttpServletRequest
davsclaus opened a new issue, #4300: URL: https://github.com/apache/camel-quarkus/issues/4300 A user that uses CEQ with the http kamelet sink, cannot run the application due to class not found exception. The servlet-api is required by camel-http-common as it comes with some type converters and whatnot that uses servlet. The pom.xml has scope=provided, and camel-http has dependency on servlet. See details at https://lists.apache.org/thread/bbt0fvm654x5kl0jplywyhpjm8z1wodc -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #8789: Fix the camel project export dir option typo
davsclaus commented on PR #8789: URL: https://github.com/apache/camel/pull/8789#issuecomment-1330099439 Ah lets use `--directory` so all args are using double `--` -- 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-karaf] branch main updated: [create-pull-request] automated change
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-karaf.git The following commit(s) were added to refs/heads/main by this push: new 4a4c2cc4 [create-pull-request] automated change 4a4c2cc4 is described below commit 4a4c2cc4159421b83b6c993e4e95c8f2ea50279c Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Nov 29 01:09:05 2022 + [create-pull-request] automated change --- .../resources/org/apache/camel/catalog/karaf/components/aws2-ec2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/aws2-ec2.json b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/aws2-ec2.json index 21c1b5bd..684b6f51 100644 --- a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/aws2-ec2.json +++ b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/aws2-ec2.json @@ -41,7 +41,7 @@ }, "headers": { "CamelAwsEC2ImageId": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "An image ID of the AWS marketplace", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" }, -"CamelAwsEC2InstanceType": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [ "a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal", "c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", "c5.4xlarge" [...] +"CamelAwsEC2InstanceType": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [ "a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal", "c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge", "c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge", "c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", "c5.4xlarge" [...] "CamelAwsEC2Operation": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The operation we want to perform", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" }, "CamelAwsEC2InstanceMinCount": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The minimum number of instances we want to run.", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MIN_COUNT" }, "CamelAwsEC2InstanceMaxCount": { "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The maximum number of instances we want to run.", "constantName": "org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MAX_COUNT" },
[GitHub] [camel-karaf] oscerd merged pull request #214: [Github Actions] Periodic Sync Camel Karaf Main Branch
oscerd merged PR #214: URL: https://github.com/apache/camel-karaf/pull/214 -- 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 closed issue #2880: Camel 3.15 - Data formats renamed
tadayosi closed issue #2880: Camel 3.15 - Data formats renamed URL: https://github.com/apache/camel-k/issues/2880 -- 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 #2880: Camel 3.15 - Data formats renamed
tadayosi commented on issue #2880: URL: https://github.com/apache/camel-k/issues/2880#issuecomment-1330088124 I assume it's already done, so let me close it. Please reopen if I'm wrong. -- 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 #3847: Rethink E2E execution flow
tadayosi commented on issue #3847: URL: https://github.com/apache/camel-k/issues/3847#issuecomment-1330074389 > but, take just as an example the common workflow. We use it as a basic smoke test for nightly release, so it's run every night. There are 100 tests, and, the operator is installed 45 times (at least, according to the log). To be precise, it shouldn't be the operator deployments that are installed 45 times, but should be the `IntegrationPlatform` resources that are installed each time. https://github.com/apache/camel-k/blob/main/e2e/support/test_support.go#L254 I don't think creating a CR per test run costs so much time, but if it doesn't make sense we can remove the installation step from the test support function. -- 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 #8789: Fix the camel project export dir option typo
github-actions[bot] commented on PR #8789: URL: https://github.com/apache/camel/pull/8789#issuecomment-1330053090 :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-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1330053023 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 3570461026-950-54ce76a9-33f3-46c3-b8c4-b465d49f2278 * Camel Quarkus Commit: a5c9cb34ecd3dd0f63a866f287e1533fa659ed4a * Quarkus Main Commit: 4f0317ce384b58593433854142b22016460a8ae5 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/3570461026 -- 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] WillemJiang opened a new pull request, #8789: Fix the camel project export dir option typo
WillemJiang opened a new pull request, #8789: URL: https://github.com/apache/camel/pull/8789 `camel export` command directory parameter should be `-dir` instead of `--dir` -- 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 WillemJiang-patch-1 created (now d515d4b22e5)
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a change to branch WillemJiang-patch-1 in repository https://gitbox.apache.org/repos/asf/camel.git at d515d4b22e5 Fix the camel project export dir option typo This branch includes the following new commits: new d515d4b22e5 Fix the camel project export dir option typo 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] 01/01: Fix the camel project export dir option typo
This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch WillemJiang-patch-1 in repository https://gitbox.apache.org/repos/asf/camel.git commit d515d4b22e5108726e751506544cb5e37500a8d9 Author: Willem Jiang AuthorDate: Tue Nov 29 11:27:02 2022 +0800 Fix the camel project export dir option typo --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 16dace4c5e7..643179f4519 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -1512,7 +1512,7 @@ To export to another directly (copies the files) you execute: [source,bash] -camel export --runtime=camel-main --gav=com.foo:acme:1.0-SNAPSHOT --dir=../myproject +camel export --runtime=camel-main --gav=com.foo:acme:1.0-SNAPSHOT -dir=../myproject TIP: See the possible options by running: `camel export --help` for more details. @@ -1524,7 +1524,7 @@ specify the `--build-tool=gradle` when exporting, such as: [source,bash] -camel export --build-tool=gradle --runtime=spring-boot --gav=com.foo:acme:1.0-SNAPSHOT --dir=../myproject +camel export --build-tool=gradle --runtime=spring-boot --gav=com.foo:acme:1.0-SNAPSHOT -dir=../myproject === Exporting with JMX management included @@ -1534,7 +1534,7 @@ To include JMX, you need to add `camel:management` in the `--deps` option, as sh [source,bash] -camel export --runtime=quarkus --gav=com.foo:acme:1.0-SNAPSHOT --deps=camel:management --dir=../myproject +camel export --runtime=quarkus --gav=com.foo:acme:1.0-SNAPSHOT --deps=camel:management -dir=../myproject === Exporting with Camel CLI included @@ -1544,7 +1544,7 @@ To be able to continue to use Camel CLI (i.e. `camel`), you need to add `camel:c [source,bash] -camel export --runtime=quarkus --gav=com.foo:acme:1.0-SNAPSHOT --deps=camel:cli-connector --dir=../myproject +camel export --runtime=quarkus --gav=com.foo:acme:1.0-SNAPSHOT --deps=camel:cli-connector -dir=../myproject === Configuring exporting
[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 281c127acb Updated CHANGELOG.md 281c127acb is described below commit 281c127ac7c8bc3024ee2b3f7a6c1db8742e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Nov 29 03:22:48 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70223dee0d..525d7a4a6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ - Upgrade to quarkus-cxf 1.5.5 [\#4232](https://github.com/apache/camel-quarkus/pull/4232) ([ppalaga](https://github.com/ppalaga)) - replace doc occurence of camel-quarkus-jaxp with camel-quarkus-xml-jaxp [\#4229](https://github.com/apache/camel-quarkus/pull/4229) ([aldettinger](https://github.com/aldettinger)) - Adding a test for custom ConnectionFactory without quarkus.artemis.url [\#4228](https://github.com/apache/camel-quarkus/pull/4228) ([zhfeng](https://github.com/zhfeng)) +- Add CXF WS-SecurityPolicy test [\#4224](https://github.com/apache/camel-quarkus/pull/4224) ([ppalaga](https://github.com/ppalaga)) - Test CXF service having an Implementation class in the application [\#4223](https://github.com/apache/camel-quarkus/pull/4223) ([ppalaga](https://github.com/ppalaga)) - perf-regression: remove workaround and final fix Java 17 issue \#4031 [\#4222](https://github.com/apache/camel-quarkus/pull/4222) ([aldettinger](https://github.com/aldettinger)) - fix line ending [\#4221](https://github.com/apache/camel-quarkus/pull/4221) ([aldettinger](https://github.com/aldettinger))
[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 3be0ab83a Updated CHANGELOG.md 3be0ab83a is described below commit 3be0ab83ac6682c2412319a5778167d9dec08671 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Nov 29 03:17:33 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3debdb13..0ef116ead 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,14 @@ **Closed issues:** +- Remove deprecated Kubernetes API [\#3840](https://github.com/apache/camel-k/issues/3840) - gc trait fails for: cannot list resource \"endpoints\" in API group \"submariner.io\" [\#3833](https://github.com/apache/camel-k/issues/3833) - Bundle m2 camel k runtime distribution [\#3826](https://github.com/apache/camel-k/issues/3826) - E2E - Builder tests are constantly failing due to "Out of date version of GraalVM detected: native-image 21.3.0.0-Final" [\#3817](https://github.com/apache/camel-k/issues/3817) - query regarding using camel k [\#3815](https://github.com/apache/camel-k/issues/3815) - FTP sink does not create directories when writing [\#3812](https://github.com/apache/camel-k/issues/3812) - Release 1.10.3 [\#3796](https://github.com/apache/camel-k/issues/3796) +- Deprecate overlapping Kamel CLI features in favour of Camel JBang [\#3790](https://github.com/apache/camel-k/issues/3790) - Remove code deprecated before 1.8 \(LTS\) [\#3787](https://github.com/apache/camel-k/issues/3787) - Native checks to run on a nightly basis instead of on each PR [\#3784](https://github.com/apache/camel-k/issues/3784) - Ready condition message not always taken from Camel Health Check [\#3761](https://github.com/apache/camel-k/issues/3761)
[camel-kamelets] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 9dfb4c6a Updated CHANGELOG.md 9dfb4c6a is described below commit 9dfb4c6a250a0c9dbb826a061f872f02a4de9d1f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Nov 29 03:14:02 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6192..776310d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ **Merged pull requests:** +- Added repeatCount parameter to timer source Kamelet [\#1184](https://github.com/apache/camel-kamelets/pull/1184) ([oscerd](https://github.com/oscerd)) - Azure Storage Blob Sink Kamelet: Add it-test to Makefile [\#1183](https://github.com/apache/camel-kamelets/pull/1183) ([oscerd](https://github.com/oscerd)) - Fix mail-sink Kamelet [\#1181](https://github.com/apache/camel-kamelets/pull/1181) ([christophd](https://github.com/christophd)) - Added an Azure Storage Blob Source It Test [\#1180](https://github.com/apache/camel-kamelets/pull/1180) ([oscerd](https://github.com/oscerd))
[camel-k-runtime] 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-runtime.git The following commit(s) were added to refs/heads/main by this push: new f8f864df Updated CHANGELOG.md f8f864df is described below commit f8f864df15f91391cec94d4daeca792b60c4062b Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Nov 29 03:12:54 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a023c008..34c8df87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Changelog -## [Unreleased](https://github.com/apache/camel-k-runtime/tree/HEAD) +## [camel-k-runtime-project-1.16.0](https://github.com/apache/camel-k-runtime/tree/camel-k-runtime-project-1.16.0) (2022-11-28) -[Full Changelog](https://github.com/apache/camel-k-runtime/compare/camel-k-runtime-project-1.15.2...HEAD) +[Full Changelog](https://github.com/apache/camel-k-runtime/compare/camel-k-runtime-project-1.15.2...camel-k-runtime-project-1.16.0) **Closed issues:**
[camel-spring-boot] branch automatic-periodic-sync updated (e87d4c5cb88 -> 4700999c281)
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 e87d4c5cb88 CAMEL-18754: camel-micrometer - Add auto configuration for capturing metrics. add e5640f3a678 Fix GreeterService default WSDL URL in test (#673) add 4700999c281 Regen No new revisions were added by this update. Summary of changes: .../org/apache/camel/springboot/catalog/components/aws2-ec2.json | 2 +- .../cxf/soap/springboot/wssecurity/WSSecurityRouteTest.java | 8 2 files changed, 5 insertions(+), 5 deletions(-)
[camel-karaf] branch automatic-periodic-sync updated (99be5f25 -> 349c31bd)
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-karaf.git from 99be5f25 [create-pull-request] automated change add 349c31bd [create-pull-request] automated change No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/karaf/components/aws2-ec2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel-karaf] github-actions[bot] opened a new pull request, #214: [Github Actions] Periodic Sync Camel Karaf Main Branch
github-actions[bot] opened a new pull request, #214: URL: https://github.com/apache/camel-karaf/pull/214 Periodic Sync of Camel Karaf Main Branch with main Camel Main. see https://github.com/apache/camel-karaf/blob/main/.github/workflows/automatic-sync-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-examples] branch camel-quarkus-main updated: Add jms-jpa example (#123)
This is an automated email from the ASF dual-hosted git repository. zhfeng pushed a commit to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git The following commit(s) were added to refs/heads/camel-quarkus-main by this push: new ad7bd43 Add jms-jpa example (#123) ad7bd43 is described below commit ad7bd43179f75ce675fa6f774acba13e51a3f5ec Author: Zheng Feng AuthorDate: Tue Nov 29 09:01:11 2022 +0800 Add jms-jpa example (#123) * Add jms-jpa example * Apply suggestions from code review Co-authored-by: James Netherton * fix examples.json * Upgrade quarkus-artemis to 2.0.2 * Fix with some comments Co-authored-by: James Netherton --- docs/modules/ROOT/attachments/examples.json| 5 + {jta-jpa => jms-jpa}/README.adoc | 98 ++- jms-jpa/pom.xml| 320 + jms-jpa/src/main/java/org/acme/AuditLog.java | 61 jms-jpa/src/main/java/org/acme/CamelRoutes.java| 73 + .../src/main/java/org/acme/DummyXAResource.java| 204 + .../java/org/acme/DummyXAResourceRecovery.java | 81 ++ jms-jpa/src/main/java/org/acme/XAJmsComponent.java | 57 jms-jpa/src/main/resources/application.properties | 54 jms-jpa/src/test/java/org/acme/JtaIT.java | 23 ++ jms-jpa/src/test/java/org/acme/JtaTest.java| 62 {jta-jpa => jms-jpa}/src/test/resources/broker.xml | 8 +- jta-jpa/README.adoc| 65 + 13 files changed, 975 insertions(+), 136 deletions(-) diff --git a/docs/modules/ROOT/attachments/examples.json b/docs/modules/ROOT/attachments/examples.json index d920897..73a5761 100644 --- a/docs/modules/ROOT/attachments/examples.json +++ b/docs/modules/ROOT/attachments/examples.json @@ -29,6 +29,11 @@ "description": "Shows how to use Camel health-checks with Quarkus.", "link": "https://github.com/apache/camel-quarkus-examples/tree/main/health; }, + { +"title": "JMS and JPA", +"description": "Shows how to run a Camel Quarkus application that supports JTA transactions on three external transactional resources: a database (MySQL), a messaging broker (Artemis) and a simulated XAResource which can demonstrate the commit, rollback and crash recovery.", +"link": "https://github.com/apache/camel-quarkus-examples/tree/main/jms-jpa; + }, { "title": "JTA and JPA", "description": "Shows how to run a Camel Quarkus application that supports JTA transactions on two external transactional resources: a database (MySQL) and a simulate XAResource which can demonstrate the commit, rollback and crash recovery.", diff --git a/jta-jpa/README.adoc b/jms-jpa/README.adoc similarity index 76% copy from jta-jpa/README.adoc copy to jms-jpa/README.adoc index ab5ee6b..ca814a5 100644 --- a/jta-jpa/README.adoc +++ b/jms-jpa/README.adoc @@ -1,9 +1,9 @@ -= JTA and JPA: A Camel Quarkus example -:cq-example-description: An example that shows how to run a Camel Quarkus application that supports JTA transactions on two external transactional resources: a database (MySQL) and a simulate XAResource which can demonstrate the commit, rollback and crash recovery. += JMS and JPA: A Camel Quarkus example +:cq-example-description: An example that shows how to run a Camel Quarkus application that supports JTA transactions on three external transactional resources: a database (MySQL), a messaging broker (Artemis) and a simulated XAResource which can demonstrate the commit, rollback and crash recovery. {cq-description} -We use Narayana as standalone JTA Transaction Manager implementation, and Hibernate as JPA Adapter. +We use Narayana as the standalone JTA Transaction Manager implementation, and Hibernate as the JPA Adapter. This example will connect to a database with the connection details defined in `application.properties`. If the example is run on Development mode and no database exists, Quarkus will create a matching database @@ -51,6 +51,25 @@ docker exec -it db-mysql mysql -uroot -proot -e \ FLUSH PRIVILEGES;" +Create `audit_log` if it is needed: +[source, shell] + +docker exec -it db-mysql mysql -uadmin -padmin testdb -e \ + "CREATE TABLE audit_log ( \ + id bigint NOT NULL AUTO_INCREMENT, \ + message varchar(255) DEFAULT NULL, \ + PRIMARY KEY (id) \ + );" + + +Start Artemis: +[source, shell] + +docker run --name artemis \ + -e AMQ_USER=admin -e AMQ_PASSWORD=admin \ + -d -p 61616:61616 \ + quay.io/artemiscloud/activemq-artemis-broker + Prerequisites @@ -67,6 +86,10 @@ $prod.quarkus.datasource.password=admin %prod.quarkus.datasource.jdbc.transactions=xa %prod.quarkus.hibernate-orm.database.generation=none + +%prod.quarkus.artemis.url=tcp://localhost:61616 +%prod.quarkus.artemis.username=admin +%prod.quarkus.artemis.password=admin
[GitHub] [camel-quarkus-examples] zhfeng merged pull request #123: Add jms-jpa example
zhfeng merged PR #123: URL: https://github.com/apache/camel-quarkus-examples/pull/123 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] zregvart commented on a diff in pull request #928: fix: og:image
zregvart commented on code in PR #928: URL: https://github.com/apache/camel-website/pull/928#discussion_r1034057204 ## layouts/partials/header.html: ## @@ -31,11 +31,11 @@ {{ $featured := (.Resources.ByType "image").GetMatch "*featured*" }} {{ with $featured }} - +https://camel.apache.org{{ $featured.RelPermalink }}"> Review Comment: Try with this: ```suggestion ``` -- 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 #8788: Google Spreadsheets tests refactoring
github-actions[bot] commented on PR #8788: URL: https://github.com/apache/camel/pull/8788#issuecomment-1329740282 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 1 | 0 | -- 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] closed pull request #8787: Generated sources regen
github-actions[bot] closed pull request #8787: Generated sources regen URL: https://github.com/apache/camel/pull/8787 -- 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 (d36a6fe21bf -> 98da53bac70)
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 discard d36a6fe21bf Regen for commit 623651fcfaa58d5deaf5c387b0046c4148b738df add 17ca68c2a58 Milo-component: Letting the returned StatusCode from OPC UA producer through (#8646) add 98da53bac70 Regen for commit 17ca68c2a58e9349518b5422431ffcd7a1c5dc37 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 (d36a6fe21bf) \ N -- N -- N refs/heads/regen_bot (98da53bac70) 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: .../apache/camel/component/milo/client/MiloClientProducer.java | 9 - .../component/milo/client/internal/SubscriptionManager.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #8788: Google Spreadsheets tests refactoring
github-actions[bot] commented on PR #8788: URL: https://github.com/apache/camel/pull/8788#issuecomment-1329661140 :star2: Thank you for your contribution to the Apache Camel project! :star2: :warning: Please note that the changes on this PR may be **tested automatically**. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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] bvfalcon opened a new pull request, #8788: Google Spreadsheets tests refactoring
bvfalcon opened a new pull request, #8788: URL: https://github.com/apache/camel/pull/8788 At the Image 1 is shown work of application with Google Spreadspeets component in "real-life"-mode ![Image 1 - Real work](https://user-images.githubusercontent.com/49613576/204360806-24d5ccfa-499e-4a6c-a407-cf776c3ca44b.png) **Image 1 - Real work** Tests before (link side) and after (right side) this PR are shown at the Image 2 ![Image 2 - Tests changes](https://user-images.githubusercontent.com/49613576/204361924-ab972bed-ea30-48d4-a555-2c6c38b586dd.png) **Image 2 - Tests changes** Advantages of new schema: 1. Where are no unnecessary dependencies. Dependencies Citrus Framework, Spring Security, AssertJ are used by embedded server. These dependencies are test-scoped and were used only to mock remote Google Services. This is not necessary: Google Api Client itself [supports test-mode](https://github.com/googleapis/google-api-java-client/tree/main/google-api-client/src/main/java/com/google/api/client/googleapis/testing). 2. OAuth2 realization not necessary and removed. OAuth2 Mock server is build with Spring Security OAuth library which [is deprecated](https://spring.io/projects/spring-security-oauth). Implementing new OAuth2 Mock server using [new Spring component](https://spring.io/projects/spring-authorization-server) is difficult because required profound knowledge of OAuth2 protocol. And this is not necessary ;) -- Google Api Client library makes this work for us. (!) Not solved problem: both schemas - old and new - have no control of Sheets API change. If this API changes, component will be work in corrupted mode. Make this check is possible with analysis of [Sheets API Schema](https://sheets.googleapis.com/$discovery/rest?version=v4), but this aspect is out of scoped for this PR and will stay for future. -- 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 (fe312761620 -> d36a6fe21bf)
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 fe312761620 Regen for commit 17ca68c2a58e9349518b5422431ffcd7a1c5dc37 omit 17ca68c2a58 Milo-component: Letting the returned StatusCode from OPC UA producer through (#8646) add d36a6fe21bf Regen for commit 623651fcfaa58d5deaf5c387b0046c4148b738df 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 (fe312761620) \ N -- N -- N refs/heads/regen_bot (d36a6fe21bf) 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: .../apache/camel/component/milo/client/MiloClientProducer.java | 9 + .../component/milo/client/internal/SubscriptionManager.java | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8787: Generated sources regen
github-actions[bot] opened a new pull request, #8787: URL: https://github.com/apache/camel/pull/8787 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 updated: Regen for commit 17ca68c2a58e9349518b5422431ffcd7a1c5dc37
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 98da53bac70 Regen for commit 17ca68c2a58e9349518b5422431ffcd7a1c5dc37 98da53bac70 is described below commit 98da53bac70161c7867841487095f0e1376a170c Author: davsclaus AuthorDate: Mon Nov 28 19:34:59 2022 + Regen for commit 17ca68c2a58e9349518b5422431ffcd7a1c5dc37 Signed-off-by: GitHub --- .../camel/component/milo/client/MiloClientProducer.java | 15 +++ .../src/main/java/org/apache/camel/CamelContext.java | 4 ++-- .../apache/camel/impl/engine/AbstractCamelContext.java| 1 + 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientProducer.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientProducer.java index 4ba12aa0997..6af12dfca3b 100644 --- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientProducer.java +++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientProducer.java @@ -92,14 +92,13 @@ public class MiloClientProducer extends DefaultAsyncProducer { if (TRUE.equals(await)) { future.whenComplete((result, throwable) -> { -if (throwable != null) { -msg.getExchange().setException(throwable); -} else { -msg.setBody(result); -} -async.done(false); -} -); +if (throwable != null) { +msg.getExchange().setException(throwable); +} else { +msg.setBody(result); +} +async.done(false); +}); return false; } else { async.done(true); diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java index afe716ee7dc..fda8bccb99a 100644 --- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java +++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java @@ -580,8 +580,8 @@ public interface CamelContext extends CamelContextLifecycle, RuntimeConfiguratio void addRoutes(RoutesBuilder builder) throws Exception; /** - * Adds the templated routes from the routes builder. - * For example in Java DSL you can use {@link org.apache.camel.builder.TemplatedRouteBuilder}. + * Adds the templated routes from the routes builder. For example in Java DSL you can use + * {@link org.apache.camel.builder.TemplatedRouteBuilder}. * * @param builder the builder which has templated routes * @throws Exception if the routes could not be created for whatever reason diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java index 520272ad239..ef709b935de 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java @@ -1210,6 +1210,7 @@ public abstract class AbstractCamelContext extends BaseService builder.addTemplatedRoutesToCamelContext(AbstractCamelContext.this); } } + @Override public void addRoutesConfigurations(RouteConfigurationsBuilder builder) throws Exception { try (LifecycleHelper helper = new LifecycleHelper()) {
[GitHub] [camel] oscerd merged pull request #8786: Generated sources regen
oscerd merged PR #8786: URL: https://github.com/apache/camel/pull/8786 -- 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 (bee23da4b6e -> fe312761620)
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 bee23da4b6e Sync deps add 623651fcfaa CAMEL-18764: camel-core - templatedRoute builder from Java cannot use… (#8782) add 17ca68c2a58 Milo-component: Letting the returned StatusCode from OPC UA producer through (#8646) add fe312761620 Regen for commit 17ca68c2a58e9349518b5422431ffcd7a1c5dc37 No new revisions were added by this update. Summary of changes: .../apache/camel/component/milo/client/MiloClientProducer.java | 9 - .../component/milo/client/internal/SubscriptionManager.java | 2 +- core/camel-api/src/main/java/org/apache/camel/CamelContext.java | 9 + core/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java | 8 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 9 + .../java/org/apache/camel/impl/lw/LightweightCamelContext.java | 5 + .../org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java | 5 + .../src/main/java/org/apache/camel/builder/RouteBuilder.java | 6 +- .../src/main/java/org/apache/camel/main/RoutesConfigurer.java| 5 + 9 files changed, 55 insertions(+), 3 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #8785: CAMEL-18766 Fixes bug in camel-support
github-actions[bot] commented on PR #8785: URL: https://github.com/apache/camel/pull/8785#issuecomment-1329645274 :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] github-actions[bot] opened a new pull request, #8786: Generated sources regen
github-actions[bot] opened a new pull request, #8786: URL: https://github.com/apache/camel/pull/8786 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] tobiasoort opened a new pull request, #3855: Added support for multi-arch building of Operator image
tobiasoort opened a new pull request, #3855: URL: https://github.com/apache/camel-k/pull/3855 Adds multi-arch support in the Camel-K Operator docker image. - Parameterized (defaults to amd64 + arm64) - Uses the `ubi-quarkus-mandrel-builder-image` base instead of the `ubi-quarkus-mandrel` one Fixes #1238 ; This should allow the Operator image to run natively on Apple Sillicon and other arm64 based processors. **Release Note** ```release-note Camel-K Operator Container Image is now available in multi-arch flavour; support for linux/amd64 and linux/arm64. ``` -- 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] thuri commented on a diff in pull request #8785: CAMEL-18766 Fixes bug in camel-support
thuri commented on code in PR #8785: URL: https://github.com/apache/camel/pull/8785#discussion_r1033946639 ## core/camel-support/src/main/java/org/apache/camel/support/task/BackgroundTask.java: ## @@ -167,12 +147,14 @@ private boolean waitForTaskCompletion(CountDownLatch latch, Future task) { } finally { elapsed = budget.elapsed(); } - -return completed; } @Override public Duration elapsed() { return elapsed; } + +private static class ExecutionResult { +private boolean completed; Review Comment: Fair point and also a good idea. From what I understand I'd say that `BackgroundTask` is stateful because of the `budget` and the `elapsed` fields. Especially the `next()` method probably has side effects on the state of the budget. -- 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 (c153849c075 -> bee23da4b6e)
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 c153849c075 Regen for commit 9dedb5afa34a7381ee5f1e3899eb6d357205211b add 781b39da66a Upgrade Reactor Netty to version 1.0.24 add bee23da4b6e Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] thuri commented on a diff in pull request #8785: CAMEL-18766 Fixes bug in camel-support
thuri commented on code in PR #8785: URL: https://github.com/apache/camel/pull/8785#discussion_r1033935822 ## core/camel-support/src/main/java/org/apache/camel/support/task/BackgroundTask.java: ## @@ -85,78 +85,58 @@ public BackgroundTask build() { this.name = name; } -private void runTaskWrapper(CountDownLatch latch, Predicate predicate, T payload) { +private void runTaskWrapper(CountDownLatch latch, BooleanSupplier supplier, ExecutionResult result) { LOG.trace("Current latch value: {}", latch.getCount()); - if (latch.getCount() == 0) { return; } if (!budget.next()) { LOG.warn("The task {} does not have more budget to continue running", name); - -return; -} - -if (predicate.test(payload)) { +result.completed = false; latch.countDown(); -LOG.trace("Task {} has succeeded and the current task won't be schedulable anymore: {}", name, latch.getCount()); -} -} - -private void runTaskWrapper(CountDownLatch latch, BooleanSupplier supplier) { -LOG.trace("Current latch value: {}", latch.getCount()); -if (latch.getCount() == 0) { -return; -} - -if (!budget.next()) { -LOG.warn("The task {} does not have more budget to continue running", name); - return; } if (supplier.getAsBoolean()) { +result.completed = true; latch.countDown(); LOG.trace("Task {} succeeded and the current task won't be schedulable anymore: {}", name, latch.getCount()); } } @Override public boolean run(Predicate predicate, T payload) { -CountDownLatch latch = new CountDownLatch(1); - -Future task = service.scheduleAtFixedRate(() -> runTaskWrapper(latch, predicate, payload), -budget.initialDelay(), budget.interval(), TimeUnit.MILLISECONDS); - -return waitForTaskCompletion(latch, task); +return this.run(() -> predicate.test(payload)); Review Comment: That's a good idea. Should I add this to the 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 opened a new issue, #3854: Cannot retrieve Camel K operator version when in global mode in different ns
claudio4j opened a new issue, #3854: URL: https://github.com/apache/camel-k/issues/3854 When Camel K Operator is installed in global mode, and if the kubectl current namespace is different than the ns the camel-k-operator is installed, then running `kamel version -a` results is misleading. ``` $ kamel version -a No IntegrationPlatform resource in default namespace Camel K Client Red Hat 1.10.2 Unable to retrieve operator version: integrationplatforms.camel.apache.org "camel-k" not found ``` kamel should be able to detect the camel-k-operator in the other ns to report correctly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (623651fcfaa -> 17ca68c2a58)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 623651fcfaa CAMEL-18764: camel-core - templatedRoute builder from Java cannot use… (#8782) add 17ca68c2a58 Milo-component: Letting the returned StatusCode from OPC UA producer through (#8646) No new revisions were added by this update. Summary of changes: .../apache/camel/component/milo/client/MiloClientProducer.java | 10 +- .../component/milo/client/internal/SubscriptionManager.java| 2 +- 2 files changed, 10 insertions(+), 2 deletions(-)
[GitHub] [camel] davsclaus merged pull request #8646: [CAMEL-18618] Milo component: Return status from write
davsclaus merged PR #8646: URL: https://github.com/apache/camel/pull/8646 -- 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 (bee23da4b6e -> 623651fcfaa)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from bee23da4b6e Sync deps add 623651fcfaa CAMEL-18764: camel-core - templatedRoute builder from Java cannot use… (#8782) No new revisions were added by this update. Summary of changes: core/camel-api/src/main/java/org/apache/camel/CamelContext.java | 9 + core/camel-api/src/main/java/org/apache/camel/RoutesBuilder.java | 8 .../java/org/apache/camel/impl/engine/AbstractCamelContext.java | 8 .../java/org/apache/camel/impl/lw/LightweightCamelContext.java | 5 + .../org/apache/camel/impl/lw/LightweightRuntimeCamelContext.java | 5 + .../src/main/java/org/apache/camel/builder/RouteBuilder.java | 6 +- .../src/main/java/org/apache/camel/main/RoutesConfigurer.java| 5 + 7 files changed, 45 insertions(+), 1 deletion(-)
[GitHub] [camel] davsclaus merged pull request #8782: CAMEL-18764: camel-core - templatedRoute builder from Java cannot use…
davsclaus merged PR #8782: URL: https://github.com/apache/camel/pull/8782 -- 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] lmolkova commented on pull request #8713: Prototype: make span current and clear scope
lmolkova commented on PR #8713: URL: https://github.com/apache/camel/pull/8713#issuecomment-1329574416 @davsclaus @oscerd thank you! Once you folks have time to take a look, please let me know what approach you'd like me to pursue nd I'm happy to work on it further. -- 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] thuri commented on a diff in pull request #8785: CAMEL-18766 Fixes bug in camel-support
thuri commented on code in PR #8785: URL: https://github.com/apache/camel/pull/8785#discussion_r1033919412 ## core/camel-support/src/main/java/org/apache/camel/support/task/BackgroundTask.java: ## @@ -85,78 +85,58 @@ public BackgroundTask build() { this.name = name; } -private void runTaskWrapper(CountDownLatch latch, Predicate predicate, T payload) { +private void runTaskWrapper(CountDownLatch latch, BooleanSupplier supplier, ExecutionResult result) { LOG.trace("Current latch value: {}", latch.getCount()); - if (latch.getCount() == 0) { return; } if (!budget.next()) { LOG.warn("The task {} does not have more budget to continue running", name); - -return; -} - -if (predicate.test(payload)) { +result.completed = false; Review Comment: It's not necessary but i think it's easier to comprehend when it's explicitly defined -- 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] essobedo commented on a diff in pull request #8785: CAMEL-18766 Fixes bug in camel-support
essobedo commented on code in PR #8785: URL: https://github.com/apache/camel/pull/8785#discussion_r1033918273 ## core/camel-support/src/main/java/org/apache/camel/support/task/BackgroundTask.java: ## @@ -85,78 +85,58 @@ public BackgroundTask build() { this.name = name; } -private void runTaskWrapper(CountDownLatch latch, Predicate predicate, T payload) { +private void runTaskWrapper(CountDownLatch latch, BooleanSupplier supplier, ExecutionResult result) { LOG.trace("Current latch value: {}", latch.getCount()); - if (latch.getCount() == 0) { return; } if (!budget.next()) { LOG.warn("The task {} does not have more budget to continue running", name); - -return; -} - -if (predicate.test(payload)) { +result.completed = false; latch.countDown(); -LOG.trace("Task {} has succeeded and the current task won't be schedulable anymore: {}", name, latch.getCount()); -} -} - -private void runTaskWrapper(CountDownLatch latch, BooleanSupplier supplier) { -LOG.trace("Current latch value: {}", latch.getCount()); -if (latch.getCount() == 0) { -return; -} - -if (!budget.next()) { -LOG.warn("The task {} does not have more budget to continue running", name); - return; } if (supplier.getAsBoolean()) { +result.completed = true; latch.countDown(); LOG.trace("Task {} succeeded and the current task won't be schedulable anymore: {}", name, latch.getCount()); } } @Override public boolean run(Predicate predicate, T payload) { -CountDownLatch latch = new CountDownLatch(1); - -Future task = service.scheduleAtFixedRate(() -> runTaskWrapper(latch, predicate, payload), -budget.initialDelay(), budget.interval(), TimeUnit.MILLISECONDS); - -return waitForTaskCompletion(latch, task); +return this.run(() -> predicate.test(payload)); Review Comment: @orpiske any opinion 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] essobedo commented on a diff in pull request #8785: CAMEL-18766 Fixes bug in camel-support
essobedo commented on code in PR #8785: URL: https://github.com/apache/camel/pull/8785#discussion_r1033912735 ## core/camel-support/src/main/java/org/apache/camel/support/task/BackgroundTask.java: ## @@ -167,12 +147,14 @@ private boolean waitForTaskCompletion(CountDownLatch latch, Future task) { } finally { elapsed = budget.elapsed(); } - -return completed; } @Override public Duration elapsed() { return elapsed; } + +private static class ExecutionResult { +private boolean completed; Review Comment: @orpiske This makes me wonder if `BackgroundTask` is stateful or stateless? I mean can we run several times the same background task? because if not, I guess that the `CountDownLatch` and this field could be moved directly as fields of `BackgroundTask` otherwise maybe we could add the `CountDownLatch` to that class and rename it to something like `ExecutionState` -- 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] essobedo commented on a diff in pull request #8785: CAMEL-18766 Fixes bug in camel-support
essobedo commented on code in PR #8785: URL: https://github.com/apache/camel/pull/8785#discussion_r1033903601 ## core/camel-support/src/main/java/org/apache/camel/support/task/BackgroundTask.java: ## @@ -85,78 +85,58 @@ public BackgroundTask build() { this.name = name; } -private void runTaskWrapper(CountDownLatch latch, Predicate predicate, T payload) { +private void runTaskWrapper(CountDownLatch latch, BooleanSupplier supplier, ExecutionResult result) { LOG.trace("Current latch value: {}", latch.getCount()); - if (latch.getCount() == 0) { return; } if (!budget.next()) { LOG.warn("The task {} does not have more budget to continue running", name); - -return; -} - -if (predicate.test(payload)) { +result.completed = false; latch.countDown(); -LOG.trace("Task {} has succeeded and the current task won't be schedulable anymore: {}", name, latch.getCount()); -} -} - -private void runTaskWrapper(CountDownLatch latch, BooleanSupplier supplier) { -LOG.trace("Current latch value: {}", latch.getCount()); -if (latch.getCount() == 0) { -return; -} - -if (!budget.next()) { -LOG.warn("The task {} does not have more budget to continue running", name); - return; } if (supplier.getAsBoolean()) { +result.completed = true; latch.countDown(); LOG.trace("Task {} succeeded and the current task won't be schedulable anymore: {}", name, latch.getCount()); } } @Override public boolean run(Predicate predicate, T payload) { -CountDownLatch latch = new CountDownLatch(1); - -Future task = service.scheduleAtFixedRate(() -> runTaskWrapper(latch, predicate, payload), -budget.initialDelay(), budget.interval(), TimeUnit.MILLISECONDS); - -return waitForTaskCompletion(latch, task); +return this.run(() -> predicate.test(payload)); Review Comment: I'm wondering if it could be moved into the interface `BlockingTask` as the default implementation? ## core/camel-support/src/test/java/org/apache/camel/support/task/BackgroundIterationTimeTaskTest.java: ## @@ -42,7 +42,8 @@ void testRunNoMoreSupplier() { .withMaxIterations(3) .withInterval(Duration.ofSeconds(1)) .withInitialDelay(Duration.ZERO) -.withMaxDuration(Duration.ofSeconds(5)) +// use unlimitedduration so we're sure that the task is really canceled after maxIterations Review Comment: ```suggestion // use unlimited duration so we're sure that the task is really canceled after maxIterations ``` ## core/camel-support/src/main/java/org/apache/camel/support/task/BackgroundTask.java: ## @@ -167,12 +147,14 @@ private boolean waitForTaskCompletion(CountDownLatch latch, Future task) { } finally { elapsed = budget.elapsed(); } - -return completed; } @Override public Duration elapsed() { return elapsed; } + +private static class ExecutionResult { +private boolean completed; Review Comment: @orpiske This makes me wonder if `BackgroundTask` is stateful or stateless. I mean can run several times the same task? because if not, I guess that the `CountDownLatch` and this field could be moved directly as fields of `BackgroundTask` otherwise maybe we could add the `CountDownLatch` to that class and rename it to something like `ExecutionState` ## core/camel-support/src/main/java/org/apache/camel/support/task/BackgroundTask.java: ## @@ -85,78 +85,58 @@ public BackgroundTask build() { this.name = name; } -private void runTaskWrapper(CountDownLatch latch, Predicate predicate, T payload) { +private void runTaskWrapper(CountDownLatch latch, BooleanSupplier supplier, ExecutionResult result) { LOG.trace("Current latch value: {}", latch.getCount()); - if (latch.getCount() == 0) { return; } if (!budget.next()) { LOG.warn("The task {} does not have more budget to continue running", name); - -return; -} - -if (predicate.test(payload)) { +result.completed = false; Review Comment: Is it really needed since `false` is the default value for a `boolean`? -- 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] 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 bee23da4b6e198c75bde1642bb5661c0cc9f0d99 Author: Andrea Cosentino AuthorDate: Mon Nov 28 18:59:55 2022 +0100 Sync deps Signed-off-by: Andrea Cosentino --- 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 f8b9bcc445d..72567a64eb9 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -472,7 +472,7 @@ 3.7.4 3.7.4 1.0.4 -1.0.2 +1.0.24 3.4.25 3.16.7 1.7.1
[camel] branch main updated (c153849c075 -> bee23da4b6e)
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 c153849c075 Regen for commit 9dedb5afa34a7381ee5f1e3899eb6d357205211b new 781b39da66a Upgrade Reactor Netty to version 1.0.24 new bee23da4b6e 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] 01/02: Upgrade Reactor Netty to version 1.0.24
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 781b39da66a0ce2ea8f8a634be2157f4fb3623d8 Author: Andrea Cosentino AuthorDate: Mon Nov 28 18:59:20 2022 +0100 Upgrade Reactor Netty to version 1.0.24 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b62a82aeb53..7e6c2e58644 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -459,7 +459,7 @@ 3.7.4 1.0.4 3.4.25 -1.0.2 +1.0.24 3.16.7 1.7.1 4.5.1
[GitHub] [camel-karavan] dependabot[bot] commented on pull request #527: Bump loader-utils from 2.0.2 to 2.0.4 in /karavan-vscode
dependabot[bot] commented on PR #527: URL: https://github.com/apache/camel-karavan/pull/527#issuecomment-1329487115 Looks like loader-utils is up-to-date now, so this is no longer needed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] dependabot[bot] closed pull request #526: Bump loader-utils from 1.4.1 to 1.4.2 in /karavan-designer
dependabot[bot] closed pull request #526: Bump loader-utils from 1.4.1 to 1.4.2 in /karavan-designer URL: https://github.com/apache/camel-karavan/pull/526 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] dependabot[bot] closed pull request #527: Bump loader-utils from 2.0.2 to 2.0.4 in /karavan-vscode
dependabot[bot] closed pull request #527: Bump loader-utils from 2.0.2 to 2.0.4 in /karavan-vscode URL: https://github.com/apache/camel-karavan/pull/527 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] dependabot[bot] commented on pull request #526: Bump loader-utils from 1.4.1 to 1.4.2 in /karavan-designer
dependabot[bot] commented on PR #526: URL: https://github.com/apache/camel-karavan/pull/526#issuecomment-1329487150 Looks like loader-utils is up-to-date now, so this is no longer needed. -- 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-karavan] branch dependabot/npm_and_yarn/karavan-core/minimatch-3.1.2 created (now dc76e5d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-core/minimatch-3.1.2 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git at dc76e5d Bump minimatch from 3.0.4 to 3.1.2 in /karavan-core No new revisions were added by this update.
[GitHub] [camel-karavan] dependabot[bot] opened a new pull request, #535: Bump minimatch from 3.0.4 to 3.1.2 in /karavan-core
dependabot[bot] opened a new pull request, #535: URL: https://github.com/apache/camel-karavan/pull/535 Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2. Commits https://github.com/isaacs/minimatch/commit/699c459443a6bd98f5b28197978f76e7f71467ac;>699c459 3.1.2 https://github.com/isaacs/minimatch/commit/2f2b5ff1bb1b6a01f4404f7e475f0a2cba578ab7;>2f2b5ff fix: trim pattern https://github.com/isaacs/minimatch/commit/25d7c0d09c47063c9b0d2ace17ef8e951d90eccc;>25d7c0d 3.1.1 https://github.com/isaacs/minimatch/commit/55dda291dfb595bd11b4edb19b45dd98eda76de0;>55dda29 fix: treat nocase:true as always having magic https://github.com/isaacs/minimatch/commit/5e1fb8dd2bb78c0ae22101b9229fac4c76ef039e;>5e1fb8d 3.1.0 https://github.com/isaacs/minimatch/commit/f8145c54f34075069f4a23cb214d871da4cd4006;>f8145c5 Add 'allowWindowsEscape' option https://github.com/isaacs/minimatch/commit/570e8b1aef6c9e823a824aa0b9be10db43857cd7;>570e8b1 add publishConfig for v3 publishes https://github.com/isaacs/minimatch/commit/5b7cd3372be253759fb4d865eb3f38f189a5fcdf;>5b7cd33 3.0.6 https://github.com/isaacs/minimatch/commit/20b4b562830680867feb75f9c635aca08e5c86ff;>20b4b56 [fix] revert all breaking syntax changes https://github.com/isaacs/minimatch/commit/2ff038852ec03e85e60e0eb333005c680ac8a543;>2ff0388 document, expose, and test 'partial:true' option Additional commits viewable in https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=minimatch=npm_and_yarn=3.0.4=3.1.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel-karavan/network/alerts). -- 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-karavan] branch main updated: Bump version
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 253b609 Bump version 253b609 is described below commit 253b6090f6937d5272ed71518a12f27125b2df65 Author: Marat Gubaidullin AuthorDate: Mon Nov 28 12:38:46 2022 -0500 Bump version --- karavan-designer/package-lock.json | 36 ++-- karavan-vscode/package-lock.json | 16 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/karavan-designer/package-lock.json b/karavan-designer/package-lock.json index 168f1e5..8779b9c 100644 --- a/karavan-designer/package-lock.json +++ b/karavan-designer/package-lock.json @@ -4506,9 +4506,9 @@ } }, "node_modules/babel-loader/node_modules/loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz;, + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -10739,9 +10739,9 @@ } }, "node_modules/loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz;, - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz;, + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -13183,9 +13183,9 @@ } }, "node_modules/react-dev-utils/node_modules/loader-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz;, - "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz;, + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", "engines": { "node": ">= 12.13.0" } @@ -19284,9 +19284,9 @@ } }, "loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz;, - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz;, + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -23837,9 +23837,9 @@ "integrity": "sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==" }, "loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz;, - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz;, + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -25481,9 +25481,9 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "loader-utils": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz;, - "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz;, + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==" }, "supports-color": { "version": "7.2.0", diff --git a/karavan-vscode/package-lock.json b/karavan-vscode/package-lock.json index
[camel-karavan] 05/10: Fix #532
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 8b49a8c216a9a12825f061e3a345c3c6c5d29e75 Author: Marat Gubaidullin AuthorDate: Wed Nov 23 16:00:26 2022 -0500 Fix #532 --- karavan-core/src/core/api/CamelDefinitionApiExt.ts | 22 ++- karavan-core/src/core/api/CamelDefinitionYaml.ts | 7 + karavan-core/src/core/api/CamelUtil.ts | 14 +- .../src/core/model/IntegrationDefinition.ts| 2 +- karavan-core/test/errorHandler.spec.ts | 35 + karavan-core/test/errorHandler1.yaml | 18 +++ karavan-designer/src/App.tsx | 6 +- .../src/{designer => }/DesignerPage.tsx| 57 +-- karavan-designer/src/designer/KaravanDesigner.tsx | 10 +- .../src/designer/error/ErrorDesigner.tsx | 74 -- .../src/designer/error/ErrorHandlerCard.tsx| 48 ++ .../src/designer/error/ErrorHandlerDesigner.tsx| 164 + karavan-designer/src/designer/karavan.css | 12 +- .../designer/route/property/DslPropertyField.tsx | 5 +- karavan-designer/src/designer/utils/CamelUi.tsx| 13 +- 15 files changed, 385 insertions(+), 102 deletions(-) diff --git a/karavan-core/src/core/api/CamelDefinitionApiExt.ts b/karavan-core/src/core/api/CamelDefinitionApiExt.ts index fcd867f..3317253 100644 --- a/karavan-core/src/core/api/CamelDefinitionApiExt.ts +++ b/karavan-core/src/core/api/CamelDefinitionApiExt.ts @@ -19,7 +19,7 @@ import {ComponentApi} from "./ComponentApi"; import {CamelUtil} from "./CamelUtil"; import { NamedBeanDefinition, -ExpressionDefinition, RouteDefinition, RestDefinition, RestConfigurationDefinition +ExpressionDefinition, RouteDefinition, RestDefinition, RestConfigurationDefinition, ErrorHandlerDefinition } from "../model/CamelDefinition"; import { Beans, @@ -253,6 +253,26 @@ export class CamelDefinitionApiExt { return integration; } +static addErrorHandlerToIntegration = (integration: Integration, errorHandler: ErrorHandlerDefinition): Integration => { +const flows: any[] = []; +if (integration.spec.flows?.filter(flow => flow.dslName === 'ErrorHandlerDefinition').length === 0) { +flows.push(...integration.spec.flows); +flows.push(errorHandler) +} else { +flows.push(...integration.spec.flows?.filter(flow => flow.dslName !== 'ErrorHandlerDefinition') || []); +flows.push(errorHandler) +} +integration.spec.flows = flows; +return integration; +} + +static deleteErrorHandlerFromIntegration = (integration: Integration): Integration => { +const flows: any[] = []; +flows.push(...integration.spec.flows?.filter(flow => flow.dslName !== 'ErrorHandlerDefinition') || []); +integration.spec.flows = flows; +return integration; +} + static addRestToIntegration = (integration: Integration, rest: RestDefinition): Integration => { const flows: any[] = []; integration.spec.flows?.push(rest) diff --git a/karavan-core/src/core/api/CamelDefinitionYaml.ts b/karavan-core/src/core/api/CamelDefinitionYaml.ts index 769dc39..2da9985 100644 --- a/karavan-core/src/core/api/CamelDefinitionYaml.ts +++ b/karavan-core/src/core/api/CamelDefinitionYaml.ts @@ -126,6 +126,11 @@ export class CamelDefinitionYaml { || stepName === 'doFinally' || stepName === 'resilience4jConfiguration' || stepName === 'faultToleranceConfiguration' +|| stepName === 'deadLetterChannel' +|| stepName === 'defaultErrorHandler' +|| stepName === 'jtaTransactionErrorHandler' +|| stepName === 'noErrorHandler' +|| stepName === 'springTransactionErrorHandler' || key === 'from') { delete newValue.inArray; delete newValue.inSteps; @@ -184,6 +189,8 @@ export class CamelDefinitionYaml { .forEach((f: any) => result.push(CamelDefinitionYamlStep.readRouteDefinition(new RouteDefinition({from: f.from}; flows.filter((e: any) => e.hasOwnProperty('beans')) .forEach((b: any) => result.push(CamelDefinitionYaml.readBeanDefinition(b))); +flows.filter((e: any) => e.hasOwnProperty('errorHandler')) +.forEach((e: any) => result.push(CamelDefinitionYamlStep.readErrorHandlerDefinition(e.errorHandler))); return result; } diff --git a/karavan-core/src/core/api/CamelUtil.ts b/karavan-core/src/core/api/CamelUtil.ts index 46a3217..762e83b 100644 --- a/karavan-core/src/core/api/CamelUtil.ts +++ b/karavan-core/src/core/api/CamelUtil.ts @@ -19,7 +19,7 @@ import { CamelElement, Beans } from "../model/IntegrationDefinition"; import {CamelDefinitionApi} from
[camel-karavan] 04/10: Move commit button to top
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 6c1cfcaa9f6e55dd27e183aa248f04bcba5e67ca Author: Marat Gubaidullin AuthorDate: Sat Nov 19 14:40:34 2022 -0500 Move commit button to top --- .../src/main/webui/src/projects/ProjectInfo.tsx| 34 +- .../src/main/webui/src/projects/ProjectPage.tsx| 1 + .../main/webui/src/projects/ProjectPageToolbar.tsx | 73 +- 3 files changed, 61 insertions(+), 47 deletions(-) diff --git a/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx b/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx index 91aa2a9..19ae678 100644 --- a/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx +++ b/karavan-app/src/main/webui/src/projects/ProjectInfo.tsx @@ -7,7 +7,7 @@ import { DescriptionListGroup, DescriptionListDescription, Card, -CardBody, Spinner, Tooltip, Flex, FlexItem, Divider, LabelGroup, Label, Modal, GridItem, Grid +CardBody, Spinner, Tooltip, Flex, FlexItem, Divider, LabelGroup, Label, Modal } from '@patternfly/react-core'; import '../designer/karavan.css'; import {KaravanApi} from "../api/KaravanApi"; @@ -98,20 +98,6 @@ export class ProjectInfo extends React.Component { } } -push = (after?: () => void) => { -this.setState({isPushing: true}); -KaravanApi.push(this.props.project, res => { -console.log(res) -if (res.status === 200 || res.status === 201) { -this.setState({isPushing: false}); -after?.call(this); -this.onRefresh(); -} else { -// Todo notification -} -}); -} - build = () => { this.setState({isBuilding: true}); KaravanApi.pipelineRun(this.props.project, this.state.environment, res => { @@ -137,18 +123,6 @@ export class ProjectInfo extends React.Component { }); } -pushButton = () => { -const isPushing = this.state.isPushing; -return ( - : } -onClick={e => this.push()}> -{isPushing ? "..." : "Commit"} - -) -} - buildButton = (env: string) => { const {isBuilding, isPushing, pipelineStatus} = this.state; const isRunning = pipelineStatus?.result === 'Running'; @@ -202,9 +176,6 @@ export class ProjectInfo extends React.Component { {project?.lastCommit ? project?.lastCommit?.substr(0, 7) : "-"} - -{this.pushButton()} - ) } @@ -323,8 +294,7 @@ export class ProjectInfo extends React.Component { Context Consumers Routes -{registryStatus !== 'UNDEFINED' && -Registry} +Registry ) } diff --git a/karavan-app/src/main/webui/src/projects/ProjectPage.tsx b/karavan-app/src/main/webui/src/projects/ProjectPage.tsx index 01cdbe0..faf8d5c 100644 --- a/karavan-app/src/main/webui/src/projects/ProjectPage.tsx +++ b/karavan-app/src/main/webui/src/projects/ProjectPage.tsx @@ -176,6 +176,7 @@ export class ProjectPage extends React.Component { setMode={mode => this.setState({mode: mode})} setCreateModalOpen={() => this.setState({isCreateModalOpen: true})} setUploadModalOpen={() => this.setState({isUploadModalOpen: true})} +onRefresh={() => this.onRefresh()} /> } diff --git a/karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx b/karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx index 93e2ec2..19550c4 100644 --- a/karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx +++ b/karavan-app/src/main/webui/src/projects/ProjectPageToolbar.tsx @@ -11,13 +11,14 @@ import { Checkbox, Tooltip, ToolbarItem } from '@patternfly/react-core'; import '../designer/karavan.css'; -import {Project, ProjectFile} from "./ProjectModels"; +import {CamelStatus, DeploymentStatus, PipelineStatus, PodStatus, Project, ProjectFile} from "./ProjectModels"; import UploadIcon from "@patternfly/react-icons/dist/esm/icons/upload-icon"; import DownloadIcon from "@patternfly/react-icons/dist/esm/icons/download-icon"; import DownloadImageIcon from "@patternfly/react-icons/dist/esm/icons/image-icon"; import PlusIcon from "@patternfly/react-icons/dist/esm/icons/plus-icon"; import {CamelDefinitionYaml} from "karavan-core/lib/api/CamelDefinitionYaml"; import PushIcon from "@patternfly/react-icons/dist/esm/icons/code-branch-icon"; +import {KaravanApi} from "../api/KaravanApi"; interface Props { project: Project, @@ -31,14 +32,38 @@ interface Props { downloadImage: () => void, setCreateModalOpen: () => void,
[camel-karavan] 03/10: ProjectFiles last update timestamp
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit c6342026df17638da3f9a26b0237f775f29ddf09 Author: Marat Gubaidullin AuthorDate: Sat Nov 19 14:15:07 2022 -0500 ProjectFiles last update timestamp --- .../apache/camel/karavan/api/ProjectFileResource.java | 3 ++- .../org/apache/camel/karavan/model/ProjectFile.java | 15 ++- .../org/apache/camel/karavan/service/ImportService.java | 7 --- .../apache/camel/karavan/service/InfinispanService.java | 11 +-- .../src/main/webui/src/projects/CreateFileModal.tsx | 2 +- .../src/main/webui/src/projects/ProjectFilesTable.tsx | 17 +++-- karavan-app/src/main/webui/src/projects/ProjectInfo.tsx | 5 +++-- .../src/main/webui/src/projects/ProjectModels.ts| 4 +++- karavan-app/src/main/webui/src/projects/ProjectPage.tsx | 6 +++--- karavan-app/src/main/webui/src/projects/UploadModal.tsx | 2 +- 10 files changed, 55 insertions(+), 17 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java index b1b48ed..5069200 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java @@ -32,6 +32,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; +import java.time.Instant; import java.util.List; @Path("/api/file") @@ -82,7 +83,7 @@ public class ProjectFileResource { infinispanService.saveProjectFile(file); if (generateRest) { String yaml = codeService.generate(file.getName(), file.getCode(), generateRoutes); -ProjectFile integration = new ProjectFile(integrationName, yaml, file.getProjectId()); +ProjectFile integration = new ProjectFile(integrationName, yaml, file.getProjectId(), Instant.now().toEpochMilli()); infinispanService.saveProjectFile(integration); return file; } diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java b/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java index 30bb0fe..6732b91 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java @@ -4,6 +4,8 @@ import org.infinispan.protostream.annotations.ProtoDoc; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; +import java.time.Instant; + public class ProjectFile { public static final String CACHE = "project_files"; @ProtoField(number = 1) @@ -13,12 +15,15 @@ public class ProjectFile { @ProtoField(number = 3) @ProtoDoc("@Field(index=Index.YES, analyze = Analyze.YES, store = Store.NO)") String projectId; +@ProtoField(number = 4) +Long lastUpdate; @ProtoFactory -public ProjectFile(String name, String code, String projectId) { +public ProjectFile(String name, String code, String projectId, Long lastUpdate) { this.name = name; this.code = code; this.projectId = projectId; +this.lastUpdate = lastUpdate; } public ProjectFile() { @@ -47,4 +52,12 @@ public class ProjectFile { public void setProjectId(String projectId) { this.projectId = projectId; } + +public Long getLastUpdate() { +return lastUpdate; +} + +public void setLastUpdate(Long lastUpdate) { +this.lastUpdate = lastUpdate; +} } diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/ImportService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/ImportService.java index 05cbe5d..e59d423 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/service/ImportService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/ImportService.java @@ -25,6 +25,7 @@ import org.jboss.logging.Logger; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import java.time.Instant; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -67,7 +68,7 @@ public class ImportService { infinispanService.saveProject(project, true); p.getItem2().forEach((key, value) -> { -ProjectFile file = new ProjectFile(key, value, folderName); +ProjectFile file = new ProjectFile(key, value, folderName, Instant.now().toEpochMilli()); infinispanService.saveProjectFile(file); }); }); @@ -87,7 +88,7 @@ public class ImportService {
[camel-karavan] 09/10: Code templates in application
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 39c7e89e9694538b841a866c35d421da0c59712c Author: Marat Gubaidullin AuthorDate: Mon Nov 28 11:09:03 2022 -0500 Code templates in application --- .../camel/karavan/api/ProjectFileResource.java | 6 +- .../apache/camel/karavan/model/ProjectFile.java| 10 ++ .../apache/camel/karavan/service/CodeService.java | 17 ++- ...arkus-org.apache.camel.AggregationStrategy.java | 23 +++ .../quarkus-org.apache.camel.Processor.java| 14 ++ ...-boot-org.apache.camel.AggregationStrategy.java | 20 +++ .../spring-boot-org.apache.camel.Processor.java| 12 ++ .../main/webui/src/designer/KaravanDesigner.tsx| 56 --- .../webui/src/designer/error/ErrorHandlerCard.tsx | 48 ++ .../src/designer/error/ErrorHandlerDesigner.tsx| 164 + .../src/main/webui/src/designer/karavan.css| 12 +- .../webui/src/designer/route/RouteDesigner.tsx | 1 + .../designer/route/property/DslPropertyField.tsx | 104 - .../src/designer/route/property/ModalEditor.tsx| 98 .../src/main/webui/src/designer/utils/CamelUi.tsx | 42 +- .../src/main/webui/src/projects/ProjectPage.tsx| 24 ++- .../main/webui/src/projects/ProjectPageToolbar.tsx | 2 +- .../designer/route/property/DslPropertyField.tsx | 22 +-- 18 files changed, 589 insertions(+), 86 deletions(-) diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java b/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java index 5069200..747e34d 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/api/ProjectFileResource.java @@ -33,7 +33,9 @@ import javax.ws.rs.core.MediaType; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.time.Instant; +import java.util.Comparator; import java.util.List; +import java.util.stream.Collectors; @Path("/api/file") public class ProjectFileResource { @@ -49,7 +51,9 @@ public class ProjectFileResource { @Path("/{projectId}") public List get(@HeaderParam("username") String username, @PathParam("projectId") String projectId) throws Exception { -return infinispanService.getProjectFiles(projectId); +return infinispanService.getProjectFiles(projectId).stream() +.sorted(Comparator.comparing(ProjectFile::getName)) +.collect(Collectors.toList()); } @POST diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java b/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java index 6732b91..ad1d6c6 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/model/ProjectFile.java @@ -60,4 +60,14 @@ public class ProjectFile { public void setLastUpdate(Long lastUpdate) { this.lastUpdate = lastUpdate; } + +@Override +public String toString() { +return "ProjectFile{" + +"name='" + name + '\'' + +", code='" + code + '\'' + +", projectId='" + projectId + '\'' + +", lastUpdate=" + lastUpdate + +'}'; +} } diff --git a/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java b/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java index ee7c57c..4fb5e67 100644 --- a/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java +++ b/karavan-app/src/main/java/org/apache/camel/karavan/service/CodeService.java @@ -38,6 +38,7 @@ import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.InputStream; import java.io.InputStreamReader; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -83,10 +84,18 @@ public class CodeService { } public Map getApplicationPropertiesTemplates() { -Map result = new HashMap<>(4); -List.of("quarkus", "spring-boot").forEach(runtime -> { -List.of("openshift", "kubernetes").forEach(target -> { -String templateName = runtime + "-" + target + "-application.properties"; +Map result = new HashMap<>(); + +List runtimes = List.of("quarkus", "spring-boot"); +List targets = List.of("openshift", "kubernetes"); +List interfaces = List.of("org.apache.camel.AggregationStrategy.java", "org.apache.camel.Processor.java"); + +List files = new ArrayList<>(interfaces); +files.addAll(targets.stream().map(target -> target + "-application.properties").collect(Collectors.toList())); + +
[camel-karavan] 06/10: Add some missing DSL elements
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 7c57bb7b468aaac30a588d2951cfb5eb5190abb4 Author: Marat Gubaidullin AuthorDate: Thu Nov 24 13:18:44 2022 -0500 Add some missing DSL elements --- .../designer/route/property/DslPropertyField.tsx | 1 + karavan-designer/src/designer/utils/CamelUi.tsx| 33 +++--- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/karavan-designer/src/designer/route/property/DslPropertyField.tsx b/karavan-designer/src/designer/route/property/DslPropertyField.tsx index 067545f..69e976b 100644 --- a/karavan-designer/src/designer/route/property/DslPropertyField.tsx +++ b/karavan-designer/src/designer/route/property/DslPropertyField.tsx @@ -263,6 +263,7 @@ export class DslPropertyField extends React.Component { diff --git a/karavan-designer/src/designer/utils/CamelUi.tsx b/karavan-designer/src/designer/utils/CamelUi.tsx index 766a166..51f8517 100644 --- a/karavan-designer/src/designer/utils/CamelUi.tsx +++ b/karavan-designer/src/designer/utils/CamelUi.tsx @@ -23,7 +23,7 @@ import {CamelUtil} from "karavan-core/lib/api/CamelUtil"; import {CamelDefinitionApiExt} from "karavan-core/lib/api/CamelDefinitionApiExt"; import {ErrorHandlerDefinition, NamedBeanDefinition, RouteDefinition, SagaDefinition, ToDefinition} from "karavan-core/lib/model/CamelDefinition"; import {CamelElement, Integration} from "karavan-core/lib/model/IntegrationDefinition"; -import {AggregateIcon, ChoiceIcon, FilterIcon, SagaIcon, SortIcon, SplitIcon, TransformIcon} from "./KaravanIcons"; +import {AggregateIcon, ChoiceIcon, FilterIcon, SagaIcon, SortIcon, SplitIcon} from "./KaravanIcons"; import React from "react"; const StepElements: string[] = [ @@ -35,26 +35,34 @@ const StepElements: string[] = [ "ConvertBodyDefinition", "DynamicRouterDefinition", "EnrichDefinition", -"ErrorHandlerDefinition", +// "ErrorHandlerDefinition", "FilterDefinition", +"IdempotentConsumerDefinition", "LogDefinition", "LoopDefinition", "MarshalDefinition", "MulticastDefinition", +"PausableDefinition", "PollEnrichDefinition", "ProcessDefinition", "RecipientListDefinition", "RemoveHeaderDefinition", "RemoveHeadersDefinition", +"RemovePropertiesDefinition", "RemovePropertyDefinition", +"ResumableDefinition", "ResequenceDefinition", +"RoutingSlipDefinition", +"SamplingDefinition", "SagaDefinition", "SetBodyDefinition", "SetHeaderDefinition", "SetPropertyDefinition", "SortDefinition", +"ScriptDefinition", "SplitDefinition", "StepDefinition", +"StopDefinition", "ThreadsDefinition", "ThrottleDefinition", "ThrowExceptionDefinition", @@ -379,6 +387,8 @@ export class CamelUi { return "data:image/svg+xml,%3Csvg width='32' height='32' xmlns='http://www.w3.org/2000/svg' xmlns:svg='http://www.w3.org/2000/svg'%3E%3Cdefs%3E%3Cstyle%3E.cls-1 %7B fill: none; %7D%3C/style%3E%3C/defs%3E%3Cg class='layer'%3E%3Ctitle%3ELayer 1%3C/title%3E%3Cpath d='m24,30l-20,0a2.0021,2.0021 0 0 1 -2,-2l0,-6a2.0021,2.0021 0 0 1 2,-2l20,0a2.0021,2.0021 0 0 1 2,2l0,6a2.0021,2.0021 0 0 1 -2,2zm-20,-8l-0.0015,0l0.0015,6l20,0l0,-6l-20,0z' id='svg_1'/%3E%3Cpolygon id='svg_2' poi [...] case "RemoveHeadersDefinition": return "data:image/svg+xml,%3Csvg width='32' height='32' xmlns='http://www.w3.org/2000/svg' xmlns:svg='http://www.w3.org/2000/svg'%3E%3Cdefs%3E%3Cstyle%3E.cls-1 %7B fill: none; %7D%3C/style%3E%3C/defs%3E%3Cg class='layer'%3E%3Ctitle%3ELayer 1%3C/title%3E%3Cpolygon id='svg_2' points='32.12467002868652,6.015733242034912 32.12467002868652,4.021692276000977 27.047643661499023,4.021692276000977 27.047643661499023,-1.0553351640701294 25.05360221862793,-1.0553350448608398 25.053 [...] +case "RemovePropertiesDefinition": +return "data:image/svg+xml,%3Csvg width='32' height='32' xmlns='http://www.w3.org/2000/svg' xmlns:svg='http://www.w3.org/2000/svg'%3E%3Cdefs%3E%3Cstyle%3E.cls-1 %7B fill: none; %7D%3C/style%3E%3C/defs%3E%3Cg class='layer'%3E%3Ctitle%3ELayer 1%3C/title%3E%3Cpolygon id='svg_2' points='32.12467002868652,6.015733242034912 32.12467002868652,4.021692276000977 27.047643661499023,4.021692276000977 27.047643661499023,-1.0553351640701294 25.05360221862793,-1.0553350448608398 25.053 [...] case "SetHeaderDefinition": return "data:image/svg+xml,%3Csvg width='32' height='32' xmlns='http://www.w3.org/2000/svg' xmlns:svg='http://www.w3.org/2000/svg'%3E%3Cdefs%3E%3Cstyle%3E.cls-1 %7B fill: none; %7D%3C/style%3E%3C/defs%3E%3Cg class='layer'%3E%3Ctitle%3ELayer 1%3C/title%3E%3Cpath d='m24,30l-20,0a2.0021,2.0021 0 0 1
[camel-karavan] 08/10: Projects buttons design
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 54d21d6ca2e6b0673aba693473dfc4295a3e8499 Author: Marat Gubaidullin AuthorDate: Mon Nov 28 09:46:47 2022 -0500 Projects buttons design --- .../src/main/webui/src/designer/DesignerPage.tsx | 113 - karavan-app/src/main/webui/src/index.css | 12 +++ .../main/webui/src/projects/ProjectsTableRow.tsx | 50 + 3 files changed, 44 insertions(+), 131 deletions(-) diff --git a/karavan-app/src/main/webui/src/designer/DesignerPage.tsx b/karavan-app/src/main/webui/src/designer/DesignerPage.tsx deleted file mode 100644 index baee350..000 --- a/karavan-app/src/main/webui/src/designer/DesignerPage.tsx +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import React from 'react'; -import { -Toolbar, -ToolbarContent, -ToolbarItem, -PageSection, TextContent, Text, PageSectionVariants, Flex, FlexItem, Badge, Button, Tooltip -} from '@patternfly/react-core'; -import '../designer/karavan.css'; -import DownloadIcon from "@patternfly/react-icons/dist/esm/icons/download-icon"; -import DownloadImageIcon from "@patternfly/react-icons/dist/esm/icons/image-icon"; -import {KaravanDesigner} from "./KaravanDesigner"; - -interface Props { -name: string, -yaml: string, -dark: boolean, -onSave: (filename: string, yaml: string, propertyOnly: boolean) => void -} - -interface State { -karavanDesignerRef: any, -} - -export class DesignerPage extends React.Component { - -public state: State = { - -karavanDesignerRef: React.createRef(), -}; - -componentDidMount() { -} - -save(filename: string, yaml: string, propertyOnly: boolean) { -this.props.onSave?.call(this, filename, yaml, propertyOnly); -} - -download = () => { -const {name, yaml} = this.props; -if (name && yaml) { -const a = document.createElement('a'); -a.setAttribute('download', 'example.yaml'); -a.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(yaml)); -a.click(); -} -} - -downloadImage = () => { -if (this.state.karavanDesignerRef) { -this.state.karavanDesignerRef.current.downloadImage(); -} -} - -render() { -const {name, yaml} = this.props; -return ( - - - - - -Designer - - - - - - - -} onClick={e => this.download()}> -YAML - - - - - -} onClick={e => this.downloadImage()}> -Image - - - - - - - - - this.save(filename, yaml, propertyOnly)}/> - -); -} -}; \ No newline at end of file diff --git a/karavan-app/src/main/webui/src/index.css b/karavan-app/src/main/webui/src/index.css index c9a66fb..872cc41 100644 --- a/karavan-app/src/main/webui/src/index.css +++ b/karavan-app/src/main/webui/src/index.css @@ -287,4 +287,16 @@ .new-project .runtime-label { font-size: 14px; margin-left: 6px; +} + +.projects-page .project-action-buttons { + opacity: 0.5; +} + +.projects-page tr:hover .project-action-buttons { + opacity: 1; +} + +.projects-page
[camel-karavan] branch main updated (7a682ec -> 7f1fb73)
This is an automated email from the ASF dual-hosted git repository. marat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git from 7a682ec Update OPENSHIFT_DEMO.md new 45df9b7 Project type filter for projects types new 210fb66 Fix issue with table rows new c634202 ProjectFiles last update timestamp new 6c1cfca Move commit button to top new 8b49a8c Fix #532 new 7c57bb7 Add some missing DSL elements new 73abb44 Support Code snippets #514 new 54d21d6 Projects buttons design new 39c7e89 Code templates in application new 7f1fb73 Code templates in cloud app The 10 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/karavan/api/ProjectFileResource.java |9 +- .../apache/camel/karavan/model/ProjectFile.java| 25 +- .../apache/camel/karavan/service/CodeService.java | 17 +- .../camel/karavan/service/ImportService.java |7 +- .../camel/karavan/service/InfinispanService.java | 11 +- ...arkus-org.apache.camel.AggregationStrategy.java | 16 +- .../quarkus-org.apache.camel.Processor.java| 14 + ...-boot-org.apache.camel.AggregationStrategy.java | 13 +- .../spring-boot-org.apache.camel.Processor.java| 12 + karavan-app/src/main/webui/src/api/KaravanApi.tsx |2 +- .../main/webui/src/designer/KaravanDesigner.tsx| 56 +- .../webui/src/designer/error/ErrorHandlerCard.tsx | 48 + .../src/designer/error/ErrorHandlerDesigner.tsx| 94 +- .../src/main/webui/src/designer/karavan.css| 12 +- .../webui/src/designer/route/RouteDesigner.tsx |1 + .../designer/route/property/DslPropertyField.tsx | 104 +- .../src/designer/route/property/ModalEditor.tsx| 98 + .../src/main/webui/src/designer/utils/CamelUi.tsx | 42 +- karavan-app/src/main/webui/src/index.css | 12 + .../main/webui/src/projects/CreateFileModal.tsx|9 +- .../main/webui/src/projects/ProjectFilesTable.tsx | 17 +- .../src/main/webui/src/projects/ProjectInfo.tsx| 35 +- .../src/main/webui/src/projects/ProjectModels.ts |4 +- .../src/main/webui/src/projects/ProjectPage.tsx| 51 +- .../main/webui/src/projects/ProjectPageToolbar.tsx | 75 +- .../src/main/webui/src/projects/ProjectsPage.tsx |3 +- .../main/webui/src/projects/ProjectsTableRow.tsx | 50 +- .../src/main/webui/src/projects/UploadModal.tsx|2 +- karavan-core/src/core/api/CamelDefinitionApiExt.ts | 22 +- karavan-core/src/core/api/CamelDefinitionYaml.ts |7 + karavan-core/src/core/api/CamelUtil.ts | 14 +- .../core/api/TemplateApi.ts} | 30 +- karavan-core/src/core/model/CamelMetadata.ts | 3008 ++-- .../src/core/model/IntegrationDefinition.ts|2 +- .../{multiple.spec.ts => errorHandler.spec.ts} | 21 +- karavan-core/test/errorHandler1.yaml | 18 + .../snippets/org.apache.camel.AggregationStrategy | 15 +- .../public/snippets/org.apache.camel.Processor | 14 + karavan-designer/src/App.tsx | 14 +- .../src}/DesignerPage.tsx | 64 +- karavan-designer/src/designer/DesignerPage.tsx | 113 - karavan-designer/src/designer/KaravanDesigner.tsx | 56 +- .../src/designer/error/ErrorDesigner.tsx | 74 - .../src/designer/error/ErrorHandlerCard.tsx| 48 + .../src/designer/error/ErrorHandlerDesigner.tsx| 94 +- karavan-designer/src/designer/karavan.css | 12 +- .../src/designer/route/RouteDesigner.tsx |1 + .../designer/route/property/DslPropertyField.tsx | 104 +- .../src/designer/route/property/ModalEditor.tsx| 98 + karavan-designer/src/designer/utils/CamelUi.tsx| 42 +- .../karavan/generator/CamelMetadataGenerator.java | 37 +- .../src/main/resources/CamelMetadata.header.ts |6 +- 52 files changed, 2678 insertions(+), 2075 deletions(-) copy karavan-demo/aggregator/Aggregator.java => karavan-app/src/main/resources/snippets/quarkus-org.apache.camel.AggregationStrategy.java (60%) create mode 100644 karavan-app/src/main/resources/snippets/quarkus-org.apache.camel.Processor.java copy karavan-demo/aggregator/Aggregator.java => karavan-app/src/main/resources/snippets/spring-boot-org.apache.camel.AggregationStrategy.java (67%) create mode 100644 karavan-app/src/main/resources/snippets/spring-boot-org.apache.camel.Processor.java create mode 100644 karavan-app/src/main/webui/src/designer/error/ErrorHandlerCard.tsx copy karavan-space/src/designer/beans/BeansDesigner.tsx => karavan-app/src/main/webui/src/designer/error/ErrorHandlerDesigner.tsx (63%) create mode 100644
[GitHub] [camel-karavan] mgubaidullin closed issue #532: User should be able to add and configure Global and Route scope error handlers
mgubaidullin closed issue #532: User should be able to add and configure Global and Route scope error handlers URL: https://github.com/apache/camel-karavan/issues/532 -- 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-karavan] 10/10: Code templates in cloud app
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 7f1fb7328da41c1a4805d67efd95215a124ac889 Author: Marat Gubaidullin AuthorDate: Mon Nov 28 12:35:17 2022 -0500 Code templates in cloud app --- karavan-app/src/main/webui/src/api/KaravanApi.tsx | 2 +- .../main/webui/src/designer/KaravanDesigner.tsx| 2 +- .../designer/route/property/DslPropertyField.tsx | 28 +++--- .../src/main/webui/src/projects/ProjectPage.tsx| 15 ++-- .../src/main/webui/src/projects/ProjectsPage.tsx | 2 +- karavan-designer/src/designer/KaravanDesigner.tsx | 2 +- .../designer/route/property/DslPropertyField.tsx | 6 ++--- 7 files changed, 34 insertions(+), 23 deletions(-) diff --git a/karavan-app/src/main/webui/src/api/KaravanApi.tsx b/karavan-app/src/main/webui/src/api/KaravanApi.tsx index 78feec2..230fd6b 100644 --- a/karavan-app/src/main/webui/src/api/KaravanApi.tsx +++ b/karavan-app/src/main/webui/src/api/KaravanApi.tsx @@ -278,7 +278,7 @@ export class KaravanApi { } static async getTemplatesFiles( after: (files: []) => void) { -instance.get('/api/template/files') +instance.get('/api/file/templates') .then(res => { if (res.status === 200) { after(res.data); diff --git a/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx b/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx index 4b43ff4..b215192 100644 --- a/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx +++ b/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx @@ -33,7 +33,7 @@ import {getDesignerIcon} from "./utils/KaravanIcons"; interface Props { onSave: (filename: string, yaml: string, propertyOnly: boolean) => void onSaveCustomCode: (name: string, code: string) => void -onGetCustomCode: (name: string) => Promise +onGetCustomCode: (name: string, javaType: string) => Promise filename: string yaml: string dark: boolean diff --git a/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx b/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx index 369f4ee..c958bb6 100644 --- a/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx +++ b/karavan-app/src/main/webui/src/designer/route/property/DslPropertyField.tsx @@ -245,9 +245,9 @@ export class DslPropertyField extends React.Component { ) } -showCode = (name: string) => { +showCode = (name: string, javaType: string) => { const {property} = this.props; -KaravanInstance.getProps().onGetCustomCode.call(this, name).then(value => { +KaravanInstance.getProps().onGetCustomCode.call(this, name, property.javaType).then(value => { if (value === undefined) { const code = TemplateApi.generateCode(property.javaType, name); this.setState({customCode: code, showEditor: true}) @@ -269,21 +269,21 @@ export class DslPropertyField extends React.Component { value={value?.toString()} onChange={e => this.propertyChanged(property.name, CamelUtil.capitalizeName(e?.replace(/\s/g, '')))}/> - this.showCode(value)}> + this.showCode(value, property.javaType)}> - { - this.propertyChanged(fieldId, value); - KaravanInstance.getProps().onSaveCustomCode?.call(this, value, value1); - this.setState({showEditor: false}); - }}/> + { + this.propertyChanged(fieldId, value); + KaravanInstance.getProps().onSaveCustomCode?.call(this, value, value1); + this.setState({showEditor: false}); + }}/> ) } diff --git a/karavan-app/src/main/webui/src/projects/ProjectPage.tsx b/karavan-app/src/main/webui/src/projects/ProjectPage.tsx index f998586..3713c35 100644 --- a/karavan-app/src/main/webui/src/projects/ProjectPage.tsx +++ b/karavan-app/src/main/webui/src/projects/ProjectPage.tsx @@ -32,6 +32,7 @@ import {ProjectOperations} from "./ProjectOperations"; import {CamelDefinitionYaml} from "karavan-core/lib/api/CamelDefinitionYaml"; import {ProjectPageToolbar} from "./ProjectPageToolbar"; import {ProjectFilesTable} from "./ProjectFilesTable"; +import {TemplateApi} from "karavan-core/lib/api/TemplateApi"; interface Props { project: Project, @@ -80,11 +81,20 @@ export class ProjectPage extends React.Component { onRefresh = () => { if (this.props.project) { KaravanApi.getProject(this.props.project.projectId, (project: Project) => { -
[camel-karavan] 01/10: Project type filter for projects types
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 45df9b7e1d9c88fac1167efa71aab4a98f70c922 Author: Marat Gubaidullin AuthorDate: Sat Nov 19 12:31:49 2022 -0500 Project type filter for projects types --- .../src/main/webui/src/projects/CreateFileModal.tsx | 7 +-- karavan-app/src/main/webui/src/projects/ProjectPage.tsx | 15 ++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/karavan-app/src/main/webui/src/projects/CreateFileModal.tsx b/karavan-app/src/main/webui/src/projects/CreateFileModal.tsx index e2143f3..47d7cda 100644 --- a/karavan-app/src/main/webui/src/projects/CreateFileModal.tsx +++ b/karavan-app/src/main/webui/src/projects/CreateFileModal.tsx @@ -17,7 +17,8 @@ import {CamelDefinitionYaml} from "karavan-core/lib/api/CamelDefinitionYaml"; interface Props { isOpen: boolean, project: Project, -onClose: any +onClose: any, +types: string[] } interface State { @@ -59,6 +60,7 @@ export class CreateFileModal extends React.Component { render() { const {fileType} = this.state; +const {types} = this.props; const extension = ProjectFileTypes.filter(value => value.name === fileType)[0].extension; const filename = (extension !== 'java') ? CamelUi.nameFromTitle(this.state.name) @@ -77,7 +79,8 @@ export class CreateFileModal extends React.Component { -{ProjectFileTypes.filter(p => !['PROPERTIES', 'LOG'].includes(p.name)).map(p => { +{ProjectFileTypes.filter(p => types.includes(p.name)) +.map(p => { const title = p.title + ' (' + p.extension + ')'; return { return ['kamelets', 'templates'].includes(this.props.project.projectId); } +isKameletsProject():boolean { +return this.props.project.projectId === 'kamelets'; +} + +isTemplatesProject():boolean { +return this.props.project.projectId === 'templates'; +} + post = (file: ProjectFile) => { KaravanApi.postProjectFile(file, res => { if (res.status === 200) { @@ -402,6 +410,9 @@ export class ProjectPage extends React.Component { render() { const {file, isDeleteModalOpen, fileToDelete, isUploadModalOpen, isCreateModalOpen} = this.state; const {project} = this.props; +const types = this.isBuildIn() +? (this.isKameletsProject() ? ['KAMELET'] : ['JAVA']) +: ProjectFileTypes.filter(p => !['PROPERTIES', 'LOG', 'KAMELET'].includes(p.name)).map(p => p.name); return ( @@ -410,7 +421,9 @@ export class ProjectPage extends React.Component { {file === undefined && this.getProjectPanel()} {file !== undefined && this.getFilePanel()} -
[camel-karavan] 02/10: Fix issue with table rows
This is an automated email from the ASF dual-hosted git repository. marat pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git commit 210fb66467b729fa251baec35fade453e08f7ebc Author: Marat Gubaidullin AuthorDate: Sat Nov 19 12:42:09 2022 -0500 Fix issue with table rows --- karavan-app/src/main/webui/src/projects/ProjectsPage.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx b/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx index 63f056a..8b052e8 100644 --- a/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx +++ b/karavan-app/src/main/webui/src/projects/ProjectsPage.tsx @@ -275,6 +275,7 @@ export class ProjectsPage extends React.Component { {projs.map(project => (
[camel-kamelets] branch regen_bot updated (9a427552 -> c47e751d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 9a427552 Azure Storage Blob Sink/Source Kamelets it-tests: Don't log useless information add c94c0b1c Updated CHANGELOG.md add c53d24b9 Added repeatCount parameter to timer source Kamelet add c47e751d Added repeatCount parameter to timer source Kamelet No new revisions were added by this update. Summary of changes: CHANGELOG.md | 3 +++ kamelets/timer-source.kamelet.yaml | 5 + .../src/main/resources/kamelets/timer-source.kamelet.yaml| 5 + 3 files changed, 13 insertions(+)
[camel-kamelets] branch main updated (c94c0b1c -> c47e751d)
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-kamelets.git from c94c0b1c Updated CHANGELOG.md new c53d24b9 Added repeatCount parameter to timer source Kamelet new c47e751d Added repeatCount parameter to timer source Kamelet 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: kamelets/timer-source.kamelet.yaml | 5 + .../src/main/resources/kamelets/timer-source.kamelet.yaml| 5 + 2 files changed, 10 insertions(+)
[camel-kamelets] 01/02: Added repeatCount parameter to timer source Kamelet
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit c53d24b919f8cdef60e8a19c07b1295f5c95be5e Author: Andrea Cosentino AuthorDate: Mon Nov 28 14:43:05 2022 +0100 Added repeatCount parameter to timer source Kamelet Signed-off-by: Andrea Cosentino --- kamelets/timer-source.kamelet.yaml | 5 + 1 file changed, 5 insertions(+) diff --git a/kamelets/timer-source.kamelet.yaml b/kamelets/timer-source.kamelet.yaml index f0414c18..f97b3f05 100644 --- a/kamelets/timer-source.kamelet.yaml +++ b/kamelets/timer-source.kamelet.yaml @@ -51,6 +51,10 @@ spec: description: The content type of the generated message. type: string default: text/plain + repeatCount: +title: Repeat Count +description: Specifies a maximum limit of number of fires +type: integer dependencies: - "camel:core" - "camel:timer" @@ -60,6 +64,7 @@ spec: uri: timer:tick parameters: period: "{{period}}" +repeatCount: "{{?repeatCount}}" steps: - set-body: constant: "{{message}}"
[camel-kamelets] 02/02: Added repeatCount parameter to timer source Kamelet
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit c47e751d71dbae0197ae3f8895c26042778ed0a3 Author: Andrea Cosentino AuthorDate: Mon Nov 28 14:45:47 2022 +0100 Added repeatCount parameter to timer source Kamelet Signed-off-by: Andrea Cosentino --- .../src/main/resources/kamelets/timer-source.kamelet.yaml| 5 + 1 file changed, 5 insertions(+) diff --git a/library/camel-kamelets/src/main/resources/kamelets/timer-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/timer-source.kamelet.yaml index f0414c18..f97b3f05 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/timer-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/timer-source.kamelet.yaml @@ -51,6 +51,10 @@ spec: description: The content type of the generated message. type: string default: text/plain + repeatCount: +title: Repeat Count +description: Specifies a maximum limit of number of fires +type: integer dependencies: - "camel:core" - "camel:timer" @@ -60,6 +64,7 @@ spec: uri: timer:tick parameters: period: "{{period}}" +repeatCount: "{{?repeatCount}}" steps: - set-body: constant: "{{message}}"
[GitHub] [camel-kamelets] oscerd merged pull request #1184: Added repeatCount parameter to timer source Kamelet
oscerd merged PR #1184: URL: https://github.com/apache/camel-kamelets/pull/1184 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus-examples] osmman commented on a diff in pull request #123: Add jms-jpa example
osmman commented on code in PR #123: URL: https://github.com/apache/camel-quarkus-examples/pull/123#discussion_r1033782119 ## jms-jpa/README.adoc: ## @@ -0,0 +1,184 @@ += JMS and JPA: A Camel Quarkus example +:cq-example-description: An example that shows how to run a Camel Quarkus application that supports JTA transactions on three external transactional resources: a database (MySQL), a messaging broker (Artemis) and a simulated XAResource which can demonstrate the commit, rollback and crash recovery. + +{cq-description} + +We use Narayana as the standalone JTA Transaction Manager implementation, and Hibernate as the JPA Adapter. + +This example will connect to a database with the connection details defined in `application.properties`. +If the example is run on Development mode and no database exists, Quarkus will create a matching database +https://quarkus.io/guides/datasource#dev-services[as described here]. + +TIP: Check the https://camel.apache.org/camel-quarkus/latest/first-steps.html[Camel Quarkus User guide] for prerequisites +and other general information. + +NOTE: The Narayana `node.identifier` is very important when you scale up in the cloud environment. It must be unique for each node. You can set it by using `quarkus.transaction-manager.node-name` property which the default value is `quarkus`. + +== Start in the Development mode + +[source,shell] + +$ mvn clean compile quarkus:dev + + +The above command compiles the project, starts the application and lets the Quarkus tooling watch for changes in your +workspace. Any modifications in your project will automatically take effect in the running application. + +TIP: Please refer to the Development mode section of +https://camel.apache.org/camel-quarkus/latest/first-steps.html#_development_mode[Camel Quarkus User guide] for more details. + +== Package and run the application + +Once you are done with developing you may want to package and run the application. + +TIP: Find more details about the JVM mode and Native mode in the Package and run section of +https://camel.apache.org/camel-quarkus/latest/first-steps.html#_package_and_run_the_application[Camel Quarkus User guide] + + External systems + +Start MySQL: +[source, shell] + +docker run --name db-mysql \ + -e MYSQL_ROOT_PASSWORD=root \ + -d -p 3306:3306 mysql + +docker exec -it db-mysql mysql -uroot -proot -e \ + "CREATE DATABASE testdb CHARACTER SET utf8mb4; + CREATE USER 'admin'@'%' IDENTIFIED WITH mysql_native_password BY 'admin'; + GRANT ALL ON testdb.* TO 'admin'@'%'; + GRANT XA_RECOVER_ADMIN on *.* to 'admin'@'%'; + FLUSH PRIVILEGES;" + + +Start Artemis: +[source, shell] + +docker run --name artemis \ + -e AMQ_USER=admin -e AMQ_PASSWORD=admin \ + -d -p 61616:61616 \ + quay.io/artemiscloud/activemq-artemis-broker + + + + Prerequisites +- Make sure `io.quarkus:quarkus-jdbc-mysql` has been added in `pom.xml` +- Make sure `db-mysql` and `artemis` has been started and ready for servicing +- Edit `src/main/resource/application.properties` to uncomment all `%prod` lines Review Comment: Thank you, I can see why. So in order to not use `%prod` parameters during integration tests we will have to run mvn command with `-Dquarkus-profile=test` which will require some rework on CI automation. -- 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 #8785: CAMEL-18766 Fixes bug in camel-support
github-actions[bot] commented on PR #8785: URL: https://github.com/apache/camel/pull/8785#issuecomment-1329364349 :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
[camel-kafka-connector] branch dependabot/github_actions/peter-evans/create-pull-request-4.2.3 created (now b19d7932b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/github_actions/peter-evans/create-pull-request-4.2.3 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git at b19d7932b Bump peter-evans/create-pull-request from 4.2.0 to 4.2.3 No new revisions were added by this update.
[GitHub] [camel-kafka-connector] dependabot[bot] opened a new pull request, #1478: Bump peter-evans/create-pull-request from 4.2.0 to 4.2.3
dependabot[bot] opened a new pull request, #1478: URL: https://github.com/apache/camel-kafka-connector/pull/1478 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4.2.0 to 4.2.3. Release notes Sourced from https://github.com/peter-evans/create-pull-request/releases;>peter-evans/create-pull-request's releases. Create Pull Request v4.2.3 What's Changed fix: add check for missing token input by https://github.com/peter-evans;>@peter-evans in https://github-redirect.dependabot.com/peter-evans/create-pull-request/pull/1324;>peter-evans/create-pull-request#1324 Full Changelog: https://github.com/peter-evans/create-pull-request/compare/v4.2.2...v4.2.3;>https://github.com/peter-evans/create-pull-request/compare/v4.2.2...v4.2.3 Create Pull Request v4.2.2 What's Changed fix: support github server url for pushing to fork by https://github.com/peter-evans;>@peter-evans in https://github-redirect.dependabot.com/peter-evans/create-pull-request/pull/1318;>peter-evans/create-pull-request#1318 New Contributors https://github.com/kevinzhu-sa;>@kevinzhu-sa made their first contribution in https://github-redirect.dependabot.com/peter-evans/create-pull-request/pull/1315;>peter-evans/create-pull-request#1315 Full Changelog: https://github.com/peter-evans/create-pull-request/compare/v4.2.1...v4.2.2;>https://github.com/peter-evans/create-pull-request/compare/v4.2.1...v4.2.2 Create Pull Request v4.2.1 What's Changed test: set default branch to main by https://github.com/peter-evans;>@peter-evans in https://github-redirect.dependabot.com/peter-evans/create-pull-request/pull/1310;>peter-evans/create-pull-request#1310 fix: handle update after force pushing base to a new commit by https://github.com/peter-evans;>@peter-evans in https://github-redirect.dependabot.com/peter-evans/create-pull-request/pull/1307;>peter-evans/create-pull-request#1307 Full Changelog: https://github.com/peter-evans/create-pull-request/compare/v4.2.0...v4.2.1;>https://github.com/peter-evans/create-pull-request/compare/v4.2.0...v4.2.1 Commits https://github.com/peter-evans/create-pull-request/commit/2b011faafdcbc9ceb11414d64d0573f37c774b04;>2b011fa fix: add check for missing token input (https://github-redirect.dependabot.com/peter-evans/create-pull-request/issues/1324;>#1324) https://github.com/peter-evans/create-pull-request/commit/331d02c7e2104af23ad5974d4d5cbc58a3e6dc77;>331d02c fix: support github server url for pushing to fork (https://github-redirect.dependabot.com/peter-evans/create-pull-request/issues/1318;>#1318) https://github.com/peter-evans/create-pull-request/commit/d7db273d6c7206ba99224e659c982ae34a1025e3;>d7db273 fix: handle update after force pushing base to a new commit (https://github-redirect.dependabot.com/peter-evans/create-pull-request/issues/1307;>#1307) https://github.com/peter-evans/create-pull-request/commit/ee93d78b55ada32aa74b5e9957aac9c2523dd22c;>ee93d78 test: set default branch to main (https://github-redirect.dependabot.com/peter-evans/create-pull-request/issues/1310;>#1310) https://github.com/peter-evans/create-pull-request/commit/6c704eb7a8ba1daa13da0dcea9bb93a4fe530275;>6c704eb docs: clarify limitations of push-to-fork with restricted token https://github.com/peter-evans/create-pull-request/commit/88bf0de51c7487d91e1abbb4899332e602c58bbf;>88bf0de docs: correct examples https://github.com/peter-evans/create-pull-request/commit/b38e8b0abe9d7481c24e68e98786ce75981ac6e2;>b38e8b0 docs: replace set-output in example See full diff in https://github.com/peter-evans/create-pull-request/compare/v4.2.0...v4.2.3;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=peter-evans/create-pull-request=github_actions=4.2.0=4.2.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and
[GitHub] [camel] github-actions[bot] commented on pull request #8646: [CAMEL-18618] Milo component: Return status from write
github-actions[bot] commented on PR #8646: URL: https://github.com/apache/camel/pull/8646#issuecomment-1329350492 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 1 | 0 | -- 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 release-1.10.x updated: fix: upgrade configuration docs to reflect the last release 1.10.3
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.10.x by this push: new a0f459be7 fix: upgrade configuration docs to reflect the last release 1.10.3 a0f459be7 is described below commit a0f459be7c165367944635ee99ded3a96194d771 Author: Gaelle Fournier AuthorDate: Mon Nov 28 16:06:49 2022 +0100 fix: upgrade configuration docs to reflect the last release 1.10.3 Refs: #3852 --- docs/antora.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index d27285883..7d4a5d329 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -31,14 +31,14 @@ asciidoc: requires: "'util=camel-website-util,ck=xref:js/ck.js'" lts: LTS prerelease: false -camel-kamelets-version: 0.9.1 # Makefile KAMELET_CATALOG_REPO_BRANCH +camel-kamelets-version: 0.9.3 # Makefile KAMELET_CATALOG_REPO_BRANCH camel-kamelets-docs-version: 0.9.x # Makefile KAMELET_CATALOG_REPO_BRANCH -camel-k-runtime-version: 1.15.1 # Makefile RUNTIME_VERSION +camel-k-runtime-version: 1.15.2 # Makefile RUNTIME_VERSION camel-api-versions: camel.apache.org/v1 camel.apache.org/v1alpha1 # Makefile BUNDLE_CAMEL_APIS # from camel-k-runtime parent pom: camel-version: 3.18.2 camel-docs-version: 3.18.x -camel-quarkus-version: 2.13.0 +camel-quarkus-version: 2.13.1 camel-quarkus-docs-version: 2.13.x quarkus-version: 2.13.0.Final graalvm-version: 22.1.0
[GitHub] [camel-k] squakez merged pull request #3853: fix: upgrade configuration docs to reflect the last release 1.10.3
squakez merged PR #3853: URL: https://github.com/apache/camel-k/pull/3853 -- 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] squakez closed issue #3840: Remove deprecated Kubernetes API
squakez closed issue #3840: Remove deprecated Kubernetes API URL: https://github.com/apache/camel-k/issues/3840 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: fix(core): move to policy/v1
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new dde63261f fix(core): move to policy/v1 dde63261f is described below commit dde63261f6004697e7c81dc4e50a6d56740251ea Author: Pasquale Congiusti AuthorDate: Thu Nov 24 17:03:41 2022 +0100 fix(core): move to policy/v1 Closes #3840 --- e2e/global/common/traits/pdb_test.go | 14 +++--- pkg/trait/pdb.go | 10 +- pkg/trait/pdb_test.go| 8 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/e2e/global/common/traits/pdb_test.go b/e2e/global/common/traits/pdb_test.go index 6a18b463a..e0a69993c 100644 --- a/e2e/global/common/traits/pdb_test.go +++ b/e2e/global/common/traits/pdb_test.go @@ -31,7 +31,7 @@ import ( . "github.com/onsi/gomega/gstruct" corev1 "k8s.io/api/core/v1" - policy "k8s.io/api/policy/v1beta1" + policyv1 "k8s.io/api/policy/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" @@ -109,7 +109,7 @@ func TestPodDisruptionBudgetTrait(t *testing.T) { // Eviction attempt pods := IntegrationPods(ns, name)() Expect(pods).To(HaveLen(2)) - err := TestClient().CoreV1().Pods(ns).Evict(TestContext, { + err := TestClient().CoreV1().Pods(ns).EvictV1(TestContext, { ObjectMeta: metav1.ObjectMeta{ Name: pods[0].Name, }, @@ -141,7 +141,7 @@ func TestPodDisruptionBudgetTrait(t *testing.T) { pods = IntegrationPods(ns, name)() Expect(pods).To(HaveLen(3)) - Expect(TestClient().CoreV1().Pods(ns).Evict(TestContext, { + Expect(TestClient().CoreV1().Pods(ns).EvictV1(TestContext, { ObjectMeta: metav1.ObjectMeta{ Name: pods[0].Name, }, @@ -152,11 +152,11 @@ func TestPodDisruptionBudgetTrait(t *testing.T) { }) } -func podDisruptionBudget(ns string, name string) func() *policy.PodDisruptionBudget { - return func() *policy.PodDisruptionBudget { - pdb := policy.PodDisruptionBudget{ +func podDisruptionBudget(ns string, name string) func() *policyv1.PodDisruptionBudget { + return func() *policyv1.PodDisruptionBudget { + pdb := policyv1.PodDisruptionBudget{ TypeMeta: metav1.TypeMeta{ - APIVersion: policy.SchemeGroupVersion.String(), + APIVersion: policyv1.SchemeGroupVersion.String(), Kind: "PodDisruptionBudget", }, ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/trait/pdb.go b/pkg/trait/pdb.go index 6f02265f1..78d960d9f 100644 --- a/pkg/trait/pdb.go +++ b/pkg/trait/pdb.go @@ -20,7 +20,7 @@ package trait import ( "fmt" - "k8s.io/api/policy/v1beta1" + policyv1 "k8s.io/api/policy/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/pointer" @@ -72,18 +72,18 @@ func (t *pdbTrait) Apply(e *Environment) error { return nil } -func (t *pdbTrait) podDisruptionBudgetFor(integration *v1.Integration) *v1beta1.PodDisruptionBudget { - pdb := { +func (t *pdbTrait) podDisruptionBudgetFor(integration *v1.Integration) *policyv1.PodDisruptionBudget { + pdb := { TypeMeta: metav1.TypeMeta{ Kind: "PodDisruptionBudget", - APIVersion: v1beta1.SchemeGroupVersion.String(), + APIVersion: policyv1.SchemeGroupVersion.String(), }, ObjectMeta: metav1.ObjectMeta{ Name: integration.Name, Namespace: integration.Namespace, Labels:integration.Labels, }, - Spec: v1beta1.PodDisruptionBudgetSpec{ + Spec: policyv1.PodDisruptionBudgetSpec{ Selector: { MatchLabels: map[string]string{ v1.IntegrationLabel: integration.Name, diff --git a/pkg/trait/pdb_test.go b/pkg/trait/pdb_test.go index af6e27da4..63857dd05 100644 --- a/pkg/trait/pdb_test.go +++ b/pkg/trait/pdb_test.go @@ -24,7 +24,7 @@ import ( appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" - "k8s.io/api/policy/v1beta1" + policyv1 "k8s.io/api/policy/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/utils/pointer" @@ -73,7 +73,7 @@