[GitHub] [camel-k] bouskaJ commented on pull request #2998: Enhance Http proxy test about the OLM
bouskaJ commented on pull request #2998: URL: https://github.com/apache/camel-k/pull/2998#issuecomment-1035956595 The test passed locally. Can you rerun failed pipelines if there is no ongoing issue with the CI on 1.8 branch? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: Regen
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-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 9200c6b Regen 9200c6b is described below commit 9200c6be350da1397a01967128d9688a9a6082c1 Author: Andrea Cosentino AuthorDate: Fri Feb 11 08:54:03 2022 +0100 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 73 ++ 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 5a02465..6404e5f 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -3975,6 +3975,11 @@ org.apache.camel +camel-test-cdi-junit5 +3.16.0-SNAPSHOT + + +org.apache.camel camel-test-junit5 3.16.0-SNAPSHOT @@ -4496,7 +4501,7 @@ org.apache.openjpa openjpa-persistence-jdbc -3.2.0 +3.2.1 org.apache.pdfbox @@ -4612,177 +4617,177 @@ org.optaplanner optaplanner-benchmark -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-benchmark -8.16.0.Final +8.16.1.Final javadoc org.optaplanner optaplanner-core -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-core -8.16.0.Final +8.16.1.Final javadoc org.optaplanner optaplanner-distribution-internal -8.16.0.Final +8.16.1.Final zip org.optaplanner optaplanner-docs -8.16.0.Final +8.16.1.Final zip org.optaplanner optaplanner-examples -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-persistence-common -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-persistence-common -8.16.0.Final +8.16.1.Final javadoc org.optaplanner optaplanner-persistence-jackson -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-persistence-jackson -8.16.0.Final +8.16.1.Final javadoc org.optaplanner optaplanner-persistence-jaxb -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-persistence-jaxb -8.16.0.Final +8.16.1.Final javadoc org.optaplanner optaplanner-persistence-jpa -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-persistence-jpa -8.16.0.Final +8.16.1.Final javadoc org.optaplanner optaplanner-persistence-jsonb -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-persistence-jsonb -8.16.0.Final +8.16.1.Final javadoc org.optaplanner optaplanner-persistence-xstream -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-persistence-xstream -8.16.0.Final +8.16.1.Final javadoc org.optaplanner optaplanner-quarkus -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-benchmark -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-benchmark-deployment -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-deployment -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-jackson -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-jackson-deployment -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-jackson-integration-test -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-jsonb -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-jsonb-deployment -8.16.0.Final +8.16.1.Final org.optaplanner optaplanner-quarkus-jsonb-integration-test -8.16.0.Final +8.16.1.Final
[camel] branch regen_bot updated (ce68e6d -> 2e139c8)
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 ce68e6d Jetty you yet again is not backwards compatible, solr must test with 9.4.44 add d098225 camel-cxf - Disable failing test due to recent ref endpoint change add ad86c30 Upgrade AWS SDK v2 to version 2.17.128 add 2e139c8 Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java| 2 ++ parent/pom.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (4817e07 -> ce68e6d)
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 4817e07 Regen add cf72c03 Polish docs add ce68e6d Jetty you yet again is not backwards compatible, solr must test with 9.4.44 No new revisions were added by this update. Summary of changes: components/camel-solr/pom.xml | 4 ++-- core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b0bfbf62a49345cf320cf0392c2c00f06a27fc48
Author: Andrea Cosentino
AuthorDate: Fri Feb 11 08:34:36 2022 +0100
Sync deps
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0918361..939f02b 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -440,7 +440,7 @@
3.14.9
2.0.11
4.8.0
-3.2.0
+3.2.1
3.10
${opentelemetry-version}-alpha
1.10.1
[camel] branch main updated (7be970e -> b0bfbf6)
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 7be970e Sync deps new 00e1610 Upgrade Openjpa to version 3.2.1 new b0bfbf6 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 Openjpa to version 3.2.1
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 00e1610940739fb1b8784c33a34efd1e0de18210
Author: Andrea Cosentino
AuthorDate: Fri Feb 11 08:29:58 2022 +0100
Upgrade Openjpa to version 3.2.1
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fbf9587..5ce043b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -427,7 +427,7 @@
2.0.11
4.8.0
3.1.12
-3.2.0
+3.2.1
3.10
1.10.1
${opentelemetry-version}-alpha
[camel] branch regen_bot updated (cf72c03 -> 4817e07)
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 cf72c03 Polish docs This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (4817e07) \ O -- O -- O (cf72c03) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[camel] branch regen_bot updated (447cfde -> cf72c03)
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 447cfde (chores) camel-package-maven-plugin: filter directly on the
listDir instead of in the stream
add 04827bf CAMEL-17633: Support JUnit 5 for Camel CDI (#6929)
add 4817e07 Regen
add cf72c03 Polish docs
No new revisions were added by this update.
Summary of changes:
bom/camel-bom/pom.xml | 5 +
catalog/camel-allcomponents/pom.xml| 4 +
.../org/apache/camel/catalog/others/test-cdi.json | 2 +-
.../pom.xml| 19 ++-
.../services/org/apache/camel/other.properties | 7 +
.../src/generated/resources/test-cdi-junit5.json | 15 ++
.../src/main/docs/test-cdi-junit5.adoc}| 161 ++---
.../org/apache/camel/test/cdi/AdviceRoute.java | 62
.../apache/camel/test/cdi/AnnotatedDecorator.java | 0
.../camel/test/cdi/AnnotatedMethodDecorator.java | 0
.../camel/test/cdi/AnnotatedTypeDecorator.java | 0
.../java/org/apache/camel/test/cdi/AnyLiteral.java | 0
.../main/java/org/apache/camel/test/cdi/Beans.java | 97 +
.../org/apache/camel/test/cdi/CamelCdiContext.java | 0
.../apache/camel/test/cdi/CamelCdiDeployment.java | 71 +
.../apache/camel/test/cdi/CamelCdiExtension.java | 126
.../camel/test/cdi/CamelCdiTestExtension.java | 153
.../test/cdi/FrameworkAnnotatedParameter.java | 0
.../test/cdi/FrameworkMethodInjectionPoint.java| 88 +++
.../org/apache/camel/test/cdi/PriorityLiteral.java | 0
.../camel/test/cdi/CamelCdiAdviceExternalTest.java | 60
.../apache/camel/test/cdi/CamelCdiAdviceTest.java | 69 +
.../test/cdi/CamelCdiAutoDetectRoutesTest.java | 61
.../apache/camel/test/cdi/CamelCdiBeansTest.java | 46 ++
.../camel/test/cdi/CamelCdiCamelContextTest.java | 42 ++
.../camel/test/cdi/CamelCdiCustomContextTest.java | 58
.../camel/test/cdi/CamelCdiMixedParamsTest.java| 57
.../camel/test/cdi/CamelCdiNotifyBuilderTest.java | 65 +
.../apache/camel/test/cdi/CamelCdiOrderTest.java | 47 ++
.../camel/test/cdi/CamelCdiParameterizedTest.java | 66 +
.../camel/test/cdi/CamelCdiRepeatedTest.java | 68 +
.../apache/camel/test/cdi/ExternalTestBuilder.java | 28
.../java/org/apache/camel/test/cdi/FilterTest.java | 73 ++
.../java/org/apache/camel/test/cdi/TestRoute.java | 27
.../test/cdi/alternatives/AlternativeBean.java | 31
.../camel/test/cdi/alternatives/Application.java | 33 +
.../apache/camel/test/cdi/alternatives/Bean.java | 29
.../cdi/alternatives/CamelCdiAlternativeTest.java | 54 +++
.../alternatives/CamelCdiNoAlternativeTest.java| 53 +++
.../src/test/resources/log4j2.properties | 0
components/camel-test/camel-test-cdi/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/test-cdi.json | 2 +-
.../camel-test-cdi/src/main/docs/test-cdi.adoc | 5 +-
components/camel-test/pom.xml | 1 +
.../src/main/docs/modules/eips/pages/loop-eip.adoc | 4 +-
.../others/examples/json/test-cdi-junit5.json | 1 +
docs/components/modules/others/nav.adoc| 1 +
.../modules/others/pages/test-cdi-junit5.adoc | 1 +
docs/user-manual/modules/ROOT/pages/testing.adoc | 3 +-
parent/pom.xml | 5 +
51 files changed, 1673 insertions(+), 131 deletions(-)
copy components/camel-test/{camel-test-cdi => camel-test-cdi-junit5}/pom.xml
(81%)
create mode 100644
components/camel-test/camel-test-cdi-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties
create mode 100644
components/camel-test/camel-test-cdi-junit5/src/generated/resources/test-cdi-junit5.json
copy components/camel-test/{camel-test-cdi/src/main/docs/test-cdi.adoc =>
camel-test-cdi-junit5/src/main/docs/test-cdi-junit5.adoc} (81%)
create mode 100644
components/camel-test/camel-test-cdi-junit5/src/main/java/org/apache/camel/test/cdi/AdviceRoute.java
copy components/camel-test/{camel-test-cdi =>
camel-test-cdi-junit5}/src/main/java/org/apache/camel/test/cdi/AnnotatedDecorator.java
(100%)
copy components/camel-test/{camel-test-cdi =>
camel-test-cdi-junit5}/src/main/java/org/apache/camel/test/cdi/AnnotatedMethodDecorator.java
(100%)
copy components/camel-test/{camel-test-cdi =>
camel-test-cdi-junit5}/src/main/java/org/apache/camel/test/cdi/AnnotatedTypeDecorator.java
(100%)
copy components/camel-test/{camel-test-cdi =>
camel-test-cdi-junit5}/src/main/java/org/apache/camel/test/cdi/AnyLiteral.java
(100%)
create mode 100644
[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 7be970eeadc0496a49f94ac05cdb9bbda6f7ecb2 Author: Andrea Cosentino AuthorDate: Fri Feb 11 08:07:48 2022 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index a30676d..0918361 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -446,7 +446,7 @@ 1.10.1 0.1.8 0.33.0 -8.16.0.Final +8.16.1.Final 1.7.0 1.2.5 2.7
[camel] 01/02: Upgrade Optaplanner to version 8.16.1.Final
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 62fb76afb08c60d89945dcc86be431f007575f75
Author: Andrea Cosentino
AuthorDate: Fri Feb 11 08:01:23 2022 +0100
Upgrade Optaplanner to version 8.16.1.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7a308f0..fbf9587 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -433,7 +433,7 @@
${opentelemetry-version}-alpha
0.33.0
0.1.8
-8.16.0.Final
+8.16.1.Final
1.7.0
1.2.5
2.7
[camel] branch main updated (2067c0c -> 7be970e)
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 2067c0c Sync deps new 62fb76a Upgrade Optaplanner to version 8.16.1.Final new 7be970e 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(-)
[GitHub] [camel-k] GeraldLoeffler commented on issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
GeraldLoeffler commented on issue #3006: URL: https://github.com/apache/camel-k/issues/3006#issuecomment-1035931538 ah, that's embarrasing: i had an old version earlier in my PATH - really sorry for the false alarm: all good with 1.8.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-k] GeraldLoeffler closed issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
GeraldLoeffler closed issue #3006: URL: https://github.com/apache/camel-k/issues/3006 -- 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 2067c0ceddba30b600bdba85c4f49a27ce7a3982 Author: Andrea Cosentino AuthorDate: Fri Feb 11 08:00:59 2022 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e0792fa..a30676d 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -431,7 +431,7 @@ 1.0.0.Beta4 1.0.1 2.0.5 -4.1.73.Final +4.1.74.Final 1.0.64 8.9 3.4.3
[camel] 01/02: Upgrade Netty to version 4.1.74.Final
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 47ff275e2ebbed2ee41f0e986c99e6e1508d5af1 Author: Andrea Cosentino AuthorDate: Fri Feb 11 07:55:47 2022 +0100 Upgrade Netty to version 4.1.74.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index ce8e54a..7a308f0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -418,7 +418,7 @@ 1.0.1 1.0.0.RC4 0.4.0 -4.1.73.Final +4.1.74.Final 2.0.5 1.0.64 8.9
[camel] branch main updated (2e139c8 -> 2067c0c)
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 2e139c8 Sync deps new 47ff275 Upgrade Netty to version 4.1.74.Final new 2067c0c 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(-)
[GitHub] [camel-k] davsclaus commented on issue #3001: SEDA multiple threads not working
davsclaus commented on issue #3001: URL: https://github.com/apache/camel-k/issues/3001#issuecomment-1035926059 You can ask for such help on the user mailing list or the zulip chat room - its a general Camel questions and not really Camel K specific. https://camel.apache.org/community/support/ Also mind that 100 threads is very much - dont set it so high that is more threads than you have CPU cores. Also you need a lot of pending messages for more than 1 thread to be active. -- 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] davsclaus closed issue #3001: SEDA multiple threads not working
davsclaus closed issue #3001: URL: https://github.com/apache/camel-k/issues/3001 -- 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] davsclaus commented on issue #2983: Release 1.8.1
davsclaus commented on issue #2983: URL: https://github.com/apache/camel-k/issues/2983#issuecomment-1035925269 yeah its a false -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] davsclaus commented on issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
davsclaus commented on issue #3006: URL: https://github.com/apache/camel-k/issues/3006#issuecomment-1035925096 Also the github downloads works for me - both the regular mac and the arm mac are all 1.8.0 versions -- 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] oscerd commented on issue #2983: Release 1.8.1
oscerd commented on issue #2983: URL: https://github.com/apache/camel-k/issues/2983#issuecomment-1035924488 It seems it is a false alarm at first sight. I'll release next week by the way. It's a bit long process, so better to start at beginning of the week. No rush. -- 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] davsclaus commented on issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
davsclaus commented on issue #3006: URL: https://github.com/apache/camel-k/issues/3006#issuecomment-1035923753 Also the link in the top works for me - they are all 1.8.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-k] oscerd commented on issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
oscerd commented on issue #3006: URL: https://github.com/apache/camel-k/issues/3006#issuecomment-1035923330 I don't have a mac available, but can you try with the github file in the release? -- 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] davsclaus commented on issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
davsclaus commented on issue #3006: URL: https://github.com/apache/camel-k/issues/3006#issuecomment-1035922831 Are you sure, I just downloaded the mac client from Apache and its 1.8.0 https://www.apache.org/dyn/closer.lua/camel/camel-k/1.8.0/camel-k-client-1.8.0-mac-64bit.tar.gz ``` ~/Downloads/camel-k-client-1.8.0-mac-64bit ❯ ./kamel version Camel K Client 1.8.0 ``` And its the downloads from ASF that we official support -- 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-1035921388 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 1827236321-659-c211ae98-882a-41f0-99a2-b45bc7f8066c * Camel Quarkus Commit: 3f8838a0ab359897dfbc0c9ee6377bbd3cdf6327 * Quarkus Main Commit: d640529e956b6c09e07d09f300c0b9495e30cf6b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1827236321 -- 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] oscerd commented on issue #2983: Release 1.8.1
oscerd commented on issue #2983: URL: https://github.com/apache/camel-k/issues/2983#issuecomment-1035920198 It's weird because it should be automated. -- 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] davsclaus commented on issue #2983: Release 1.8.1
davsclaus commented on issue #2983: URL: https://github.com/apache/camel-k/issues/2983#issuecomment-1035919788 Yeah the CLIs should be the correct versions in the release -- 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 (d098225 -> 2e139c8)
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 d098225 camel-cxf - Disable failing test due to recent ref endpoint change new ad86c30 Upgrade AWS SDK v2 to version 2.17.128 new 2e139c8 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 AWS SDK v2 to version 2.17.128
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 ad86c30733844f4833c3b3b00a406e73ee8893e6 Author: Andrea Cosentino AuthorDate: Fri Feb 11 06:46:48 2022 +0100 Upgrade AWS SDK v2 to version 2.17.128 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5e03028..ce8e54a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -82,7 +82,7 @@ 1.11.0 1.11.0 4.1.1 -2.17.127 +2.17.128 2.6.1 1.2.14 2.13.1
[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 2e139c8627fb534688999e59872134396ba22b26 Author: Andrea Cosentino AuthorDate: Fri Feb 11 07:31:05 2022 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 35af530..e0792fa 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -65,7 +65,7 @@ 1.11.0 1.11.0 4.1.1 -2.17.127 +2.17.128 2.6.1 1.2.14 4.20.0
[GitHub] [camel-k] oscerd commented on issue #2983: Release 1.8.1
oscerd commented on issue #2983: URL: https://github.com/apache/camel-k/issues/2983#issuecomment-1035917434 If we are ready, I would start the release. There is by the way this new issue here: https://github.com/apache/camel-k/issues/3006 maybe we could have a look, just to verify if it's a problem in the release process or something else -- 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-cxf - Disable failing test due to recent ref endpoint change
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 d098225 camel-cxf - Disable failing test due to recent ref endpoint
change
d098225 is described below
commit d098225b259d3ff52990f9c68251aab0e013b960
Author: Claus Ibsen
AuthorDate: Fri Feb 11 07:30:05 2022 +0100
camel-cxf - Disable failing test due to recent ref endpoint change
---
.../org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java| 2 ++
1 file changed, 2 insertions(+)
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
index 27e3749..e2a85af 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.util.IOHelper;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -65,6 +66,7 @@ public abstract class AbstractCXFGreeterRouterTest extends
CamelSpringTestSuppor
}
@Test
+@Disabled
public void testInvokingServiceFromCXFClient() throws Exception {
Service service = Service.create(serviceName);
service.addPort(routerPortName, "http://schemas.xmlsoap.org/soap/;,
[camel] branch main updated: Jetty you yet again is not backwards compatible, solr must test with 9.4.44
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 ce68e6d Jetty you yet again is not backwards compatible, solr must
test with 9.4.44
ce68e6d is described below
commit ce68e6de18dc807cbabc196a43059c794a6a9049
Author: Claus Ibsen
AuthorDate: Fri Feb 11 07:23:30 2022 +0100
Jetty you yet again is not backwards compatible, solr must test with 9.4.44
---
components/camel-solr/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 7b92934..9db444b 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -127,13 +127,13 @@
org.eclipse.jetty
jetty-server
-${jetty-version}
+9.4.44.v20210927
test
org.eclipse.jetty
jetty-servlet
-${jetty-version}
+9.4.44.v20210927
test
[camel] branch camel-3.14.x updated: Polish docs
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.14.x by this push: new b70331f Polish docs b70331f is described below commit b70331f65d9dcc277525db91750a4a3b6c30d49f Author: Claus Ibsen AuthorDate: Fri Feb 11 07:16:52 2022 +0100 Polish docs --- core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc index 867b3a0..c57d364 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc @@ -27,7 +27,7 @@ Processors can rely on these properties to process the message in different ways == Looping modes -The Loop EIP can run in three modes: default, or copy. +The Loop EIP can run in three modes: default, copy, or while mode. In default mode the Loop EIP uses the same `Exchange` instance throughout the looping. So the result from the previous iteration will be used for the next iteration. @@ -35,7 +35,7 @@ So the result from the previous iteration will be used for the next iteration. In the copy mode, then the Loop EIP uses a copy of the original `Exchange` in each iteration. So the result from the previous iteration will *not* be used for the next iteration. -In the doWhile mode, the Loop EIP +In the while mode, then the Loop EIP will keep looping until the expression evaluates to `false` or `null`. == Example
[camel] branch main updated: Polish docs
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 cf72c03 Polish docs cf72c03 is described below commit cf72c035e7af2ebd7151ca54570f25b62e2daf46 Author: Claus Ibsen AuthorDate: Fri Feb 11 07:16:52 2022 +0100 Polish docs --- core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc b/core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc index 867b3a0..c57d364 100644 --- a/core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc +++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/loop-eip.adoc @@ -27,7 +27,7 @@ Processors can rely on these properties to process the message in different ways == Looping modes -The Loop EIP can run in three modes: default, or copy. +The Loop EIP can run in three modes: default, copy, or while mode. In default mode the Loop EIP uses the same `Exchange` instance throughout the looping. So the result from the previous iteration will be used for the next iteration. @@ -35,7 +35,7 @@ So the result from the previous iteration will be used for the next iteration. In the copy mode, then the Loop EIP uses a copy of the original `Exchange` in each iteration. So the result from the previous iteration will *not* be used for the next iteration. -In the doWhile mode, the Loop EIP +In the while mode, then the Loop EIP will keep looping until the expression evaluates to `false` or `null`. == Example
[GitHub] [camel-k] GeraldLoeffler edited a comment on issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
GeraldLoeffler edited a comment on issue #3006: URL: https://github.com/apache/camel-k/issues/3006#issuecomment-1035533273 it also uses an old apiVersion: `no matches for kind "Integration" in version "camel.apache.org/v1alpha1"` -- 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
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 4817e07 Regen
4817e07 is described below
commit 4817e07d4a0110b6fb2229819e64b9f6315020a9
Author: Claus Ibsen
AuthorDate: Fri Feb 11 07:14:27 2022 +0100
Regen
---
.../camel-test-cdi-junit5/src/main/docs/test-cdi-junit5.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-test/camel-test-cdi-junit5/src/main/docs/test-cdi-junit5.adoc
b/components/camel-test/camel-test-cdi-junit5/src/main/docs/test-cdi-junit5.adoc
index 3b94163..d888374 100644
---
a/components/camel-test/camel-test-cdi-junit5/src/main/docs/test-cdi-junit5.adoc
+++
b/components/camel-test/camel-test-cdi-junit5/src/main/docs/test-cdi-junit5.adoc
@@ -2,9 +2,9 @@
:doctitle: Test CDI JUnit5
:shortname: test-cdi-junit5
:artifactid: camel-test-cdi-junit5
-:description: Camel unit testing with CDI for JUnit5
+:description: Camel unit testing with CDI and JUnit5
:since: 3.16
-:supportlevel: Stable
+:supportlevel: Preview
*Since Camel {since}*
[camel] branch main updated: CAMEL-17633: Support JUnit 5 for Camel CDI (#6929)
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 04827bf CAMEL-17633: Support JUnit 5 for Camel CDI (#6929)
04827bf is described below
commit 04827bfdd659554f7b863bc85880719554c0211a
Author: Nicolas Filotto
AuthorDate: Fri Feb 11 07:08:45 2022 +0100
CAMEL-17633: Support JUnit 5 for Camel CDI (#6929)
---
bom/camel-bom/pom.xml | 5 +
catalog/camel-allcomponents/pom.xml| 4 +
.../org/apache/camel/catalog/others/test-cdi.json | 2 +-
.../pom.xml| 19 +--
.../services/org/apache/camel/other.properties | 7 +
.../src/generated/resources/test-cdi-junit5.json | 15 ++
.../src/main/docs/test-cdi-junit5.adoc}| 159 ++---
.../org/apache/camel/test/cdi/AdviceRoute.java | 62
.../apache/camel/test/cdi/AnnotatedDecorator.java | 84 +++
.../camel/test/cdi/AnnotatedMethodDecorator.java | 71 +
.../camel/test/cdi/AnnotatedTypeDecorator.java | 80 +++
.../java/org/apache/camel/test/cdi/AnyLiteral.java | 30
.../main/java/org/apache/camel/test/cdi/Beans.java | 97 +
.../org/apache/camel/test/cdi/CamelCdiContext.java | 46 ++
.../apache/camel/test/cdi/CamelCdiDeployment.java | 71 +
.../apache/camel/test/cdi/CamelCdiExtension.java | 126
.../camel/test/cdi/CamelCdiTestExtension.java | 153
.../test/cdi/FrameworkAnnotatedParameter.java | 91
.../test/cdi/FrameworkMethodInjectionPoint.java| 88
.../org/apache/camel/test/cdi/PriorityLiteral.java | 38 +
.../camel/test/cdi/CamelCdiAdviceExternalTest.java | 60
.../apache/camel/test/cdi/CamelCdiAdviceTest.java | 69 +
.../test/cdi/CamelCdiAutoDetectRoutesTest.java | 61
.../apache/camel/test/cdi/CamelCdiBeansTest.java | 46 ++
.../camel/test/cdi/CamelCdiCamelContextTest.java | 42 ++
.../camel/test/cdi/CamelCdiCustomContextTest.java | 58
.../camel/test/cdi/CamelCdiMixedParamsTest.java| 57
.../camel/test/cdi/CamelCdiNotifyBuilderTest.java | 65 +
.../apache/camel/test/cdi/CamelCdiOrderTest.java | 47 ++
.../camel/test/cdi/CamelCdiParameterizedTest.java | 66 +
.../camel/test/cdi/CamelCdiRepeatedTest.java | 68 +
.../apache/camel/test/cdi/ExternalTestBuilder.java | 28
.../java/org/apache/camel/test/cdi/FilterTest.java | 73 ++
.../java/org/apache/camel/test/cdi/TestRoute.java | 27
.../test/cdi/alternatives/AlternativeBean.java | 31
.../camel/test/cdi/alternatives/Application.java | 33 +
.../apache/camel/test/cdi/alternatives/Bean.java | 29
.../cdi/alternatives/CamelCdiAlternativeTest.java | 54 +++
.../alternatives/CamelCdiNoAlternativeTest.java| 53 +++
.../src/test/resources/log4j2.properties | 28
components/camel-test/camel-test-cdi/pom.xml | 2 +-
.../services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/test-cdi.json | 2 +-
.../camel-test-cdi/src/main/docs/test-cdi.adoc | 5 +-
components/camel-test/pom.xml | 1 +
.../others/examples/json/test-cdi-junit5.json | 1 +
docs/components/modules/others/nav.adoc| 1 +
.../modules/others/pages/test-cdi-junit5.adoc | 1 +
docs/user-manual/modules/ROOT/pages/testing.adoc | 3 +-
parent/pom.xml | 5 +
50 files changed, 2138 insertions(+), 128 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 05a2991..e981efa 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2015,6 +2015,11 @@
org.apache.camel
+camel-test-cdi-junit5
+${project.version}
+
+
+org.apache.camel
camel-test-junit5
${project.version}
diff --git a/catalog/camel-allcomponents/pom.xml
b/catalog/camel-allcomponents/pom.xml
index 7dc00be..c804c3ac 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -1379,6 +1379,10 @@
org.apache.camel
+ camel-test-cdi-junit5
+
+
+ org.apache.camel
camel-test-cdi
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/test-cdi.json
index b793a6c..aa96fb8 100644
---
[GitHub] [camel] davsclaus merged pull request #6929: CAMEL-17633: Support JUnit 5 for Camel CDI
davsclaus merged pull request #6929: URL: https://github.com/apache/camel/pull/6929 -- 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-spring-boot] davsclaus commented on a change in pull request #435: CAMEL-17535: Fix server URL in generated swagger UI.
davsclaus commented on a change in pull request #435:
URL: https://github.com/apache/camel-spring-boot/pull/435#discussion_r804377056
##
File path:
components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
##
@@ -150,6 +166,28 @@ private OpenAPI createOpenAPI(final CamelContext
camelContext) throws Exception
.orElse(null);
}
+/**
+ * Return the basePath for the REST services
+ * @param springContextPath the spring context path if set or empty
+ * @param basePath The apiProperty "base.path" from the REST configuration
+ * @param contextPath the REST contextPath or null.
+ * Used instead of basePath if both are non-null.
+ * @return the combined contextPath
+ */
+private String getBasePath(String springContextPath, Object basePath,
String contextPath) {
+if (contextPath == null) {
+contextPath = (String)basePath; // could still be null
+}
+if (contextPath != null && !contextPath.isEmpty()) {
+return springContextPath + contextPath;
+}
+else {
+// This will cause problems when using the Camel servlet as the
REST component!
+LOG.warn("No REST context path set in Camel!");
Review comment:
in Camel Rest-DSL
##
File path:
components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
##
@@ -124,14 +130,24 @@ private OpenAPI createOpenAPI(final CamelContext
camelContext) throws Exception
final BeanConfig bc = new BeanConfig();
final Info info = new Info();
-
final RestConfiguration rc = camelContext.getRestConfiguration();
-initOpenApi(bc, info,
Optional.ofNullable(rc.getApiProperties()).orElseGet(HashMap::new));
+Map apiProps =
Optional.ofNullable(rc.getApiProperties()).orElseGet(HashMap::new);
+initOpenApi(bc, info, apiProps,
+getBasePath(springContextPath, apiProps.get("base.path"),
rc.getContextPath()));
final OasDocument openApi = reader.read(camelContext, rests, bc, null,
camelContext.getClassResolver());
if (!rc.isApiVendorExtension()) {
clearVendorExtensions(openApi);
}
+// Set relative path in URL if basepath is set
+if (bc.getBasePath()!=null && !bc.getBasePath().isEmpty() &&
openApi.is3xDocument()) {
+for (Server server : ((Oas30Document)openApi).getServers()) {
+if (server.url.endsWith(bc.getBasePath())) {
+LOG.info("Setting relative URL " + bc.getBasePath());
Review comment:
Can this logging message be improved such as "Setting Server URL in
ApiDoc to base path: {}"
--
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] closed issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] closed issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927 -- 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 #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1035881395 Build fixed with: * Camel Quarkus Commit: 72afb8b48323b9a43e7f78e1b44bb6653753e8e5 * Camel Main Commit: d640529e956b6c09e07d09f300c0b9495e30cf6b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1826823387 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch camel-main updated (7734132 -> 72afb8b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 7734132 Upgrade Camel to 3.16.0 add 90ea9cb Upgrade Maven Wrapper to 3.1.0 add d640529 Disable flaky messaging resequence test on GitHub CI (#2957) new 72afb8b Upgrade Camel to 3.16.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7734132) \ N -- N -- N refs/heads/camel-main (72afb8b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 58727 bytes .mvn/wrapper/maven-wrapper.properties | 18 ++- .../messaging/it/AbstractMessagingTest.java| 2 ++ mvnw | 22 - mvnw.cmd | 34 - 5 files changed, 53 insertions(+), 23 deletions(-)
[camel-quarkus] 01/01: Upgrade Camel to 3.16.0
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 72afb8b48323b9a43e7f78e1b44bb6653753e8e5
Author: James Netherton
AuthorDate: Wed Feb 9 11:13:37 2022 +
Upgrade Camel to 3.16.0
---
docs/antora.yml| 6 +-
.../ROOT/pages/reference/extensions/yaml-dsl.adoc | 6 --
.../it/health/CustomHealthCheckRepository.java | 17 --
.../microprofile/it/health/FailingHealthCheck.java | 2 +-
.../it/health/FailureThresholdHealthCheck.java | 51
.../it/health/MicroProfileHealthResource.java | 17 +-
.../src/main/resources/application.properties | 7 +--
.../it/health/MicroProfileHealthTest.java | 67 --
pom.xml| 6 +-
9 files changed, 9 insertions(+), 170 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 1413755..0d85853 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -29,11 +29,11 @@ asciidoc:
min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
-camel-version: 3.15.0 # replace ${camel.version}
-camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
+camel-version: 3.16.0-SNAPSHOT # replace ${camel.version}
+camel-docs-version: 3.16.x # replace ${camel.docs.components.version}
quarkus-version: 2.7.1.Final # replace ${quarkus.version}
graalvm-version: 21.3.1 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
-cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
+cq-camel-components: 3.16.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
b/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
index bdde5d3..26484a9 100644
--- a/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/yaml-dsl.adoc
@@ -16,12 +16,6 @@
An YAML stack for parsing YAML route definitions
-== What's inside
-
-* xref:{cq-camel-components}:others:yaml-dsl.adoc[YAML DSL]
-
-Please refer to the above link for usage and configuration details.
-
== Maven coordinates
https://code.quarkus.io/?extension-search=camel-quarkus-yaml-dsl[Create a new
project with this extension on code.quarkus.io, window="_blank"]
diff --git
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
index c54665d..2d31330 100644
---
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
+++
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/CustomHealthCheckRepository.java
@@ -16,12 +16,10 @@
*/
package org.apache.camel.quarkus.component.microprofile.it.health;
-import java.util.Collections;
import java.util.Map;
import java.util.stream.Stream;
import org.apache.camel.health.HealthCheck;
-import org.apache.camel.health.HealthCheckConfiguration;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.health.HealthCheckResultBuilder;
import org.apache.camel.impl.health.AbstractHealthCheck;
@@ -44,21 +42,6 @@ public class CustomHealthCheckRepository implements
HealthCheckRepository {
}
@Override
-public void setConfigurations(Map
configurations) {
-// Noop
-}
-
-@Override
-public Map getConfigurations() {
-return Collections.emptyMap();
-}
-
-@Override
-public void addConfiguration(String id, HealthCheckConfiguration
configuration) {
-// Noop
-}
-
-@Override
public Stream stream() {
return Stream.of(check);
}
diff --git
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
index 2d56d54..b278052 100644
---
a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
+++
b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/health/FailingHealthCheck.java
@@ -25,7 +25,7 @@ public class FailingHealthCheck extends AbstractHealthCheck {
public FailingHealthCheck() {
super("failing-check");
-getConfiguration().setEnabled(false);
+
[GitHub] [camel-k] claudio4j closed pull request #2866: fix(knative): Make knative broker name configurable in KameletBinding (1.6.x)
claudio4j closed pull request #2866: URL: https://github.com/apache/camel-k/pull/2866 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] claudio4j commented on pull request #2866: fix(knative): Make knative broker name configurable in KameletBinding (1.6.x)
claudio4j commented on pull request #2866: URL: https://github.com/apache/camel-k/pull/2866#issuecomment-1035871619 Closing this while I work on it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] claudio4j commented on pull request #2865: fix(knative): Make knative broker name configurable in KameletBinding
claudio4j commented on pull request #2865: URL: https://github.com/apache/camel-k/pull/2865#issuecomment-1035871496 Closing this while I work on it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] claudio4j closed pull request #2865: fix(knative): Make knative broker name configurable in KameletBinding
claudio4j closed pull request #2865: URL: https://github.com/apache/camel-k/pull/2865 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 891a863 Updated CHANGELOG.md 891a863 is described below commit 891a8632571f25176e16f6e3f6752c6aa6f87b27 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Feb 11 03:09:54 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7e770b..04beb69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ **Merged pull requests:** +- Disable flaky messaging resequence test on GitHub CI \(\#2957\) [\#3540](https://github.com/apache/camel-quarkus/pull/3540) ([jamesnetherton](https://github.com/jamesnetherton)) +- Upgrade Maven Wrapper to 3.1.0 [\#3539](https://github.com/apache/camel-quarkus/pull/3539) ([jamesnetherton](https://github.com/jamesnetherton)) - Run integration tests on Windows [\#3537](https://github.com/apache/camel-quarkus/pull/3537) ([jamesnetherton](https://github.com/jamesnetherton)) - Exclude json-simple from camel-slack, workaround for CAMEL-17619 [\#3536](https://github.com/apache/camel-quarkus/pull/3536) ([ppalaga](https://github.com/ppalaga)) - Upgrade to Quarkus 2.7.1 [\#3535](https://github.com/apache/camel-quarkus/pull/3535) ([ppalaga](https://github.com/ppalaga))
[camel-karavan] branch main updated: Fix generator issue (#184)
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 322cbf0 Fix generator issue (#184)
322cbf0 is described below
commit 322cbf095146a4abf3c00d320c3d122743c57660
Author: Marat Gubaidullin
AuthorDate: Thu Feb 10 17:48:40 2022 -0500
Fix generator issue (#184)
---
karavan-core/src/core/model/CamelDefinition.ts | 1 -
karavan-generator/src/main/resources/CamelDefinition.header.ts | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/karavan-core/src/core/model/CamelDefinition.ts
b/karavan-core/src/core/model/CamelDefinition.ts
index 84a11b0..bf87300 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -68,7 +68,6 @@ export class CamelElementMeta {
position: number = 0;
pathUuids: string [] = [];
-
constructor(step?: CamelElement, parentUuid?: string, position?: number,
pathUuids?: string []) {
this.step = step;
this.parentUuid = parentUuid;
diff --git a/karavan-generator/src/main/resources/CamelDefinition.header.ts
b/karavan-generator/src/main/resources/CamelDefinition.header.ts
index e10095a..7ec9fd3 100644
--- a/karavan-generator/src/main/resources/CamelDefinition.header.ts
+++ b/karavan-generator/src/main/resources/CamelDefinition.header.ts
@@ -54,7 +54,7 @@ export class CamelElement {
}
export class Beans extends CamelElement {
-beans: Bean[] = []
+beans: NamedBeanDefinition[] = []
public constructor(init?: Partial) {
super("Beans")
[GitHub] [camel-karavan] mgubaidullin merged pull request #184: Fix generator issue
mgubaidullin merged pull request #184: URL: https://github.com/apache/camel-karavan/pull/184 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #183: Bean selector for ref
mgubaidullin merged pull request #183: URL: https://github.com/apache/camel-karavan/pull/183 -- 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: Bean slector for ref (#183)
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 0d0e1dc Bean slector for ref (#183)
0d0e1dc is described below
commit 0d0e1dcc5d4f23c735f8b1d2f7732f2882973d3b
Author: Marat Gubaidullin
AuthorDate: Thu Feb 10 17:33:54 2022 -0500
Bean slector for ref (#183)
---
karavan-core/src/core/api/CamelDefinitionApiExt.ts | 15 +
karavan-core/src/core/api/CamelDefinitionYaml.ts | 6 ++--
karavan-core/src/core/api/CamelUtil.ts | 6 ++--
karavan-core/src/core/model/CamelDefinition.ts | 13 +---
.../src/designer/beans/BeanProperties.tsx | 23 --
.../src/designer/beans/BeansDesigner.tsx | 18 +--
.../src/designer/field/DataFormatField.tsx | 4 ++-
.../src/designer/field/DslPropertyField.tsx| 36 +++---
.../src/designer/field/ExpressionField.tsx | 4 ++-
.../src/designer/field/ObjectField.tsx | 4 ++-
karavan-designer/src/designer/karavan.css | 8 ++---
.../src/designer/route/DslProperties.tsx | 2 ++
karavan-designer/src/designer/utils/CamelUi.ts | 8 ++---
.../src/main/resources/CamelDefinition.header.ts | 11 ---
14 files changed, 82 insertions(+), 76 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionApiExt.ts
b/karavan-core/src/core/api/CamelDefinitionApiExt.ts
index 1197f73..348a688 100644
--- a/karavan-core/src/core/api/CamelDefinitionApiExt.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApiExt.ts
@@ -18,7 +18,7 @@ import {CamelMetadataApi, ElementMeta, Languages,
PropertyMeta} from "../model/C
import {ComponentApi} from "./ComponentApi";
import {CamelUtil} from "./CamelUtil";
import {
-Bean, Beans,
+NamedBeanDefinition, Beans,
CamelElement, CamelElementMeta,
ExpressionDefinition,
Integration, RouteDefinition
@@ -43,8 +43,11 @@ export class CamelDefinitionApiExt {
if (step.dslName === 'RouteDefinition') {
integration.spec.flows?.push(step as RouteDefinition);
} else {
-const flows =
CamelDefinitionApiExt.addStepToSteps(integration.spec.flows || [], step,
parentId, position);
-integration.spec.flows = flows as RouteDefinition[];
+const flows: any[] = [];
+integration.spec.flows?.filter(flow => flow.dslName ===
'Beans').forEach(bean => flows.push(bean));
+const routes =
CamelDefinitionApiExt.addStepToSteps(integration.spec.flows?.filter(flow =>
flow.dslName === 'RouteDefinition') || [], step, parentId, position);
+flows.push(...routes);
+integration.spec.flows = flows;
}
return integration;
}
@@ -184,7 +187,7 @@ export class CamelDefinitionApiExt {
return result
}
-static addBeanToIntegration = (integration: Integration, bean: Bean):
Integration => {
+static addBeanToIntegration = (integration: Integration, bean:
NamedBeanDefinition): Integration => {
const flows: any[] = [];
if (integration.spec.flows?.filter(flow => flow.dslName ===
'Beans').length === 0) {
flows.push(...integration.spec.flows);
@@ -192,7 +195,7 @@ export class CamelDefinitionApiExt {
} else {
flows.push(...integration.spec.flows?.filter(flow => flow.dslName
!== 'Beans') || []);
integration.spec.flows?.filter(flow => flow.dslName ===
'Beans').forEach(flow => {
-const beans: Bean[] = [];
+const beans: NamedBeanDefinition[] = [];
if ((flow as Beans).beans.filter(b => b.uuid ===
bean.uuid).length === 0){
beans.push(...(flow as Beans).beans.filter(b => b.uuid !==
bean.uuid));
beans.push(bean);
@@ -210,7 +213,7 @@ export class CamelDefinitionApiExt {
return integration;
}
-static deleteBeanFromIntegration = (integration: Integration, bean?:
Bean): Integration => {
+static deleteBeanFromIntegration = (integration: Integration, bean?:
NamedBeanDefinition): Integration => {
const flows: any[] = [];
integration.spec.flows?.forEach(flow => {
if (flow.dslName === 'Beans') {
diff --git a/karavan-core/src/core/api/CamelDefinitionYaml.ts
b/karavan-core/src/core/api/CamelDefinitionYaml.ts
index 0587dc0..5488458 100644
--- a/karavan-core/src/core/api/CamelDefinitionYaml.ts
+++ b/karavan-core/src/core/api/CamelDefinitionYaml.ts
@@ -17,7 +17,7 @@
import * as yaml from 'js-yaml';
import {
Integration,
-CamelElement, RouteDefinition, Bean, Beans,
+CamelElement, RouteDefinition, NamedBeanDefinition, Beans,
} from "../model/CamelDefinition";
import {CamelUtil} from "./CamelUtil";
import {CamelDefinitionYamlStep} from "./CamelDefinitionYamlStep";
@@ -48,7 +48,7
[GitHub] [camel-karavan] mgubaidullin closed issue #177: Outgoing arrows improvement
mgubaidullin closed issue #177: URL: https://github.com/apache/camel-karavan/issues/177 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #182: Fix #177
mgubaidullin merged pull request #182: URL: https://github.com/apache/camel-karavan/pull/182 -- 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: Fix #177 (#182)
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 f37a811 Fix #177 (#182)
f37a811 is described below
commit f37a8119ea89fa63a021a8bde04e4e25334456b6
Author: Marat Gubaidullin
AuthorDate: Thu Feb 10 16:41:45 2022 -0500
Fix #177 (#182)
---
karavan-designer/src/designer/route/DslConnections.tsx | 3 ++-
karavan-designer/src/designer/utils/CamelUi.ts | 6 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/karavan-designer/src/designer/route/DslConnections.tsx
b/karavan-designer/src/designer/route/DslConnections.tsx
index db82cc3..b2b3420 100644
--- a/karavan-designer/src/designer/route/DslConnections.tsx
+++ b/karavan-designer/src/designer/route/DslConnections.tsx
@@ -122,7 +122,8 @@ export class DslConnections extends React.Component {
getOutgoings():[string, number][] {
let outs: [string, number][] = Array.from(this.state.steps.values())
-.filter(pos => ['ToDefinition', 'KameletDefinition',
'ToDynamicDefinition', "PollEnrichDefinition",
"EnrichDefinition"].includes(pos.step.dslName))
+.filter(pos => ['ToDefinition', 'KameletDefinition',
'ToDynamicDefinition', "PollEnrichDefinition", "EnrichDefinition",
"WireTapDefinition"].includes(pos.step.dslName))
+.filter(pos => pos.step.dslName !== 'KameletDefinition' ||
(pos.step.dslName === 'KameletDefinition' &&
!CamelUi.isActionKamelet(pos.step)))
.sort((pos1: DslPosition, pos2: DslPosition ) => {
const y1 = pos1.headerRect.y + pos1.headerRect.height / 2;
const y2 = pos2.headerRect.y + pos2.headerRect.height / 2;
diff --git a/karavan-designer/src/designer/utils/CamelUi.ts
b/karavan-designer/src/designer/utils/CamelUi.ts
index 5fdbd6d..37b7eac 100644
--- a/karavan-designer/src/designer/utils/CamelUi.ts
+++ b/karavan-designer/src/designer/utils/CamelUi.ts
@@ -187,6 +187,12 @@ export class CamelUi {
}
}
+static isActionKamelet = (element: CamelElement): boolean => {
+const kamelet = this.getKamelet(element);
+if (kamelet) return kamelet.type() === 'action'
+else return false;
+}
+
static getKameletProperties = (element: any): Property[] => {
const kamelet = CamelUi.getKamelet(element)
return kamelet
[GitHub] [camel-k] GeraldLoeffler commented on issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
GeraldLoeffler commented on issue #3006: URL: https://github.com/apache/camel-k/issues/3006#issuecomment-1035533273 it also uses an old namespace: `no matches for kind "Integration" in version "camel.apache.org/v1alpha1"` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin closed issue #55: Beans support
mgubaidullin closed issue #55: URL: https://github.com/apache/camel-karavan/issues/55 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #181: Beans config
mgubaidullin merged pull request #181: URL: https://github.com/apache/camel-karavan/pull/181 -- 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: Beans config (#181)
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 b1bf31b Beans config (#181)
b1bf31b is described below
commit b1bf31b5888b667dc0bb49b9c1855a8822d96536
Author: Marat Gubaidullin
AuthorDate: Thu Feb 10 16:21:48 2022 -0500
Beans config (#181)
* Support bean in Core
* Beans gallery
* Beans editor
* Bean config UI
* Bump version to 0.0.12
---
karavan-app/pom.xml| 2 +-
karavan-app/src/main/webapp/package.json | 2 +-
.../webapp/src/integrations/IntegrationCard.tsx| 2 +-
.../webapp/src/integrations/IntegrationPage.tsx| 2 +-
.../src/main/webapp/src/kamelets/KameletCard.tsx | 2 +-
karavan-core/src/core/api/CamelDefinitionApiExt.ts | 67 -
karavan-core/src/core/api/CamelDefinitionYaml.ts | 46 ++-
karavan-core/src/core/api/CamelUtil.ts | 21 +-
karavan-core/src/core/model/CamelDefinition.ts | 20 ++
karavan-core/test/addStep.spec.ts | 1 -
karavan-core/test/beans.spec.ts| 56
karavan-core/test/beans1.yaml | 36 +++
karavan-core/test/beans2.yaml | 42 +++
karavan-demo/http-to-kafka.yaml| 35 +++
karavan-designer/package-lock.json | 4 +-
karavan-designer/package.json | 2 +-
karavan-designer/src/App.tsx | 62 ++--
karavan-designer/src/designer/KaravanDesigner.tsx | 314 +
.../src/designer/beans/BeanProperties.tsx | 157 +++
.../src/designer/beans/BeansDesigner.tsx | 183
.../src/designer/error/ErrorDesigner.tsx | 74 +
.../src/designer/exception/ExceptionDesigner.tsx | 74 +
.../src/designer/field/DataFormatField.tsx | 1 -
.../src/designer/field/DslPropertyField.tsx| 2 +-
.../src/designer/field/ExpressionField.tsx | 2 +-
karavan-designer/src/designer/karavan.css | 251
.../src/designer/rest/RestDesigner.tsx | 74 +
.../src/designer/{ => route}/DslConnections.tsx| 6 +-
.../src/designer/{ => route}/DslElement.tsx| 6 +-
.../src/designer/{ => route}/DslProperties.tsx | 31 +-
.../src/designer/{ => route}/DslSelector.tsx | 6 +-
.../RouteDesigner.tsx} | 129 ++---
.../src/designer/templates/TemplatesDesigner.tsx | 74 +
.../src/designer/{ => utils}/CamelUi.ts| 36 ++-
.../src/designer/utils}/DslMetaModel.ts| 0
.../src/designer/{ => utils}/EventBus.ts | 0
.../src/designer/utils/KaravanComponents.tsx | 45 +++
.../src/designer/utils/KaravanIcons.tsx| 51
karavan-generator/pom.xml | 2 +-
.../src/main/resources/CamelDefinition.header.ts | 21 +-
karavan-vscode/package.json| 12 +-
karavan-vscode/webview/App.tsx | 2 +-
karavan-vscode/webview/index.css | 79 +-
43 files changed, 1504 insertions(+), 530 deletions(-)
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index d305aa8..63c03e8 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -18,7 +18,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;>
4.0.0
org.apache.camel.karavan
-0.0.11
+0.0.12
karavan
3.8.1
diff --git a/karavan-app/src/main/webapp/package.json
b/karavan-app/src/main/webapp/package.json
index 98bcc76..5f5ecef 100644
--- a/karavan-app/src/main/webapp/package.json
+++ b/karavan-app/src/main/webapp/package.json
@@ -1,6 +1,6 @@
{
"name": "karavan",
- "version": "0.0.11",
+ "version": "0.0.12",
"private": true,
"dependencies": {
"@patternfly/patternfly": "^4.171.1",
diff --git a/karavan-app/src/main/webapp/src/integrations/IntegrationCard.tsx
b/karavan-app/src/main/webapp/src/integrations/IntegrationCard.tsx
index db25be9..7402caf 100644
--- a/karavan-app/src/main/webapp/src/integrations/IntegrationCard.tsx
+++ b/karavan-app/src/main/webapp/src/integrations/IntegrationCard.tsx
@@ -4,7 +4,7 @@ import {
} from '@patternfly/react-core';
import DeleteIcon from "@patternfly/react-icons/dist/js/icons/times-icon";
import '../designer/karavan.css';
-import {CamelUi} from "../designer/CamelUi";
+import {CamelUi} from "../designer/utils/CamelUi";
interface Props {
name: string,
diff --git a/karavan-app/src/main/webapp/src/integrations/IntegrationPage.tsx
b/karavan-app/src/main/webapp/src/integrations/IntegrationPage.tsx
index 328c6ae..d9b62a6 100644
--- a/karavan-app/src/main/webapp/src/integrations/IntegrationPage.tsx
+++
[GitHub] [camel-k] GeraldLoeffler opened a new issue #3006: kamel client for macOS from release 1.8.0 is really 1.0.0-M4
GeraldLoeffler opened a new issue #3006: URL: https://github.com/apache/camel-k/issues/3006 Downloading https://github.com/apache/camel-k/releases/download/v1.8.0/camel-k-client-1.8.0-mac-64bit.tar.gz and running `kamel version` returns `Camel K Client 1.0.0-M4`. -- 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] catshout commented on issue #3003: Operator creates to many repositories
catshout commented on issue #3003: URL: https://github.com/apache/camel-k/issues/3003#issuecomment-1035502436 Hi @squakez thanks for pointing us this out. I have some questions so far - Can we re-user an existing Integration Kit as it contains no sources itself? - Is it ok to cleanup a created Integration Kit at the k8s cluster and the dependent repository in the the registry after the build process? - Is it possible to perform a local build (or on a build server) upfront and deploy the built image afterwards? Background of these question is that we need to have a production grade platform. Remaining Integration Kits and Repositories with no function won't even work as we're running ouf of ressources. Best Gerald -- 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 (e493bc8 -> 447cfde)
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 e493bc8 (chores) camel-maven-package-plugin: refactoring add 447cfde (chores) camel-package-maven-plugin: filter directly on the listDir instead of in the stream No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 9 + 1 file changed, 5 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (f1864c8 -> e493bc8)
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 f1864c8 CAMEL-17625: improve migration documentation add 905c23a (chores) camel-maven-package-plugin: refactoring add 976888c (chores) camel-maven-package-plugin: consolidate duplicated logic add e493bc8 (chores) camel-maven-package-plugin: refactoring No new revisions were added by this update. Summary of changes: .../camel/maven/packaging/EndpointDslMojo.java | 587 - 1 file changed, 329 insertions(+), 258 deletions(-)
[camel] branch regen_bot updated (93d1e06 -> f1864c8)
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 93d1e06 [CAMEL-17362]camel-openapi-jave and camel-swagger-java should have camel-rest dependency add f1864c8 CAMEL-17625: improve migration documentation No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[camel] branch main updated: (chores) camel-package-maven-plugin: filter directly on the listDir instead of in the stream
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 447cfde (chores) camel-package-maven-plugin: filter directly on the
listDir instead of in the stream
447cfde is described below
commit 447cfde60e2c204d697a5f3c89c9c88a42cc27c0
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 19:05:15 2022 +0100
(chores) camel-package-maven-plugin: filter directly on the listDir instead
of in the stream
---
.../java/org/apache/camel/maven/packaging/EndpointDslMojo.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 1b028e8..6721fb6 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -17,6 +17,7 @@
package org.apache.camel.maven.packaging;
import java.io.File;
+import java.io.FileFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.LineNumberReader;
@@ -204,7 +205,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
// Update components metadata
getLog().debug("Load components EndpointFactories");
-List endpointFactories =
loadAllComponentsDslEndpointFactoriesAsFile();
+final List endpointFactories =
loadAllComponentsDslEndpointFactoriesAsFile();
getLog().debug("Regenerate EndpointBuilderFactory");
// make sure EndpointBuilderFactory is synced
@@ -897,15 +898,15 @@ public class EndpointDslMojo extends
AbstractGeneratorMojo {
private List loadAllComponentsDslEndpointFactoriesAsFile() {
final File allComponentsDslEndpointFactory
= new File(sourcesOutputDir,
componentsFactoriesPackageName.replace('.', '/'));
-final File[] files = allComponentsDslEndpointFactory.listFiles();
+FileFilter fileFilter = file -> file.isFile() &&
file.getName().endsWith(".java");
+final File[] files =
allComponentsDslEndpointFactory.listFiles(fileFilter);
if (files == null) {
return Collections.emptyList();
}
// load components
-return Arrays.stream(files).filter(file -> file.isFile() &&
file.getName().endsWith(".java") && file.exists()).sorted()
-.collect(Collectors.toList());
+return
Arrays.stream(files).sorted().collect(Collectors.toUnmodifiableList());
}
private static String camelCaseLower(String s) {
[GitHub] [camel] orpiske merged pull request #6928: (chores) camel-package-maven-plugin: filter directly on the listDir instead of in the stream
orpiske merged pull request #6928: URL: https://github.com/apache/camel/pull/6928 -- 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] 03/03: (chores) camel-maven-package-plugin: refactoring
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e493bc81adc153f79df1f071f46081051d585bd9
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 18:26:03 2022 +0100
(chores) camel-maven-package-plugin: refactoring
Replace a few long chains of string concatenation with StringBuilder
---
.../camel/maven/packaging/EndpointDslMojo.java | 96 +-
1 file changed, 58 insertions(+), 38 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 21622aa..1b028e8 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -332,7 +332,8 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
javaClass.addAnnotation(Generated.class).setStringValue("value",
EndpointDslMojo.class.getName());
-processEndpoints(model, consumerClass, advancedConsumerClass,
producerClass, advancedProducerClass, builderClass, advancedBuilderClass);
+processEndpoints(model, consumerClass, advancedConsumerClass,
producerClass, advancedProducerClass, builderClass,
+advancedBuilderClass);
javaClass.removeImport("T");
@@ -363,7 +364,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
false);
}
-private void processMasterScheme(List aliases,
List staticBuilders, JavaClass javaClass, JavaClass builderClass,
JavaClass dslClass) {
+private void processMasterScheme(
+List aliases, List staticBuilders,
JavaClass javaClass, JavaClass builderClass,
+JavaClass dslClass) {
Method method;
// we only want the first alias (master scheme) as static builders
boolean firstAlias = true;
@@ -429,7 +432,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
}
}
-private void processAliases(ComponentModel model, List
staticBuilders, JavaClass javaClass, JavaClass builderClass, JavaClass
dslClass) {
+private void processAliases(
+ComponentModel model, List staticBuilders, JavaClass
javaClass, JavaClass builderClass,
+JavaClass dslClass) {
Method method;
String desc = getMainDescription(model);
String methodName = camelCaseLower(model.getScheme());
@@ -478,7 +483,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
staticBuilders.add(method);
}
-private void processEndpoints(ComponentModel model, JavaClass
consumerClass, JavaClass advancedConsumerClass, JavaClass producerClass,
JavaClass advancedProducerClass, JavaClass builderClass, JavaClass
advancedBuilderClass) {
+private void processEndpoints(
+ComponentModel model, JavaClass consumerClass, JavaClass
advancedConsumerClass, JavaClass producerClass,
+JavaClass advancedProducerClass, JavaClass builderClass, JavaClass
advancedBuilderClass) {
for (EndpointOptionModel option : model.getEndpointOptions()) {
// skip all @UriPath parameters as the endpoint DSL is for query
@@ -487,7 +494,8 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
continue;
}
-List targets = evalTargetsToProcess(consumerClass,
advancedConsumerClass, producerClass, advancedProducerClass, builderClass,
advancedBuilderClass, option);
+List targets = evalTargetsToProcess(consumerClass,
advancedConsumerClass, producerClass,
+advancedProducerClass, builderClass, advancedBuilderClass,
option);
for (JavaClass target : targets) {
processTarget(option, target);
@@ -501,10 +509,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo
{
}
// basic description
-String baseDesc = option.getDescription();
-if (!Strings.isEmpty(baseDesc)) {
-baseDesc = createBaseDesc(option, baseDesc);
-}
+final String baseDesc = createBaseDescription(option);
boolean multiValued = option.isMultiValue();
if (multiValued) {
@@ -529,10 +534,11 @@ public class EndpointDslMojo extends
AbstractGeneratorMojo {
if (option.isDeprecated()) {
fluent.addAnnotation(Deprecated.class);
}
-String text = desc;
-text += "\n\n@param " + option.getName() + " the value to set";
-text += "\n@return the dsl builder\n";
-fluent.getJavaDoc().setText(text);
+
+final StringBuilder textBuilder = new StringBuilder(desc);
+
[camel] 02/03: (chores) camel-maven-package-plugin: consolidate duplicated logic
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 976888c58da3d3af88f962de95a1ca6f7fcd226d
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 18:10:16 2022 +0100
(chores) camel-maven-package-plugin: consolidate duplicated logic
---
.../java/org/apache/camel/maven/packaging/EndpointDslMojo.java| 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index b63f506..21622aa 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -891,10 +891,10 @@ public class EndpointDslMojo extends
AbstractGeneratorMojo {
private static String camelCaseLower(String s) {
int i;
while (s != null && (i = s.indexOf('-')) > 0) {
-s = s.substring(0, i) + s.substring(i + 1, i + 2).toUpperCase() +
s.substring(i + 2);
+s = camelCaseAtIndex(s, i);
}
while (s != null && (i = s.indexOf('+')) > 0) {
-s = s.substring(0, i) + s.substring(i + 1, i + 2).toUpperCase() +
s.substring(i + 2);
+s = camelCaseAtIndex(s, i);
}
if (s != null) {
s = s.substring(0, 1).toLowerCase() + s.substring(1);
@@ -915,6 +915,10 @@ public class EndpointDslMojo extends AbstractGeneratorMojo
{
return s;
}
+private static String camelCaseAtIndex(String s, int i) {
+return s.substring(0, i) + s.substring(i + 1, i + 2).toUpperCase() +
s.substring(i + 2);
+}
+
private String getMainDescription(ComponentModel model) {
StringBuilder descSb = new StringBuilder();
[camel] 01/03: (chores) camel-maven-package-plugin: refactoring
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 905c23ac3d9d97118ff97d22288a71b669f9fbe0
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 18:09:37 2022 +0100
(chores) camel-maven-package-plugin: refactoring
Break a few large methods EndpointDslMojo in smaller pieces for easier
maintenance and future optimization
---
.../camel/maven/packaging/EndpointDslMojo.java | 559 +++--
1 file changed, 303 insertions(+), 256 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index a495ea8..b63f506 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -229,25 +229,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo
{
String componentClassName = model.getJavaType();
String builderName = getEndpointName(componentClassName);
-final JavaClass javaClass = new JavaClass(getProjectClassLoader());
-javaClass.setPackage(componentsFactoriesPackageName);
-javaClass.setName(builderName + "Factory");
-javaClass.setClass(false);
-javaClass.addImport("java.util.*");
-javaClass.addImport("java.util.concurrent.*");
-javaClass.addImport("java.util.function.*");
-javaClass.addImport("java.util.stream.*");
-
javaClass.addImport("org.apache.camel.builder.EndpointConsumerBuilder");
-
javaClass.addImport("org.apache.camel.builder.EndpointProducerBuilder");
-
javaClass.addImport("org.apache.camel.builder.endpoint.AbstractEndpointBuilder");
+final JavaClass javaClass = createJavaClass(builderName);
-boolean hasAdvanced = false;
-for (EndpointOptionModel option : model.getEndpointOptions()) {
-if (option.getLabel() != null &&
option.getLabel().contains("advanced")) {
-hasAdvanced = true;
-break;
-}
-}
+boolean hasAdvanced = hasAdvancedCheck(model);
JavaClass consumerClass = null;
JavaClass advancedConsumerClass = null;
@@ -268,9 +252,11 @@ public class EndpointDslMojo extends AbstractGeneratorMojo
{
generateDummyClass(advancedConsumerClass.getCanonicalName());
advancedConsumerClass.getJavaDoc()
.setText("Advanced builder for endpoint consumers for
the " + model.getTitle() + " component.");
+
consumerClass.addMethod().setName("advanced").setReturnType(loadClass(advancedConsumerClass.getCanonicalName()))
.setDefault()
.setBody("return (Advanced" + consumerName + ")
this;");
+
advancedConsumerClass.addMethod().setName("basic").setReturnType(loadClass(consumerClass.getCanonicalName()))
.setDefault()
.setBody("return (" + consumerName + ") this;");
@@ -346,162 +332,7 @@ public class EndpointDslMojo extends
AbstractGeneratorMojo {
javaClass.addAnnotation(Generated.class).setStringValue("value",
EndpointDslMojo.class.getName());
-for (EndpointOptionModel option : model.getEndpointOptions()) {
-
-// skip all @UriPath parameters as the endpoint DSL is for query
-// parameters
-if ("path".equals(option.getKind())) {
-continue;
-}
-
-List targets = new ArrayList<>();
-String label = option.getLabel() != null ? option.getLabel() : "";
-if (label != null) {
-if (label.contains("producer")) {
-if (label.contains("advanced")) {
-targets.add(advancedProducerClass != null ?
advancedProducerClass : advancedBuilderClass);
-} else {
-targets.add(producerClass != null ? producerClass :
builderClass);
-}
-} else if (label.contains("consumer")) {
-if (label.contains("advanced")) {
-targets.add(advancedConsumerClass != null ?
advancedConsumerClass : advancedBuilderClass);
-} else {
-targets.add(consumerClass != null ? consumerClass :
builderClass);
-}
-} else {
-if (label.contains("advanced")) {
-targets.add(advancedConsumerClass);
-targets.add(advancedProducerClass);
-targets.add(advancedBuilderClass);
-
[camel] branch main updated (f1864c8 -> e493bc8)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from f1864c8 CAMEL-17625: improve migration documentation new 905c23a (chores) camel-maven-package-plugin: refactoring new 976888c (chores) camel-maven-package-plugin: consolidate duplicated logic new e493bc8 (chores) camel-maven-package-plugin: refactoring The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/maven/packaging/EndpointDslMojo.java | 587 - 1 file changed, 329 insertions(+), 258 deletions(-)
[GitHub] [camel] orpiske merged pull request #6927: camel-maven-package-plugin: second round of cleanups
orpiske merged pull request #6927: URL: https://github.com/apache/camel/pull/6927 -- 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] christophd commented on pull request #2932: chore: remove deprecated code in pre 1.6 releases
christophd commented on pull request #2932: URL: https://github.com/apache/camel-k/pull/2932#issuecomment-1035319571 @squakez yep, I will take a look -- 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 (93d1e06 -> f1864c8)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 93d1e06 [CAMEL-17362]camel-openapi-jave and camel-swagger-java should have camel-rest dependency add f1864c8 CAMEL-17625: improve migration documentation No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[GitHub] [camel] essobedo opened a new pull request #6929: CAMEL-17633: Support JUnit 5 for Camel CDI
essobedo opened a new pull request #6929:
URL: https://github.com/apache/camel/pull/6929
Fix for https://issues.apache.org/jira/browse/CAMEL-17633
- [x] Make sure there is a [JIRA
issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change
(usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue,
without pulling in other changes.
- [x] Each commit in the pull request should have a meaningful subject line
and body.
- [x] If you're unsure, you can format the pull request title like
`[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX`
with the appropriate JIRA issue.
- [x] Write a pull request description that is detailed enough to understand
what the pull request does, how, and why.
- [x] Run `mvn clean install -Psourcecheck` in your module with source check
enabled to make sure basic checks pass and there are no checkstyle violations.
A more thorough check will be performed on your pull request automatically.
Below are the contribution guidelines:
https://github.com/apache/camel/blob/main/CONTRIBUTING.md
## Motivation
So far only JUnit 4 is supported when we use Camel CDI. The goal of this
task is to support also JUnit 5 in order to allow the end users to be able to
benefit from new features that it provides.
## Motivations:
* Add a new module/artifact `camel-test-cdi-junit5` based on
`camel-test-cdi`
* Support all the use-cases described in the current documentation
https://camel.apache.org/components/3.14.x/others/test-cdi.html
* Deprecate `camel-test-cdi`
* Replace the old JUnit runner `CamelCdiRunner` with the extension
`CamelCdiExtension`
* Remove the annotation `Order` as it is managed out of the box by JUnit 5
* Add a new extension `AdviceRoute` to manage the way to advice routes
In the next example, the `AdviceWithRouteBuilder` of type
`ReplaceDirectWithMockBuilder` advices the
route whose identifier is `main-route`.
```
@ExtendWith(CamelCdiExtension.class)
public class CamelCdiTest {
@AdviceRoute("main-route")
public class ReplaceDirectWithMockBuilder extends AdviceWithRouteBuilder
{
@Override
public void configure() throws Exception {
weaveByToUri("direct:out").replace().to("mock:test");
}
}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] orpiske merged pull request #6926: CAMEL-17625: improve migration documentation
orpiske merged pull request #6926: URL: https://github.com/apache/camel/pull/6926 -- 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 (c9e6c15 -> 93d1e06)
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 c9e6c15 (chores) camel-package-maven-plugin: remove unused code add 93d1e06 [CAMEL-17362]camel-openapi-jave and camel-swagger-java should have camel-rest dependency No new revisions were added by this update. Summary of changes: components/camel-rest-openapi/pom.xml | 5 + components/camel-rest-swagger/pom.xml | 5 + 2 files changed, 10 insertions(+)
[GitHub] [camel] orpiske opened a new pull request #6928: (chores) camel-package-maven-plugin: filter directly on the listDir instead of in the stream
orpiske opened a new pull request #6928: URL: https://github.com/apache/camel/pull/6928 -- 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 (7afcdca -> c9e6c15)
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 7afcdca Regen for commit faa13b988a017914003d1375d937d8ebe42650cb add 7cbcc4f (chores) camel-maven-package-plugin: removed unused exceptions add b862247 (chores) camel-maven-package-plugin: minor refactoring to simplify the code add bb147f8 (chores) camel-package-maven-plugin: minor performance related cleanup add e3473d9 (chores) camel-package-maven-plugin: additional updates to make it slightly faster add e413bb9 (chores) camel-maven-package-plugin: removed unused method parameters add c9e6c15 (chores) camel-package-maven-plugin: remove unused code No new revisions were added by this update. Summary of changes: .../packaging/AbstractGenerateConfigurerMojo.java | 10 +- .../packaging/EndpointSchemaGeneratorMojo.java | 270 - .../packaging/EndpointUriFactoryGenerator.java | 161 ++-- .../packaging/GenerateEndpointUriFactoryMojo.java | 17 +- .../maven/packaging/PackageComponentMojo.java | 2 +- .../camel/maven/packaging/PrepareAssemblyMojo.java | 2 +- .../camel/maven/packaging/PrepareCatalogMojo.java | 2 +- .../packaging/PropertyConfigurerGenerator.java | 203 .../camel/maven/packaging/SchemaGeneratorMojo.java | 94 --- .../camel/maven/packaging/UpdateReadmeMojo.java| 21 +- .../maven/packaging/generics/GenericsUtil.java | 2 +- 11 files changed, 402 insertions(+), 382 deletions(-)
[GitHub] [camel-spring-boot] klease commented on pull request #435: CAMEL-17535: Fix server URL in generated swagger UI.
klease commented on pull request #435: URL: https://github.com/apache/camel-spring-boot/pull/435#issuecomment-1035238799 If it looks OK to you Claus (or others), I'll merge it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] klease opened a new pull request #435: CAMEL-17535: Fix server URL in generated swagger UI.
klease opened a new pull request #435: URL: https://github.com/apache/camel-spring-boot/pull/435 Account for both possible spring context path and Camel REST context path. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #6927: camel-maven-package-plugin: second round of cleanups
orpiske opened a new pull request #6927: URL: https://github.com/apache/camel/pull/6927 -- 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-17362]camel-openapi-jave and camel-swagger-java should have camel-rest dependency
This is an automated email from the ASF dual-hosted git repository.
ffang 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 93d1e06 [CAMEL-17362]camel-openapi-jave and camel-swagger-java should
have camel-rest dependency
93d1e06 is described below
commit 93d1e063cae7444a47668bdbe60d5172c1bb189a
Author: Freeman Fang
AuthorDate: Thu Feb 10 12:35:53 2022 -0500
[CAMEL-17362]camel-openapi-jave and camel-swagger-java should have
camel-rest dependency
---
components/camel-rest-openapi/pom.xml | 5 +
components/camel-rest-swagger/pom.xml | 5 +
2 files changed, 10 insertions(+)
diff --git a/components/camel-rest-openapi/pom.xml
b/components/camel-rest-openapi/pom.xml
index cf7a672..9da7c1c 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -50,6 +50,11 @@
+org.apache.camel
+camel-rest
+
+
+
io.apicurio
apicurio-data-models
${apicurio-version}
diff --git a/components/camel-rest-swagger/pom.xml
b/components/camel-rest-swagger/pom.xml
index e635573..b06aa28 100644
--- a/components/camel-rest-swagger/pom.xml
+++ b/components/camel-rest-swagger/pom.xml
@@ -45,6 +45,11 @@
+org.apache.camel
+camel-rest
+
+
+
io.swagger
swagger-parser
${swagger-java-parser-version}
[GitHub] [camel] orpiske opened a new pull request #6926: CAMEL-17625: improve migration documentation
orpiske opened a new pull request #6926: URL: https://github.com/apache/camel/pull/6926 -- 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 (0896e9e -> 7afcdca)
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 0896e9e Regen for commit 92c69a04d90ba590ad5946cc0abeb5549ff4c92a add 135f40c Regen for commit 77cca6637e46a3df2cc852beadf6e6449fdcdc8a add 8111395 CAMEL-17631: camel-component-maven-plugin - Should generate for InvokeOnHeader add 7afcdca Regen for commit faa13b988a017914003d1375d937d8ebe42650cb 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 (0896e9e) \ N -- N -- N refs/heads/regen_bot (7afcdca) 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: .../org/apache/camel/maven/component/GenerateComponentMojo.java | 6 ++ 1 file changed, 6 insertions(+)
[camel] 04/07: (chores) camel-package-maven-plugin: minor performance related cleanup
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 bb147f8e1ffaf0711cd8e5f9881ae02a02280caf
Author: Otavio R. Piske
AuthorDate: Sat Jan 8 17:35:08 2022 -0300
(chores) camel-package-maven-plugin: minor performance related cleanup
Updated the EndpointUriFactoryGenerator to use a StringBuilder which
should be slightly faster
---
.../packaging/EndpointUriFactoryGenerator.java | 159 +++--
.../packaging/GenerateEndpointUriFactoryMojo.java | 9 +-
2 files changed, 82 insertions(+), 86 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
index 245787c..cd4e95b 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriFactoryGenerator.java
@@ -30,94 +30,95 @@ public final class EndpointUriFactoryGenerator {
private EndpointUriFactoryGenerator() {
}
-public static void generateEndpointUriFactory(
-String pn, String cn, String en,
-String pfqn, String psn, ComponentModel model, Writer w)
-throws IOException {
-
-w.write("/* " + AbstractGeneratorMojo.GENERATED_MSG + " */\n");
-w.write("package " + pn + ";\n");
-w.write("\n");
-w.write("import java.net.URISyntaxException;\n");
-w.write("import java.util.Collections;\n");
-w.write("import java.util.HashMap;\n");
-w.write("import java.util.HashSet;\n");
-w.write("import java.util.Map;\n");
-w.write("import java.util.Set;\n");
-w.write("\n");
-w.write("import org.apache.camel.spi.EndpointUriFactory;\n");
-w.write("\n");
-w.write("/**\n");
-w.write(" * " + AbstractGeneratorMojo.GENERATED_MSG + "\n");
-w.write(" */\n");
-w.write("public class " + cn + " extends " + psn + " implements
EndpointUriFactory {\n");
-w.write("\n");
-w.write("private static final String BASE = \"" +
baseSyntax(model) + "\";\n");
+public static String generateEndpointUriFactory(String pn, String cn,
String psn, ComponentModel model) {
+StringBuilder w = new StringBuilder();
+
+w.append("/* ").append(AbstractGeneratorMojo.GENERATED_MSG).append("
*/\n");
+w.append("package ").append(pn).append(";\n");
+w.append('\n');
+w.append("import java.net.URISyntaxException;\n");
+w.append("import java.util.Collections;\n");
+w.append("import java.util.HashMap;\n");
+w.append("import java.util.HashSet;\n");
+w.append("import java.util.Map;\n");
+w.append("import java.util.Set;\n");
+w.append('\n');
+w.append("import org.apache.camel.spi.EndpointUriFactory;\n");
+w.append('\n');
+w.append("/**\n");
+w.append(" *
").append(AbstractGeneratorMojo.GENERATED_MSG).append('\n');
+w.append(" */\n");
+w.append("public class ").append(cn).append(" extends
").append(psn).append(" implements EndpointUriFactory {\n");
+w.append('\n');
+w.append("private static final String BASE =
\"").append(baseSyntax(model)).append("\";\n");
String alternative = alternativeSchemes(model);
if (alternative != null) {
-w.write("private static final String[] SCHEMES = " +
alternative + ";\n");
+w.append("private static final String[] SCHEMES =
").append(alternative).append(";\n");
}
-w.write("\n");
-w.write("private static final Set PROPERTY_NAMES;\n");
-w.write("private static final Set
SECRET_PROPERTY_NAMES;\n");
-w.write("private static final Set
MULTI_VALUE_PREFIXES;\n");
-w.write("static {\n");
-w.write(generatePropertyNames(model));
-w.write(generateSecretPropertyNames(model));
-w.write(generateMultiValuePrefixes(model));
-w.write("}\n");
-w.write("\n");
-w.write("@Override\n");
-w.write("public boolean isEnabled(String scheme) {\n");
+w.append("\n");
+w.append("private static final Set PROPERTY_NAMES;\n");
+w.append("private static final Set
SECRET_PROPERTY_NAMES;\n");
+w.append("private static final Set
MULTI_VALUE_PREFIXES;\n");
+w.append("static {\n");
+w.append(generatePropertyNames(model));
+w.append(generateSecretPropertyNames(model));
+w.append(generateMultiValuePrefixes(model));
+w.append("}\n");
+w.append("\n");
+
[camel] 05/07: (chores) camel-package-maven-plugin: additional updates to make it slightly faster
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 e3473d93c3bb7e24b2a0046cc3bc231230821bf6
Author: Otavio R. Piske
AuthorDate: Sat Jan 8 17:53:16 2022 -0300
(chores) camel-package-maven-plugin: additional updates to make it
slightly faster
---
.../packaging/AbstractGenerateConfigurerMojo.java | 7 +-
.../packaging/EndpointSchemaGeneratorMojo.java | 23 ++-
.../packaging/EndpointUriFactoryGenerator.java | 2 -
.../packaging/PropertyConfigurerGenerator.java | 203 +++--
4 files changed, 122 insertions(+), 113 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 21affac..2846049 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -432,11 +432,8 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
String pfqn = fqn;
String psn =
"org.apache.camel.support.component.PropertyConfigurerSupport";
-StringWriter sw = new StringWriter();
-PropertyConfigurerGenerator.generatePropertyConfigurer(pn, cn, en,
pfqn, psn,
-false, false, extended, bootstrap, options, null, sw);
-
-String source = sw.toString();
+String source =
PropertyConfigurerGenerator.generatePropertyConfigurer(pn, cn, en, pfqn, psn,
+false, false, extended, bootstrap, options, null);
String fileName = pn.replace('.', '/') + "/" + cn + ".java";
outputDir.mkdirs();
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index dbec27f..db6b4d3 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -32,6 +32,8 @@ import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.time.Duration;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -179,7 +181,9 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
}
}
-private void processSchemas(Map models, Class
classElement, UriEndpoint uriEndpoint, String label, String[] schemes, String[]
titles, String[] extendsSchemes) {
+private void processSchemas(
+Map models, Class classElement,
UriEndpoint uriEndpoint, String label, String[] schemes,
+String[] titles, String[] extendsSchemes) {
for (int i = 0; i < schemes.length; i++) {
final String alias = schemes[i];
final String extendsAlias = i < extendsSchemes.length ?
extendsSchemes[i] : extendsSchemes[0];
@@ -1327,11 +1331,20 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
String pfqn, String psn, String scheme, boolean hasSuper, boolean
component,
Collection options, ComponentModel
model) {
-try (Writer w = new StringWriter()) {
+Instant start = Instant.now();
+try {
boolean extended = model.isApi(); // if the component is api then
the generated configurer should be an extended configurer
-PropertyConfigurerGenerator.generatePropertyConfigurer(pn, cn, en,
pfqn, psn, hasSuper, component, extended, false,
-options, model, w);
-updateResource(sourcesOutputDir.toPath(), fqn.replace('.', '/') +
".java", w.toString());
+String source =
PropertyConfigurerGenerator.generatePropertyConfigurer(pn, cn, en, pfqn, psn,
hasSuper, component,
+extended, false,
+options, model);
+
+Instant end = Instant.now();
+
+Duration duration = Duration.between(start, end);
+
+getLog().info("Generated code 1 in: " + duration.toMillis());
+
+updateResource(sourcesOutputDir.toPath(), fqn.replace('.', '/') +
".java", source);
} catch (Exception e) {
throw new RuntimeException("Unable to generate source code file: "
+ fqn + ": " + e.getMessage(), e);
}
diff --git
[camel] 06/07: (chores) camel-maven-package-plugin: removed unused method parameters
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 e413bb96f8d939619514b4adc4cf20508c101a25
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 16:19:23 2022 +0100
(chores) camel-maven-package-plugin: removed unused method parameters
---
.../packaging/GenerateEndpointUriFactoryMojo.java | 5 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 93 ++
.../camel/maven/packaging/UpdateReadmeMojo.java| 14 ++--
3 files changed, 53 insertions(+), 59 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
index 164f147..cce9263 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
@@ -126,7 +126,7 @@ public class GenerateEndpointUriFactoryMojo extends
AbstractGeneratorMojo {
getLog().debug("Generating endpoint-uri-factory: " +
model.getScheme());
String fqn = model.getJavaType();
-generateEndpointUriFactory(fqn, fqn, model, sourcesOutputDir);
+generateEndpointUriFactory(fqn, model, sourcesOutputDir);
int pos = fqn.lastIndexOf('.');
String pn = fqn.substring(0, pos);
@@ -153,8 +153,7 @@ public class GenerateEndpointUriFactoryMojo extends
AbstractGeneratorMojo {
}
@Deprecated
-private void generateEndpointUriFactory(
-String fqn, String targetFqn, ComponentModel model, File
outputDir) {
+private void generateEndpointUriFactory(String targetFqn, ComponentModel
model, File outputDir) {
int pos = targetFqn.lastIndexOf('.');
String pn = targetFqn.substring(0, pos);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
index b518738..d4af088 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
@@ -156,7 +156,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
// we want them to be sorted
for (ClassInfo element : coreElements) {
-processModelClass(element, null);
+processModelClass(element);
}
// spring elements
@@ -175,11 +175,11 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
}
for (ClassInfo element : springElements) {
-processModelClass(element, null);
+processModelClass(element);
}
}
-private void processModelClass(ClassInfo element, Set
propertyPlaceholderDefinitions) {
+private void processModelClass(ClassInfo element) {
// skip abstract classes
if (Modifier.isAbstract(element.flags())) {
return;
@@ -302,7 +302,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
XmlAttribute attribute =
fieldElement.getAnnotation(XmlAttribute.class);
if (attribute != null) {
boolean skip = processAttribute(originalClassType,
classElement, fieldElement, fieldName, attribute,
-eipOptions, prefix, modelName);
+eipOptions, prefix);
if (skip) {
continue;
}
@@ -310,7 +310,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
XmlValue value = fieldElement.getAnnotation(XmlValue.class);
if (value != null) {
-processValue(originalClassType, classElement,
fieldElement, fieldName, value, eipOptions, prefix,
+processValue(originalClassType, classElement,
fieldElement, fieldName, eipOptions, prefix,
modelName);
}
@@ -329,7 +329,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
if (elementRef != null) {
// special for routes
-processRoutes(originalClassType, elementRef, fieldElement,
fieldName, eipOptions, prefix);
+processRoutes(originalClassType, fieldElement, fieldName,
eipOptions);
// special for outputs
processOutputs(originalClassType, elementRef,
fieldElement, fieldName,
[camel] 07/07: (chores) camel-package-maven-plugin: remove unused code
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 c9e6c15b07e16ad45addd9f20d946325cde8595b
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 16:36:48 2022 +0100
(chores) camel-package-maven-plugin: remove unused code
---
.../java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java| 7 ---
.../org/apache/camel/maven/packaging/generics/GenericsUtil.java| 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index d03fc6b..e755cf6 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -447,7 +447,6 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
String kind)
throws MojoExecutionException {
getLog().debug("updateHeader " + file);
-final String linkSuffix = "-" + kind;
if (model == null || !file.exists()) {
return false;
}
@@ -895,10 +894,4 @@ public class UpdateReadmeMojo extends
AbstractGeneratorMojo {
private boolean isFailFast() {
return failFast != null && failFast;
}
-
-private String wrapEnumValues(List enumValues) {
-// comma to space so we can wrap words (which uses space)
-return String.join(", ", enumValues);
-}
-
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
index a18bbac..7cc64e0 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
@@ -708,7 +708,7 @@ public final class GenericsUtil {
Type[] typeArguments = resolveTypeArguments(directSubclass,
actualType);
Type directSubtype = new
OwbParametrizedTypeImpl(directSubclass.getDeclaringClass(), directSubclass,
typeArguments);
return resolveTypeVariable(variable, directSubtype, seen);
-} else { // if (declaringClass.isAssignableFrom(actualClass))
+} else {
Type genericSuperclass = getGenericSuperclass(actualClass,
declaringClass);
if (genericSuperclass == null) {
return variable;
[camel] 03/07: (chores) camel-maven-package-plugin: minor refactoring to simplify the code
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 b862247ec9a7711b6664068382394a92132721c7
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 15:14:37 2022 +0100
(chores) camel-maven-package-plugin: minor refactoring to simplify the code
---
.../packaging/EndpointSchemaGeneratorMojo.java | 247 -
.../camel/maven/packaging/SchemaGeneratorMojo.java | 3 +-
2 files changed, 140 insertions(+), 110 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 2836a5a..dbec27f 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -149,15 +149,8 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
}
}
// make sure we sort the classes in case one inherit from the other
-classes.sort((c1, c2) -> {
-if (c1.isAssignableFrom(c2)) {
-return -1;
-} else if (c2.isAssignableFrom(c1)) {
-return +1;
-} else {
-return c1.getName().compareTo(c2.getName());
-}
-});
+classes.sort((c1, c2) -> compareClasses(c1, c2));
+
Map models = new HashMap<>();
for (Class classElement : classes) {
UriEndpoint uriEndpoint =
classElement.getAnnotation(UriEndpoint.class);
@@ -181,39 +174,54 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
String[] schemes = scheme.split(",");
String[] titles = title.split(",");
String[] extendsSchemes = extendsScheme.split(",");
-for (int i = 0; i < schemes.length; i++) {
-final String alias = schemes[i];
-final String extendsAlias = i < extendsSchemes.length ?
extendsSchemes[i] : extendsSchemes[0];
-String aTitle = i < titles.length ? titles[i] : titles[0];
-
-// some components offer a secure alternative which we need
-// to amend the title accordingly
-if (secureAlias(schemes[0], alias)) {
-aTitle += " (Secure)";
-}
-final String aliasTitle = aTitle;
-
-ComponentModel parentData = null;
-Class superclass = classElement.getSuperclass();
-if (superclass != null) {
-parentData = models.get(superclass);
-if (parentData == null) {
-UriEndpoint parentUriEndpoint =
superclass.getAnnotation(UriEndpoint.class);
-if (parentUriEndpoint != null) {
-String parentScheme =
parentUriEndpoint.scheme().split(",")[0];
-String superClassName = superclass.getName();
-String packageName = superClassName.substring(0,
superClassName.lastIndexOf('.'));
-String fileName = packageName.replace('.', '/') +
"/" + parentScheme + ".json";
-String json = loadResource(fileName);
-parentData =
JsonMapper.generateComponentModel(json);
-}
+
+processSchemas(models, classElement, uriEndpoint, label, schemes,
titles, extendsSchemes);
+}
+}
+
+private void processSchemas(Map models, Class
classElement, UriEndpoint uriEndpoint, String label, String[] schemes, String[]
titles, String[] extendsSchemes) {
+for (int i = 0; i < schemes.length; i++) {
+final String alias = schemes[i];
+final String extendsAlias = i < extendsSchemes.length ?
extendsSchemes[i] : extendsSchemes[0];
+String aTitle = i < titles.length ? titles[i] : titles[0];
+
+// some components offer a secure alternative which we need
+// to amend the title accordingly
+if (secureAlias(schemes[0], alias)) {
+aTitle += " (Secure)";
+}
+final String aliasTitle = aTitle;
+
+ComponentModel parentData = null;
+Class superclass = classElement.getSuperclass();
+if (superclass != null) {
+parentData = models.get(superclass);
+if (parentData == null) {
+UriEndpoint parentUriEndpoint =
superclass.getAnnotation(UriEndpoint.class);
+if (parentUriEndpoint != null) {
+String parentScheme =
[camel] 01/07: Regen for commit faa13b988a017914003d1375d937d8ebe42650cb
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 7afcdca7d4f1e6fe6429fd63a70f15137fe183a2
Author: davsclaus
AuthorDate: Thu Feb 10 16:00:27 2022 +
Regen for commit faa13b988a017914003d1375d937d8ebe42650cb
Signed-off-by: GitHub
---
.../org/apache/camel/catalog/main/camel-main-configuration-metadata.json | 1 -
1 file changed, 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 6a52b32..e5dc1a5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -132,7 +132,6 @@
{ "name": "camel.faulttolerance.timeoutPoolSize", "description":
"Configures the pool size of the thread pool when timeout is enabled. Default
value is 10.", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"integer", "javaType": "java.lang.Integer", "defaultValue": 10 },
{ "name": "camel.faulttolerance.timeoutScheduledExecutorServiceRef",
"description": "References to a custom thread pool to use when timeout is
enabled", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties", "type":
"string", "javaType": "java.lang.String" },
{ "name": "camel.health.consumersEnabled", "description": "Whether
consumers health check is enabled", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": true },
-{ "name": "camel.health.contextEnabled", "description": "Whether context
health check is enabled", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": true },
{ "name": "camel.health.enabled", "description": "Whether health check is
enabled globally", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": true },
{ "name": "camel.health.excludePattern", "description": "Pattern to
exclude health checks from being invoked by Camel when checking healths.
Multiple patterns can be separated by comma.", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
{ "name": "camel.health.exposureLevel", "description": "Sets the level of
details to exposure as result of invoking health checks. There are the
following levels: full, default, oneline The full level will include all
details and status from all the invoked health checks. The default level will
report UP if everything is okay, and only include detailed information for
health checks that was DOWN. The oneline level will only report either UP or
DOWN.", "sourceType": "org.apache.camel. [...]
[camel] 02/07: (chores) camel-maven-package-plugin: removed unused exceptions
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 7cbcc4fcae27179145c2cf090649b1bd85258a82
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 15:13:34 2022 +0100
(chores) camel-maven-package-plugin: removed unused exceptions
---
.../apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 3 +--
.../apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java| 2 +-
.../apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java | 5 ++---
.../java/org/apache/camel/maven/packaging/PackageComponentMojo.java | 2 +-
.../java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java | 2 +-
.../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java| 2 +-
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 364846b..21affac 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -424,8 +424,7 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
}
private void generateConfigurer(
-String fqn, String targetFqn, List options, File
outputDir, boolean extended, boolean bootstrap)
-throws IOException {
+String fqn, String targetFqn, List options, File
outputDir, boolean extended, boolean bootstrap) {
int pos = targetFqn.lastIndexOf('.');
String pn = targetFqn.substring(0, pos);
String cn = targetFqn.substring(pos + 1) + "Configurer";
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 4e6a56b..2836a5a 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -136,7 +136,7 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
executeUriEndpoint();
}
-private void executeUriEndpoint() throws MojoExecutionException,
MojoFailureException {
+private void executeUriEndpoint() {
List> classes = new ArrayList<>();
for (AnnotationInstance ai : getIndex().getAnnotations(URI_ENDPOINT)) {
Class classElement =
loadClass(ai.target().asClass().name().toString());
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
index df8079b..3065073 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
@@ -89,7 +89,7 @@ public class GenerateEndpointUriFactoryMojo extends
AbstractGeneratorMojo {
executeComponent(files);
}
-private void executeComponent(Map> jsonFiles)
throws MojoExecutionException, MojoFailureException {
+private void executeComponent(Map> jsonFiles)
throws MojoExecutionException {
// find the component names
Set componentNames = new TreeSet<>();
findComponentNames(buildDir, componentNames);
@@ -155,8 +155,7 @@ public class GenerateEndpointUriFactoryMojo extends
AbstractGeneratorMojo {
@Deprecated
private void generateEndpointUriFactory(
-String fqn, String targetFqn, ComponentModel model, File outputDir)
-throws IOException {
+String fqn, String targetFqn, ComponentModel model, File
outputDir) {
int pos = targetFqn.lastIndexOf('.');
String pn = targetFqn.substring(0, pos);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index 0f05709..4293d38 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++
[camel] branch main created (now c9e6c15)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. at c9e6c15 (chores) camel-package-maven-plugin: remove unused code This branch includes the following new commits: new 7afcdca Regen for commit faa13b988a017914003d1375d937d8ebe42650cb new 7cbcc4f (chores) camel-maven-package-plugin: removed unused exceptions new b862247 (chores) camel-maven-package-plugin: minor refactoring to simplify the code new bb147f8 (chores) camel-package-maven-plugin: minor performance related cleanup new e3473d9 (chores) camel-package-maven-plugin: additional updates to make it slightly faster new e413bb9 (chores) camel-maven-package-plugin: removed unused method parameters new c9e6c15 (chores) camel-package-maven-plugin: remove unused code The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch regen_bot updated (b0d5c04 -> 0896e9e)
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 b0d5c04 Regen for commit 811139586faa87cff5de9c4747f88bbf9e41f87b omit 8111395 CAMEL-17631: camel-component-maven-plugin - Should generate for InvokeOnHeader omit 135f40c Regen for commit 77cca6637e46a3df2cc852beadf6e6449fdcdc8a add 0896e9e Regen for commit 92c69a04d90ba590ad5946cc0abeb5549ff4c92a 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 (b0d5c04) \ N -- N -- N refs/heads/regen_bot (0896e9e) 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: .../org/apache/camel/maven/component/GenerateComponentMojo.java | 6 -- 1 file changed, 6 deletions(-)
[GitHub] [camel] oscerd merged pull request #6925: Generated sources regen
oscerd merged pull request #6925: URL: https://github.com/apache/camel/pull/6925 -- 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 #6925: Generated sources regen
github-actions[bot] opened a new pull request #6925: URL: https://github.com/apache/camel/pull/6925 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 05/06: (chores) camel-maven-package-plugin: removed unused method parameters
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e413bb96f8d939619514b4adc4cf20508c101a25
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 16:19:23 2022 +0100
(chores) camel-maven-package-plugin: removed unused method parameters
---
.../packaging/GenerateEndpointUriFactoryMojo.java | 5 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 93 ++
.../camel/maven/packaging/UpdateReadmeMojo.java| 14 ++--
3 files changed, 53 insertions(+), 59 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
index 164f147..cce9263 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
@@ -126,7 +126,7 @@ public class GenerateEndpointUriFactoryMojo extends
AbstractGeneratorMojo {
getLog().debug("Generating endpoint-uri-factory: " +
model.getScheme());
String fqn = model.getJavaType();
-generateEndpointUriFactory(fqn, fqn, model, sourcesOutputDir);
+generateEndpointUriFactory(fqn, model, sourcesOutputDir);
int pos = fqn.lastIndexOf('.');
String pn = fqn.substring(0, pos);
@@ -153,8 +153,7 @@ public class GenerateEndpointUriFactoryMojo extends
AbstractGeneratorMojo {
}
@Deprecated
-private void generateEndpointUriFactory(
-String fqn, String targetFqn, ComponentModel model, File
outputDir) {
+private void generateEndpointUriFactory(String targetFqn, ComponentModel
model, File outputDir) {
int pos = targetFqn.lastIndexOf('.');
String pn = targetFqn.substring(0, pos);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
index b518738..d4af088 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SchemaGeneratorMojo.java
@@ -156,7 +156,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
// we want them to be sorted
for (ClassInfo element : coreElements) {
-processModelClass(element, null);
+processModelClass(element);
}
// spring elements
@@ -175,11 +175,11 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
}
for (ClassInfo element : springElements) {
-processModelClass(element, null);
+processModelClass(element);
}
}
-private void processModelClass(ClassInfo element, Set
propertyPlaceholderDefinitions) {
+private void processModelClass(ClassInfo element) {
// skip abstract classes
if (Modifier.isAbstract(element.flags())) {
return;
@@ -302,7 +302,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
XmlAttribute attribute =
fieldElement.getAnnotation(XmlAttribute.class);
if (attribute != null) {
boolean skip = processAttribute(originalClassType,
classElement, fieldElement, fieldName, attribute,
-eipOptions, prefix, modelName);
+eipOptions, prefix);
if (skip) {
continue;
}
@@ -310,7 +310,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
XmlValue value = fieldElement.getAnnotation(XmlValue.class);
if (value != null) {
-processValue(originalClassType, classElement,
fieldElement, fieldName, value, eipOptions, prefix,
+processValue(originalClassType, classElement,
fieldElement, fieldName, eipOptions, prefix,
modelName);
}
@@ -329,7 +329,7 @@ public class SchemaGeneratorMojo extends
AbstractGeneratorMojo {
if (elementRef != null) {
// special for routes
-processRoutes(originalClassType, elementRef, fieldElement,
fieldName, eipOptions, prefix);
+processRoutes(originalClassType, fieldElement, fieldName,
eipOptions);
// special for outputs
processOutputs(originalClassType, elementRef,
fieldElement, fieldName,
[camel] 01/06: (chores) camel-maven-package-plugin: removed unused exceptions
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7cbcc4fcae27179145c2cf090649b1bd85258a82
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 15:13:34 2022 +0100
(chores) camel-maven-package-plugin: removed unused exceptions
---
.../apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 3 +--
.../apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java| 2 +-
.../apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java | 5 ++---
.../java/org/apache/camel/maven/packaging/PackageComponentMojo.java | 2 +-
.../java/org/apache/camel/maven/packaging/PrepareAssemblyMojo.java | 2 +-
.../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java| 2 +-
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 364846b..21affac 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -424,8 +424,7 @@ public abstract class AbstractGenerateConfigurerMojo
extends AbstractGeneratorMo
}
private void generateConfigurer(
-String fqn, String targetFqn, List options, File
outputDir, boolean extended, boolean bootstrap)
-throws IOException {
+String fqn, String targetFqn, List options, File
outputDir, boolean extended, boolean bootstrap) {
int pos = targetFqn.lastIndexOf('.');
String pn = targetFqn.substring(0, pos);
String cn = targetFqn.substring(pos + 1) + "Configurer";
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 4e6a56b..2836a5a 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -136,7 +136,7 @@ public class EndpointSchemaGeneratorMojo extends
AbstractGeneratorMojo {
executeUriEndpoint();
}
-private void executeUriEndpoint() throws MojoExecutionException,
MojoFailureException {
+private void executeUriEndpoint() {
List> classes = new ArrayList<>();
for (AnnotationInstance ai : getIndex().getAnnotations(URI_ENDPOINT)) {
Class classElement =
loadClass(ai.target().asClass().name().toString());
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
index df8079b..3065073 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateEndpointUriFactoryMojo.java
@@ -89,7 +89,7 @@ public class GenerateEndpointUriFactoryMojo extends
AbstractGeneratorMojo {
executeComponent(files);
}
-private void executeComponent(Map> jsonFiles)
throws MojoExecutionException, MojoFailureException {
+private void executeComponent(Map> jsonFiles)
throws MojoExecutionException {
// find the component names
Set componentNames = new TreeSet<>();
findComponentNames(buildDir, componentNames);
@@ -155,8 +155,7 @@ public class GenerateEndpointUriFactoryMojo extends
AbstractGeneratorMojo {
@Deprecated
private void generateEndpointUriFactory(
-String fqn, String targetFqn, ComponentModel model, File outputDir)
-throws IOException {
+String fqn, String targetFqn, ComponentModel model, File
outputDir) {
int pos = targetFqn.lastIndexOf('.');
String pn = targetFqn.substring(0, pos);
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index 0f05709..4293d38 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++
[camel] 06/06: (chores) camel-package-maven-plugin: remove unused code
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c9e6c15b07e16ad45addd9f20d946325cde8595b
Author: Otavio Rodolfo Piske
AuthorDate: Thu Feb 10 16:36:48 2022 +0100
(chores) camel-package-maven-plugin: remove unused code
---
.../java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java| 7 ---
.../org/apache/camel/maven/packaging/generics/GenericsUtil.java| 2 +-
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
index d03fc6b..e755cf6 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateReadmeMojo.java
@@ -447,7 +447,6 @@ public class UpdateReadmeMojo extends AbstractGeneratorMojo
{
String kind)
throws MojoExecutionException {
getLog().debug("updateHeader " + file);
-final String linkSuffix = "-" + kind;
if (model == null || !file.exists()) {
return false;
}
@@ -895,10 +894,4 @@ public class UpdateReadmeMojo extends
AbstractGeneratorMojo {
private boolean isFailFast() {
return failFast != null && failFast;
}
-
-private String wrapEnumValues(List enumValues) {
-// comma to space so we can wrap words (which uses space)
-return String.join(", ", enumValues);
-}
-
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
index a18bbac..7cc64e0 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/generics/GenericsUtil.java
@@ -708,7 +708,7 @@ public final class GenericsUtil {
Type[] typeArguments = resolveTypeArguments(directSubclass,
actualType);
Type directSubtype = new
OwbParametrizedTypeImpl(directSubclass.getDeclaringClass(), directSubclass,
typeArguments);
return resolveTypeVariable(variable, directSubtype, seen);
-} else { // if (declaringClass.isAssignableFrom(actualClass))
+} else {
Type genericSuperclass = getGenericSuperclass(actualClass,
declaringClass);
if (genericSuperclass == null) {
return variable;
