[camel] branch main updated: CAMEL-17538: Upgrade to latest MicroProfile component releases
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 7096caa CAMEL-17538: Upgrade to latest MicroProfile component releases 7096caa is described below commit 7096caa4863791b5573eb1d66b4b70fb4ad0d0ab Author: James Netherton AuthorDate: Mon Jan 24 07:54:38 2022 + CAMEL-17538: Upgrade to latest MicroProfile component releases --- parent/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6aeb3b0..48e02ee 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -485,9 +485,9 @@ 1.7.33 1.7.33 4.3.5 -2.4.2 -3.0.3 -3.1.1 +2.8.2 +3.0.4 +3.1.2 5.2.1 1.30 2.3
[camel] branch regen_bot updated (fed48b3 -> 00cfc5f)
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 fed48b3 (chores) camel-api-component-maven-plugin: removed unused exceptions (#6811) add 00cfc5f Upgrade AWS SDK v2 to version 2.17.116 No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel-k] djencks commented on pull request #2899: WIP See #2898 Generate CRD API docs as AsciiDoc
djencks commented on pull request #2899: URL: https://github.com/apache/camel-k/pull/2899#issuecomment-1019780634 I rearranged the templates a bit so that the RHS menu makes more sense, and each package is on a separate page. Hopefully the preview will build and show the result. There's at least one link that doesn't quite work as expected due to the go array notation `[]` conflicting with AsciiDoc xref syntax. I think this is fixable. There are perhaps 4 xrefs from the kamelets api page to the camel-k api page. I wonder how appropriate this is since the idea seems to be to make kamelets rather independent of camel-k. Would it be a better idea to duplicate the common types in both packages? Before I fixed the references the errors were: ``` W0123 22:12:45.509224 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.SourceSpec W0123 22:12:45.509278 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.Template W0123 22:12:45.509306 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.Flow W0123 22:12:45.509601 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.IntegrationSpec W0123 22:12:45.510674 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.RawMessage W0123 22:12:45.511144 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.RawMessage W0123 22:12:45.511339 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.RawMessage W0123 22:12:45.511459 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.RawMessage W0123 22:12:45.511851 32245 main.go:459] not found external link source for type encoding/json.Number W0123 22:12:45.511897 32245 main.go:459] not found external link source for type encoding/json.Number W0123 22:12:45.512027 32245 main.go:459] not found external link source for type encoding/json.Number W0123 22:12:45.513153 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.IntegrationSpec W0123 22:12:45.514135 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.SourceSpec W0123 22:12:45.514165 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.Template W0123 22:12:45.514199 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.Flow ``` The encoding/json.Number errors were already present and I don't know how to fix them. -- 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 (fb83a04 -> fed48b3)
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 fb83a04 Polished title on JFR add fca214d Fixed camel-jbang detecting platform-http auto downloaded registering the http vertx router could lead to component creation circular dependency issue. add fed48b3 (chores) camel-api-component-maven-plugin: removed unused exceptions (#6811) No new revisions were added by this update. Summary of changes: .../camel/main/DependencyDownloaderComponentResolver.java | 7 +-- .../main/java/org/apache/camel/main/VertxHttpServer.java| 13 +++-- .../apache/camel/maven/AbstractApiMethodGeneratorMojo.java | 6 +++--- 3 files changed, 15 insertions(+), 11 deletions(-)
[GitHub] [camel-k] djencks commented on pull request #2899: WIP See #2898 Generate CRD API docs as AsciiDoc
djencks commented on pull request #2899: URL: https://github.com/apache/camel-k/pull/2899#issuecomment-1019776987 I rearranged the templates a bit so that the RHS menu makes more sense, and each package is on a separate page. Hopefully the preview will build and show the result. There's at least one link that doesn't quite work as expected due to the go array notation `[]` conflicting with AsciiDoc xref syntax. I think this is fixable. There are perhaps 4 xrefs from the kamelets api page to the camel-k api page. I wonder how appropriate this is since the idea seems to be to make kamelets rather independent of camel-k. Would it be a better idea to duplicate the common types in both packages? Before I fixed the references the errors were: ``` W0123 22:12:45.509224 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.SourceSpec W0123 22:12:45.509278 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.Template W0123 22:12:45.509306 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.Flow W0123 22:12:45.509601 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.IntegrationSpec W0123 22:12:45.510674 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.RawMessage W0123 22:12:45.511144 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.RawMessage W0123 22:12:45.511339 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.RawMessage W0123 22:12:45.511459 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.RawMessage W0123 22:12:45.511851 32245 main.go:459] not found external link source for type encoding/json.Number W0123 22:12:45.511897 32245 main.go:459] not found external link source for type encoding/json.Number W0123 22:12:45.512027 32245 main.go:459] not found external link source for type encoding/json.Number W0123 22:12:45.513153 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.IntegrationSpec W0123 22:12:45.514135 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.SourceSpec W0123 22:12:45.514165 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.Template W0123 22:12:45.514199 32245 main.go:459] not found external link source for type github.com/apache/camel-k/pkg/apis/camel/v1.Flow ``` The encoding/json.Number errors were already present and I don't know how to fix them. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Upgrade AWS SDK v2 to version 2.17.116
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 00cfc5f Upgrade AWS SDK v2 to version 2.17.116 00cfc5f is described below commit 00cfc5f7125ce3d733a9bba70c5ad514bd046b36 Author: Andrea Cosentino AuthorDate: Mon Jan 24 07:17:16 2022 +0100 Upgrade AWS SDK v2 to version 2.17.116 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4a59e92..6aeb3b0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -80,7 +80,7 @@ 1.11.0 1.11.0 4.1.1 -2.17.115 +2.17.116 2.6.1 1.2.14 2.13.1
[camel-kafka-connector] branch camel-kafka-connector-0.11.x updated: global util functions for compatibility table refs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-kafka-connector-0.11.x
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/camel-kafka-connector-0.11.x
by this push:
new c7f2729 global util functions for compatibility table refs
c7f2729 is described below
commit c7f272924f4f3e13573f76c2096ab7283e901e48
Author: David Jencks
AuthorDate: Fri Jan 21 18:04:46 2022 -0800
global util functions for compatibility table refs
sort compatibility table
fix branch method
---
docs/modules/ROOT/examples/js/ckc.js | 10 +-
docs/modules/ROOT/pages/index.adoc | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/docs/modules/ROOT/examples/js/ckc.js
b/docs/modules/ROOT/examples/js/ckc.js
index c0250db..ae9b5fe 100644
--- a/docs/modules/ROOT/examples/js/ckc.js
+++ b/docs/modules/ROOT/examples/js/ckc.js
@@ -18,13 +18,5 @@
module.exports = {
branch: (version) => version === 'next' ?
'https://github.com/apache/camel-kafka-connector[main]' :
-
`https://github.com/apache/camel-kafka-connectortree/camel-kafka-connector-${version}[camel-kafka-connector-${version}]`,
-
- camelRef: (version, docVersion) =>
`xref:${docVersion}@components:ROOT:index.adoc[${version}]`,
-
- ckcRef: (version, docVersion) =>
`xref:${version}@camel-kafka-connector:ROOT:index.adoc[${docVersion}]`,
-
- kafkaRef: (version, docVersion) =>
`https://kafka.apache.org/${docVersion}/documentation.html[${version}]`,
-
- kameletsRef: (version, docVersion) =>
`xref:${docVersion}@camel-kamelets:ROOT:index.adoc[${version}]`,
+
`https://github.com/apache/camel-kafka-connector/tree/camel-kafka-connector-${version}[camel-kafka-connector-${version}]`,
}
\ No newline at end of file
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 6e57bae..0b2ebb4 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -41,4 +41,4 @@ The basic idea is reusing the available Camel components as
Kafka sink and sourc
|===
//cannot use top level index.adoc as the page with the query is always omitted.
-indexTable::[version="*",relative="reference/index.adoc",cellformats="ckc.ckcRef(pageComponentVersion,
pageComponentDisplayVersion)|ckc.camelRef(camelVersion,
camelDocsVersion)|ckc.kameletsRef(camelKameletsVersion,
camelKameletsDocsVersion)|ckc.kafkaRef(kafkaVersion,
kafkaDocsVersion)|lts|ckc.branch(pageComponentVersion)", requires={requires}]
+indexTable::[version="*",relative="reference/index.adoc",cellformats="util.ckcRef(pageComponentDisplayVersion,
pageComponentVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.kameletsRef(camelKameletsVersion,
camelKameletsDocsVersion)|util.kafkaRef(kafkaVersion,
kafkaDocsVersion)|lts|ckc.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
[GitHub] [camel-kafka-connector] oscerd merged pull request #1329: camel-website #701 camel-kafka-connector RI table improvement (0.11.x)
oscerd merged pull request #1329: URL: https://github.com/apache/camel-kafka-connector/pull/1329 -- 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-kafka-connector] oscerd merged pull request #1328: camel-website #701 camel-kafka-connector RI table improvement (1.0.x)
oscerd merged pull request #1328: URL: https://github.com/apache/camel-kafka-connector/pull/1328 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch camel-kafka-connector-1.0.x updated: global util functions for compatibility table refs
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-kafka-connector-1.0.x
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
The following commit(s) were added to refs/heads/camel-kafka-connector-1.0.x by
this push:
new 3a6333e global util functions for compatibility table refs
3a6333e is described below
commit 3a6333e9e9ab2ae4c49e355e46977db27eb717f6
Author: David Jencks
AuthorDate: Fri Jan 21 18:04:46 2022 -0800
global util functions for compatibility table refs
sort compatibility table
fix branch method
---
docs/modules/ROOT/examples/js/ckc.js | 10 +-
docs/modules/ROOT/pages/index.adoc | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/docs/modules/ROOT/examples/js/ckc.js
b/docs/modules/ROOT/examples/js/ckc.js
index c0250db..ae9b5fe 100644
--- a/docs/modules/ROOT/examples/js/ckc.js
+++ b/docs/modules/ROOT/examples/js/ckc.js
@@ -18,13 +18,5 @@
module.exports = {
branch: (version) => version === 'next' ?
'https://github.com/apache/camel-kafka-connector[main]' :
-
`https://github.com/apache/camel-kafka-connectortree/camel-kafka-connector-${version}[camel-kafka-connector-${version}]`,
-
- camelRef: (version, docVersion) =>
`xref:${docVersion}@components:ROOT:index.adoc[${version}]`,
-
- ckcRef: (version, docVersion) =>
`xref:${version}@camel-kafka-connector:ROOT:index.adoc[${docVersion}]`,
-
- kafkaRef: (version, docVersion) =>
`https://kafka.apache.org/${docVersion}/documentation.html[${version}]`,
-
- kameletsRef: (version, docVersion) =>
`xref:${docVersion}@camel-kamelets:ROOT:index.adoc[${version}]`,
+
`https://github.com/apache/camel-kafka-connector/tree/camel-kafka-connector-${version}[camel-kafka-connector-${version}]`,
}
\ No newline at end of file
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 53a82ae..e6b7260 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -41,4 +41,4 @@ The basic idea is reusing the available Camel components as
Kafka sink and sourc
|===
//cannot use top level index.adoc as the page with the query is always omitted.
-indexTable::[version="*",relative="reference/index.adoc",cellformats="ckc.ckcRef(pageComponentVersion,
pageComponentDisplayVersion)|ckc.camelRef(camelVersion,
camelDocsVersion)|ckc.kameletsRef(camelKameletsVersion,
camelKameletsDocsVersion)|ckc.kafkaRef(kafkaVersion,
kafkaDocsVersion)|lts|ckc.branch(pageComponentVersion)", requires={requires}]
+indexTable::[version="*",relative="reference/index.adoc",cellformats="util.ckcRef(pageComponentDisplayVersion,
pageComponentVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.kameletsRef(camelKameletsVersion,
camelKameletsDocsVersion)|util.kafkaRef(kafkaVersion,
kafkaDocsVersion)|lts|ckc.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
[GitHub] [camel-kafka-connector] oscerd merged pull request #1327: camel-website #701 camel-kafka-connector RI table improvement (main)
oscerd merged pull request #1327: URL: https://github.com/apache/camel-kafka-connector/pull/1327 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] branch main updated: global util functions for compatibility table refs
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-kafka-connector.git
The following commit(s) were added to refs/heads/main by this push:
new aaa1eec global util functions for compatibility table refs
aaa1eec is described below
commit aaa1eecd09cc0d7c83f80c03d0bdd7573400995d
Author: David Jencks
AuthorDate: Fri Jan 21 18:04:46 2022 -0800
global util functions for compatibility table refs
sort compatibility table
fix branch method
---
docs/modules/ROOT/examples/js/ckc.js | 10 +-
docs/modules/ROOT/pages/index.adoc | 2 +-
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/docs/modules/ROOT/examples/js/ckc.js
b/docs/modules/ROOT/examples/js/ckc.js
index c0250db..ae9b5fe 100644
--- a/docs/modules/ROOT/examples/js/ckc.js
+++ b/docs/modules/ROOT/examples/js/ckc.js
@@ -18,13 +18,5 @@
module.exports = {
branch: (version) => version === 'next' ?
'https://github.com/apache/camel-kafka-connector[main]' :
-
`https://github.com/apache/camel-kafka-connectortree/camel-kafka-connector-${version}[camel-kafka-connector-${version}]`,
-
- camelRef: (version, docVersion) =>
`xref:${docVersion}@components:ROOT:index.adoc[${version}]`,
-
- ckcRef: (version, docVersion) =>
`xref:${version}@camel-kafka-connector:ROOT:index.adoc[${docVersion}]`,
-
- kafkaRef: (version, docVersion) =>
`https://kafka.apache.org/${docVersion}/documentation.html[${version}]`,
-
- kameletsRef: (version, docVersion) =>
`xref:${docVersion}@camel-kamelets:ROOT:index.adoc[${version}]`,
+
`https://github.com/apache/camel-kafka-connector/tree/camel-kafka-connector-${version}[camel-kafka-connector-${version}]`,
}
\ No newline at end of file
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 53a82ae..e6b7260 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -41,4 +41,4 @@ The basic idea is reusing the available Camel components as
Kafka sink and sourc
|===
//cannot use top level index.adoc as the page with the query is always omitted.
-indexTable::[version="*",relative="reference/index.adoc",cellformats="ckc.ckcRef(pageComponentVersion,
pageComponentDisplayVersion)|ckc.camelRef(camelVersion,
camelDocsVersion)|ckc.kameletsRef(camelKameletsVersion,
camelKameletsDocsVersion)|ckc.kafkaRef(kafkaVersion,
kafkaDocsVersion)|lts|ckc.branch(pageComponentVersion)", requires={requires}]
+indexTable::[version="*",relative="reference/index.adoc",cellformats="util.ckcRef(pageComponentDisplayVersion,
pageComponentVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.kameletsRef(camelKameletsVersion,
camelKameletsDocsVersion)|util.kafkaRef(kafkaVersion,
kafkaDocsVersion)|lts|ckc.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
[camel-k-runtime] branch release-1.11.x updated: set camel-k docs version
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch release-1.11.x in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/release-1.11.x by this push: new 0b1039f set camel-k docs version 0b1039f is described below commit 0b1039f496d2d9ba2255dd61829bca16119097fc Author: David Jencks AuthorDate: Fri Jan 21 11:48:19 2022 -0800 set camel-k docs version --- docs/antora.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/antora.yml b/docs/antora.yml index e7005f3..2601802 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -18,4 +18,4 @@ # The main part of this distributed component is in camel-k docs name: camel-k -version: next +version: 1.8.x
[GitHub] [camel-k-runtime] oscerd merged pull request #782: set camel-k docs version
oscerd merged pull request #782: URL: https://github.com/apache/camel-k-runtime/pull/782 -- 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-kamelets] oscerd merged pull request #728: camel-website #701 camel-kamelets RI table setup (0.5.x)
oscerd merged pull request #728: URL: https://github.com/apache/camel-kamelets/pull/728 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch 0.5.x updated: RI table
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 0.5.x
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/0.5.x by this push:
new 7b9fc68 RI table
7b9fc68 is described below
commit 7b9fc68652e35fe82a00decceff72e87c1c7c4af
Author: David Jencks
AuthorDate: Fri Jan 21 16:15:04 2022 -0800
RI table
---
docs/antora.yml | 2 +-
docs/modules/ROOT/examples/js/kamelets.js | 7 ++-
docs/modules/ROOT/pages/index.adoc| 17 +
3 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 564a2e4..7e0ab0a 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -26,7 +26,7 @@ asciidoc:
attributes:
requires: "'util=camel-website-util,kamelets=xref:js/kamelets.js'"
-camel-k-version: 1.7.0 and next
+camel-k-version: 1.7.0
camel-k-docs-version: 1.7.x
camel-version: 3.12.0
camel-docs-version: 3.12.x
diff --git a/docs/modules/ROOT/examples/js/kamelets.js
b/docs/modules/ROOT/examples/js/kamelets.js
index bbc04da..5207830 100644
--- a/docs/modules/ROOT/examples/js/kamelets.js
+++ b/docs/modules/ROOT/examples/js/kamelets.js
@@ -112,7 +112,12 @@ module.exports = {
:type: ${type}
:propertycount: ${propertyCount}
`
- }
+ },
+
+// Compatibility table support
+ branch: (version) => version === 'next' ?
+'https://github.com/apache/camel-kamelets[main]' :
+`https://github.com/apache/camel-kamelets/tree/${version}[${version}]`,
}
function kameletPropertyList (definition) {
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 5a7ebfe..e8c944c 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -17,6 +17,23 @@ ifndef::prerelease[This release will not be updated, but
rather replaced by a ne
endif::[]
--
+== Compatibility Matrix
+
+[caption=]
+.Compatibility between Camel-K and related subprojects
+[width="100%",cols="4,2,2,2,1,3",options="header"]
+|===
+|Camel-Kamelets Version
+|Using Camel Version
+|Used by Camel-K Version
+|Used by Camel-Kafka-Connector Version
+|LTS Until
+|Branch
+|===
+
+//cannot use top level index.adoc as the page with the query is always omitted.
+indexTable::[version="*",relative="avro-deserialize-action.adoc",cellformats="util.kameletsRef(pageComponentDisplayVersion,
pageComponentVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.ckRef(camelKVersion,
camelKDocsVersion)|util.ckcRef(camelKafkaConnectorVersion,
camelKafkaConnectorDocsVersion)|lts|kamelets.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
+
This page contains the default Apache Camel Kamelets catalog.
Consult the
xref:{camel-k-docs-version}@camel-k::kamelets/kamelets-user.adoc[Kamelets User
Guide] for information about how to use these.
[GitHub] [camel-kamelets] oscerd merged pull request #727: camel-website #701 camel-kamelets RI table setup (0.6.x)
oscerd merged pull request #727: URL: https://github.com/apache/camel-kamelets/pull/727 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch 0.6.x updated: RI table
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 0.6.x
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/0.6.x by this push:
new 17eaa1b RI table
17eaa1b is described below
commit 17eaa1bf31e366bd375e209f8b82faaac34ba17b
Author: David Jencks
AuthorDate: Fri Jan 21 16:15:04 2022 -0800
RI table
---
docs/antora.yml | 4 ++--
docs/modules/ROOT/examples/js/kamelets.js | 7 ++-
docs/modules/ROOT/pages/index.adoc| 17 +
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index fea00a9..75c5a1a 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -29,7 +29,7 @@ asciidoc:
version-used: true
#camel-k-version: next
camel-k-docs-version: next
-camel-kafka-connector-version: Next (Prerelease)
-camel-kafka-connector-docs-version: next
+camel-kafka-connector-version: 1.0.x (LTS)
+camel-kafka-connector-docs-version: 1.0.x
camel-version: 3.12.0
camel-docs-version: 3.12.x
diff --git a/docs/modules/ROOT/examples/js/kamelets.js
b/docs/modules/ROOT/examples/js/kamelets.js
index bbc04da..5207830 100644
--- a/docs/modules/ROOT/examples/js/kamelets.js
+++ b/docs/modules/ROOT/examples/js/kamelets.js
@@ -112,7 +112,12 @@ module.exports = {
:type: ${type}
:propertycount: ${propertyCount}
`
- }
+ },
+
+// Compatibility table support
+ branch: (version) => version === 'next' ?
+'https://github.com/apache/camel-kamelets[main]' :
+`https://github.com/apache/camel-kamelets/tree/${version}[${version}]`,
}
function kameletPropertyList (definition) {
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 4e2df41..5215fad 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -26,6 +26,23 @@ ifndef::prerelease[This release will not be updated, but
rather replaced by a ne
endif::[]
--
+== Compatibility Matrix
+
+[caption=]
+.Compatibility between Camel-K and related subprojects
+[width="100%",cols="4,2,2,2,1,3",options="header"]
+|===
+|Camel-Kamelets Version
+|Using Camel Version
+|Used by Camel-K Version
+|Used by Camel-Kafka-Connector Version
+|LTS Until
+|Branch
+|===
+
+//cannot use top level index.adoc as the page with the query is always omitted.
+indexTable::[version="*",relative="avro-deserialize-action.adoc",cellformats="util.kameletsRef(pageComponentDisplayVersion,
pageComponentVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.ckRef(camelKVersion,
camelKDocsVersion)|util.ckcRef(camelKafkaConnectorVersion,
camelKafkaConnectorDocsVersion)|lts|kamelets.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
+
This page contains the default Apache Camel Kamelets catalog.
Consult the
xref:{camel-k-docs-version}@camel-k::kamelets/kamelets-user.adoc[Kamelets User
Guide] for information about how to use these.
[camel-kamelets] branch regen_bot updated (a6533dd -> 59277b5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. from a6533dd Restore Kamelets for development add 59277b5 RI table No new revisions were added by this update. Summary of changes: docs/modules/ROOT/examples/js/kamelets.js | 7 ++- docs/modules/ROOT/pages/index.adoc| 17 + 2 files changed, 23 insertions(+), 1 deletion(-)
[GitHub] [camel-kamelets] oscerd merged pull request #726: camel-website #701 camel-kamelets RI table setup (0.7.x)
oscerd merged pull request #726: URL: https://github.com/apache/camel-kamelets/pull/726 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] 02/02: RI table
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch 0.7.x
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit e0118d267609d818cb98d3f3a9c04bb1bcb5db54
Author: David Jencks
AuthorDate: Fri Jan 21 16:15:04 2022 -0800
RI table
---
docs/modules/ROOT/examples/js/kamelets.js | 7 ++-
docs/modules/ROOT/pages/index.adoc| 17 +
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/examples/js/kamelets.js
b/docs/modules/ROOT/examples/js/kamelets.js
index 549983c..2b8f2c8 100644
--- a/docs/modules/ROOT/examples/js/kamelets.js
+++ b/docs/modules/ROOT/examples/js/kamelets.js
@@ -111,7 +111,12 @@ module.exports = {
:type: ${type}
:propertycount: ${propertyCount}
`
- }
+ },
+
+// Compatibility table support
+ branch: (version) => version === 'next' ?
+'https://github.com/apache/camel-kamelets[main]' :
+`https://github.com/apache/camel-kamelets/tree/${version}[${version}]`,
}
function kameletPropertyList (definition) {
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 2d11bc2..4e73892 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -26,6 +26,23 @@ ifndef::prerelease[This release will not be updated, but
rather replaced by a ne
endif::[]
--
+== Compatibility Matrix
+
+[caption=]
+.Compatibility between Camel-K and related subprojects
+[width="100%",cols="4,2,2,2,1,3",options="header"]
+|===
+|Camel-Kamelets Version
+|Using Camel Version
+|Used by Camel-K Version
+|Used by Camel-Kafka-Connector Version
+|LTS Until
+|Branch
+|===
+
+//cannot use top level index.adoc as the page with the query is always omitted.
+indexTable::[version="*",relative="avro-deserialize-action.adoc",cellformats="util.kameletsRef(pageComponentDisplayVersion,
pageComponentVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.ckRef(camelKVersion,
camelKDocsVersion)|util.ckcRef(camelKafkaConnectorVersion,
camelKafkaConnectorDocsVersion)|lts|kamelets.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
+
This page contains the default Apache Camel Kamelets catalog.
Consult the
xref:{camel-k-docs-version}@camel-k::kamelets/kamelets-user.adoc[Kamelets User
Guide] for information about how to use these.
[camel-kamelets] branch 0.7.x updated (d5743eb -> e0118d2)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 0.7.x in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. from d5743eb [maven-release-plugin] prepare release v0.7.0 new 1ce7b95 update versions as 0.7.x new e0118d2 RI table 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: docs/antora.yml | 11 --- docs/modules/ROOT/examples/js/kamelets.js | 7 ++- docs/modules/ROOT/pages/index.adoc| 17 + 3 files changed, 27 insertions(+), 8 deletions(-)
[camel-kamelets] 01/02: update versions as 0.7.x
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 0.7.x in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 1ce7b959cdbbb598831e85538494cd35d424b339 Author: David Jencks AuthorDate: Fri Jan 21 12:13:51 2022 -0800 update versions as 0.7.x --- docs/antora.yml | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 52c9d22..25bfbcb 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -17,9 +17,7 @@ name: camel-kamelets title: Kamelet Catalog -version: next -prerelease: true -display-version: Next (Pre-release) +version: 0.7.x nav: - modules/ROOT/nav.adoc @@ -28,10 +26,9 @@ asciidoc: attributes: requires: "'util=camel-website-util,kamelets=xref:js/kamelets.js'" # Update to appropriate released camel-k version on release -prerelease: true -#version-used: true -#camel-k-version: next -camel-k-docs-version: next +version-used: true +camel-k-version: 1.8.0 +camel-k-docs-version: 1.8.x #camel-kafka-connector-version: none #camel-kafka-connector-docs-version: none camel-version: 3.14.0
[GitHub] [camel-kamelets] oscerd merged pull request #725: camel-website #701 camel-kamelets RI table setup (main)
oscerd merged pull request #725: URL: https://github.com/apache/camel-kamelets/pull/725 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch main updated: RI table
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new 59277b5 RI table
59277b5 is described below
commit 59277b5d599b41a6752bedacff6a04e134a7e7c2
Author: David Jencks
AuthorDate: Fri Jan 21 16:15:04 2022 -0800
RI table
---
docs/modules/ROOT/examples/js/kamelets.js | 7 ++-
docs/modules/ROOT/pages/index.adoc| 17 +
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/docs/modules/ROOT/examples/js/kamelets.js
b/docs/modules/ROOT/examples/js/kamelets.js
index 549983c..2b8f2c8 100644
--- a/docs/modules/ROOT/examples/js/kamelets.js
+++ b/docs/modules/ROOT/examples/js/kamelets.js
@@ -111,7 +111,12 @@ module.exports = {
:type: ${type}
:propertycount: ${propertyCount}
`
- }
+ },
+
+// Compatibility table support
+ branch: (version) => version === 'next' ?
+'https://github.com/apache/camel-kamelets[main]' :
+`https://github.com/apache/camel-kamelets/tree/${version}[${version}]`,
}
function kameletPropertyList (definition) {
diff --git a/docs/modules/ROOT/pages/index.adoc
b/docs/modules/ROOT/pages/index.adoc
index 2d11bc2..4e73892 100644
--- a/docs/modules/ROOT/pages/index.adoc
+++ b/docs/modules/ROOT/pages/index.adoc
@@ -26,6 +26,23 @@ ifndef::prerelease[This release will not be updated, but
rather replaced by a ne
endif::[]
--
+== Compatibility Matrix
+
+[caption=]
+.Compatibility between Camel-K and related subprojects
+[width="100%",cols="4,2,2,2,1,3",options="header"]
+|===
+|Camel-Kamelets Version
+|Using Camel Version
+|Used by Camel-K Version
+|Used by Camel-Kafka-Connector Version
+|LTS Until
+|Branch
+|===
+
+//cannot use top level index.adoc as the page with the query is always omitted.
+indexTable::[version="*",relative="avro-deserialize-action.adoc",cellformats="util.kameletsRef(pageComponentDisplayVersion,
pageComponentVersion)|util.camelRef(camelVersion,
camelDocsVersion)|util.ckRef(camelKVersion,
camelKDocsVersion)|util.ckcRef(camelKafkaConnectorVersion,
camelKafkaConnectorDocsVersion)|lts|kamelets.branch(pageComponentVersion)",
requires={requires},transform=util.sortCompatibilityItems]
+
This page contains the default Apache Camel Kamelets catalog.
Consult the
xref:{camel-k-docs-version}@camel-k::kamelets/kamelets-user.adoc[Kamelets User
Guide] for information about how to use these.
svn commit: r52238 - /release/camel/camel-k-runtime/1.11.0/
Author: acosentino Date: Mon Jan 24 06:15:44 2022 New Revision: 52238 Log: release camel-k-runtime 1.11.0 Added: release/camel/camel-k-runtime/1.11.0/ - copied from r52237, dev/camel/camel-k-runtime/1.11.0/
svn commit: r52237 - /release/camel/camel-kamelets/0.7.0/
Author: acosentino Date: Mon Jan 24 06:14:54 2022 New Revision: 52237 Log: release camel-kamelets 0.7.0 Added: release/camel/camel-kamelets/0.7.0/ - copied from r52236, dev/camel/camel-kamelets/0.7.0/
svn commit: r52236 - /release/camel/camel-k/1.8.0/
Author: acosentino Date: Mon Jan 24 06:13:12 2022 New Revision: 52236 Log: release camel-k 1.8.0 Added: release/camel/camel-k/1.8.0/ - copied from r52235, dev/camel/camel-k/1.8.0/
[camel] branch main updated: (chores) camel-api-component-maven-plugin: removed unused exceptions (#6811)
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 fed48b3 (chores) camel-api-component-maven-plugin: removed unused
exceptions (#6811)
fed48b3 is described below
commit fed48b3e8b5ab8c8cd65fe0ae7c2d5a880667c09
Author: Otavio Rodolfo Piske
AuthorDate: Mon Jan 24 06:59:08 2022 +0100
(chores) camel-api-component-maven-plugin: removed unused exceptions (#6811)
---
.../java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
index 10e90d9..88cd7a3 100644
---
a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
+++
b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java
@@ -174,7 +174,7 @@ public abstract class AbstractApiMethodGeneratorMojo
extends AbstractApiMethodBa
return new File(generatedSrcDir, fileName.toString());
}
-private String getEnumName() throws MojoExecutionException {
+private String getEnumName() {
String proxyClassWithCanonicalName =
getProxyClassWithCanonicalName(proxyClass);
String prefix = classPrefix != null ? classPrefix : "";
return prefix +
proxyClassWithCanonicalName.substring(proxyClassWithCanonicalName.lastIndexOf('.')
+ 1) + "ApiMethod";
@@ -197,7 +197,7 @@ public abstract class AbstractApiMethodGeneratorMojo
extends AbstractApiMethodBa
return fileName.toString();
}
-private String getUnitTestName() throws MojoExecutionException {
+private String getUnitTestName() {
String proxyClassWithCanonicalName =
getProxyClassWithCanonicalName(proxyClass);
String prefix = classPrefix != null ? classPrefix : "";
return prefix +
proxyClassWithCanonicalName.substring(proxyClassWithCanonicalName.lastIndexOf('.')
+ 1)
@@ -267,7 +267,7 @@ public abstract class AbstractApiMethodGeneratorMojo
extends AbstractApiMethodBa
return new File(generatedSrcDir, fileName.toString());
}
-private String getConfigName() throws MojoExecutionException {
+private String getConfigName() {
String proxyClassWithCanonicalName =
getProxyClassWithCanonicalName(proxyClass);
String prefix = classPrefix != null ? classPrefix : "";
return prefix +
proxyClassWithCanonicalName.substring(proxyClassWithCanonicalName.lastIndexOf('.')
+ 1)
[GitHub] [camel] davsclaus merged pull request #6811: (chores) camel-api-component-maven-plugin: removed unused exceptions
davsclaus merged pull request #6811: URL: https://github.com/apache/camel/pull/6811 -- 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-1019676155 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 1737393086-537-8dd3429e-08d8-4079-b2ce-6f55d2f07935 * Camel Quarkus Commit: 2c766171e89b2aca4b947c9c33fba172d3bb02a6 * Camel Main Commit: a1157e61e0366a304c25fd7db142512fef473421 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1737393086 -- 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] Steve973 removed a comment on pull request #6810: Draft: CAMEL-17500: Simplified Dynamic Router control channel messages.
Steve973 removed a comment on pull request #6810: URL: https://github.com/apache/camel/pull/6810#issuecomment-1019525020 Hi, @davsclaus and @zregvart I did not get this same error when running the exact same command on my machine. `mvn -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -Dcheckstyle.failOnViolation=true checkstyle:checkstyle` It is also in a different module, so do you have any idea what might be causing the checkstyle violation? -- 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 #6811: CAMEL-17442: adjusted scope for the camel-test-infra-common
orpiske opened a new pull request #6811: URL: https://github.com/apache/camel/pull/6811 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch release/3.14.1 updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/release/3.14.1 by this push: new d90a35f [maven-release-plugin] prepare for next development iteration d90a35f is described below commit d90a35f273084d472771831f727b2b624a2e87e6 Author: Gregor Zurowski AuthorDate: Sun Jan 23 17:10:09 2022 + [maven-release-plugin] prepare for next development iteration --- archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 2 +- catalog/pom.xml| 2 +- components/camel-bean-osgi/pom.xml | 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-osgi-activator/pom.xml| 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 2 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 4 ++-- tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 39 files changed, 40 insertions(+), 40 deletions(-) diff --git a/archetypes/camel-archetype-blueprint/pom.xml b/archetypes/camel-archetype-blueprint/pom.xml index 00877ec..e4ec1c5 100644 --- a/archetypes/camel-archetype-blueprint/pom.xml +++ b/archetypes/camel-archetype-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf archetypes -3.14.1 +3.14.2-SNAPSHOT org.apache.camel.archetypes diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 7a98466..c4f4724 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf karaf -3.14.1 +3.14.2-SNAPSHOT .. diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml index 7dcfb73..9bf0b4a 100644 --- a/bom/camel-karaf-bom/pom.xml +++ b/bom/camel-karaf-bom/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.karaf karaf -3.14.1 +3.14.2-SNAPSHOT ../../ camel-karaf-bom diff --git a/bom/pom.xml b/bom/pom.xml index 2859757..eef3476 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.karaf karaf -3.14.1 +3.14.2-SNAPSHOT .. diff --git a/catalog/camel-catalog-provider-karaf/pom.xml b/catalog/camel-catalog-provider-karaf/pom.xml index 99583dd..d00724f 100644 --- a/catalog/camel-catalog-provider-karaf/pom.xml +++ b/catalog/camel-catalog-provider-karaf/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.karaf catalog -3.14.1 +3.14.2-SNAPSHOT camel-catalog-provider-karaf diff --git a/catalog/pom.xml b/catalog/pom.xml index 84eec3a..903579a 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf
[camel-karaf] annotated tag camel-karaf-3.14.1 created (now 0785c7b)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-karaf-3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git. at 0785c7b (tag) tagging 5e326be49f1fdb960456188335edc45c63ba76bb (commit) replaces camel-karaf-3.14.0 by Gregor Zurowski on Sun Jan 23 17:10:05 2022 + - Log - [maven-release-plugin] copy for tag camel-karaf-3.14.1 --- No new revisions were added by this update.
[camel-karaf] branch release/3.14.1 updated (d50e04e -> 5e326be)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git. from d50e04e Update features.xml (#110) new a48b1c3 Target Camel 3.14.1 for release new 5e326be [maven-release-plugin] prepare release camel-karaf-3.14.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 2 +- catalog/pom.xml| 2 +- components/camel-bean-osgi/pom.xml | 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-osgi-activator/pom.xml| 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 2 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 10 +- tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 39 files changed, 43 insertions(+), 43 deletions(-)
[camel-karaf] 01/02: Target Camel 3.14.1 for release
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit a48b1c3ae1eb4c4e05137f66d0d14962bba731b5 Author: Gregor Zurowski AuthorDate: Sun Jan 23 17:04:34 2022 + Target Camel 3.14.1 for release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0d8a340..beea48c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.14.1-SNAPSHOT +3.14.1 org.apache.camel.karaf @@ -106,7 +106,7 @@ false -3.14.1-SNAPSHOT +3.14.1 1.7.0_6 3.5.2_1 @@ -759,7 +759,7 @@ dev -3.14.1-SNAPSHOT +3.14.1
[camel-karaf] 02/02: [maven-release-plugin] prepare release camel-karaf-3.14.1
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit 5e326be49f1fdb960456188335edc45c63ba76bb Author: Gregor Zurowski AuthorDate: Sun Jan 23 17:10:01 2022 + [maven-release-plugin] prepare release camel-karaf-3.14.1 --- archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 2 +- catalog/pom.xml| 2 +- components/camel-bean-osgi/pom.xml | 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-osgi-activator/pom.xml| 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 2 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 4 ++-- tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 39 files changed, 40 insertions(+), 40 deletions(-) diff --git a/archetypes/camel-archetype-blueprint/pom.xml b/archetypes/camel-archetype-blueprint/pom.xml index 8aaf06b..00877ec 100644 --- a/archetypes/camel-archetype-blueprint/pom.xml +++ b/archetypes/camel-archetype-blueprint/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf archetypes -3.14.1-SNAPSHOT +3.14.1 org.apache.camel.archetypes diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 7cda4c3..7a98466 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf karaf -3.14.1-SNAPSHOT +3.14.1 .. diff --git a/bom/camel-karaf-bom/pom.xml b/bom/camel-karaf-bom/pom.xml index 360767d..7dcfb73 100644 --- a/bom/camel-karaf-bom/pom.xml +++ b/bom/camel-karaf-bom/pom.xml @@ -22,7 +22,7 @@ org.apache.camel.karaf karaf -3.14.1-SNAPSHOT +3.14.1 ../../ camel-karaf-bom diff --git a/bom/pom.xml b/bom/pom.xml index cb73600..2859757 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.karaf karaf -3.14.1-SNAPSHOT +3.14.1 .. diff --git a/catalog/camel-catalog-provider-karaf/pom.xml b/catalog/camel-catalog-provider-karaf/pom.xml index 6882f65..99583dd 100644 --- a/catalog/camel-catalog-provider-karaf/pom.xml +++ b/catalog/camel-catalog-provider-karaf/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.karaf catalog -3.14.1-SNAPSHOT +3.14.1 camel-catalog-provider-karaf diff --git a/catalog/pom.xml b/catalog/pom.xml index 0f46bfb..84eec3a 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -24,7 +24,7 @@ org.apache.camel.karaf karaf -3.14.1-SNAPSHOT +3.14.1 .. diff --git a/components/camel-bean-osgi/pom.xml b/components/camel-bean-osgi/pom.xml index 70ce81e..cfbd57f 100644
[GitHub] [camel] Steve973 edited a comment on pull request #6810: CAMEL-17500: Simplified Dynamic Router control channel messages.
Steve973 edited a comment on pull request #6810: URL: https://github.com/apache/camel/pull/6810#issuecomment-1019525020 Hi, @davsclaus and @zregvart I did not get this same error when running the exact same command on my machine. `mvn -V -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 --no-transfer-progress -Dcheckstyle.failOnViolation=true checkstyle:checkstyle` It is also in a different module, so do you have any idea what might be causing the checkstyle violation? -- 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] Steve973 commented on pull request #6810: CAMEL-17500: Simplified Dynamic Router control channel messages.
Steve973 commented on pull request #6810: URL: https://github.com/apache/camel/pull/6810#issuecomment-1019525020 Hi, @davsclaus and @zregvart I did not get this same error when running the exact same command on my machine. It is also in a different module, so do you have any idea what might be causing the checkstyle violation? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch main updated: 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-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 6a8d5c9 Regen
6a8d5c9 is described below
commit 6a8d5c97b3b341f75bcb5b4ee0a06dd5b20fedd7
Author: Claus Ibsen
AuthorDate: Sun Jan 23 17:44:18 2022 +0100
Regen
---
.../camel/catalog/karaf/components/google-calendar.json| 2 +-
.../camel/catalog/karaf/components/google-drive.json | 14 ++
.../camel/catalog/karaf/components/google-sheets.json | 2 +-
.../org/apache/camel/catalog/karaf/components/stub.json| 2 +-
.../component/eventadmin/EventAdminEndpointUriFactory.java | 7 +++
.../component/paxlogging/PaxLoggingEndpointUriFactory.java | 7 +++
6 files changed, 23 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-calendar.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-calendar.json
index 774e4e0..af3b52d 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-calendar.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-calendar.json
@@ -78,7 +78,7 @@
"channels": { "consumerOnly": false, "producerOnly": false, "description":
"The channels collection of methods", "methods": { "stop": { "description":
"Stop watching resources through this channel", "signatures": [
"com.google.api.services.calendar.Calendar$Channels$Stop
stop(com.google.api.services.calendar.model.Channel content)" ] } } },
"events": { "consumerOnly": false, "producerOnly": false, "description":
"The events collection of methods", "methods": { "calendarImport": {
"description": "Imports an event", "signatures": [
"com.google.api.services.calendar.Calendar$Events$CalendarImport
calendarImport(String calendarId, com.google.api.services.calendar.model.Event
content)" ] }, "delete": { "description": "Deletes an event", "signatures": [
"com.google.api.services.calendar.Calendar$Events$Delete delete(String ca [...]
"freebusy": { "consumerOnly": false, "producerOnly": false, "description":
"The freebusy collection of methods", "methods": { "query": { "description":
"Returns free\/busy information for a set of calendars", "signatures": [
"com.google.api.services.calendar.Calendar$Freebusy$Query
query(com.google.api.services.calendar.model.FreeBusyRequest content)" ] } } },
-"list": { "consumerOnly": false, "producerOnly": false, "description":
"The calendarList collection of methods", "methods": { "delete": {
"description": "Deletes an entry on the user's calendar list", "signatures": [
"com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String
calendarId)" ] }, "get": { "description": "Returns an entry on the user's
calendar list", "signatures": [
"com.google.api.services.calendar.Calendar$CalendarList$Get get(String
calendarId)" ] }, [...]
+"list": { "consumerOnly": false, "producerOnly": false, "description":
"The calendarList collection of methods", "methods": { "delete": {
"description": "Removes a calendar from the user's calendar list",
"signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Delete
delete(String calendarId)" ] }, "get": { "description": "Returns a calendar
from the user's calendar list", "signatures": [
"com.google.api.services.calendar.Calendar$CalendarList$Get get(String
calendarI [...]
"settings": { "consumerOnly": false, "producerOnly": false, "description":
"The settings collection of methods", "methods": { "get": { "description":
"Returns a single user setting", "signatures": [
"com.google.api.services.calendar.Calendar$Settings$Get get(String setting)" ]
}, "watch": { "description": "Watch for changes to Settings resources",
"signatures": [ "com.google.api.services.calendar.Calendar$Settings$Watch
watch(com.google.api.services.calendar.model.Channel content)" ] } } }
},
"apiProperties": {
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-drive.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-drive.json
index 3f257e6..53de387 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-drive.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/google-drive.json
@@ -36,7 +36,7 @@
"refreshToken": { "kind": "property", "displayName": "Refresh Token",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false,
[GitHub] [camel-spring-boot-examples] Steve973 opened a new pull request #46: CAMEL-17500: Updated Dynamic Router EIP component spring boot example.
Steve973 opened a new pull request #46: URL: https://github.com/apache/camel-spring-boot-examples/pull/46 Updates the spring boot example with respect to changes made to the Dynamic Router EIP Component. -- 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] 02/02: CAMEL-17384: Developer Console SPI
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit d5063ecfdccc53223cedc3f65ab6d1cef8359a64
Author: Claus Ibsen
AuthorDate: Sun Jan 23 17:33:02 2022 +0100
CAMEL-17384: Developer Console SPI
---
components-starter/camel-console-starter/pom.xml | 48 +
.../src/main/resources/META-INF/LICENSE.txt| 203 +
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
.../src/main/resources/META-INF/spring.provides| 17 ++
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 5 +
7 files changed, 290 insertions(+)
diff --git a/components-starter/camel-console-starter/pom.xml
b/components-starter/camel-console-starter/pom.xml
new file mode 100644
index 000..2e1ca98
--- /dev/null
+++ b/components-starter/camel-console-starter/pom.xml
@@ -0,0 +1,48 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+ 4.0.0
+
+org.apache.camel.springboot
+components-starter
+3.15.0-SNAPSHOT
+
+ camel-console-starter
+ jar
+ Camel SB Starters :: Console
+
+
+ org.springframework.boot
+ spring-boot-starter
+ ${spring-boot-version}
+
+
+ org.apache.camel
+ camel-console
+ ${camel-version}
+
+
+
+ org.apache.camel.springboot
+ camel-core-starter
+
+
+
+
diff --git
a/components-starter/camel-console-starter/src/main/resources/META-INF/LICENSE.txt
b/components-starter/camel-console-starter/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b127
--- /dev/null
+++
b/components-starter/camel-console-starter/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives,
[camel-spring-boot] branch main updated (c465207 -> d5063ec)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.
from c465207 (chores) Adjust archetypes so that generated projects use
Java 11 at minimum (#431)
new 9e74749 Regen
new d5063ec CAMEL-17384: Developer Console SPI
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:
.../springboot/catalog/components/google-calendar.json| 2 +-
.../camel/springboot/catalog/components/google-drive.json | 14 ++
.../springboot/catalog/components/google-sheets.json | 2 +-
.../apache/camel/springboot/catalog/components/stub.json | 2 +-
.../org/apache/camel/springboot/catalog/others/jfr.json | 2 +-
.../{camel-jfr-starter => camel-console-starter}/pom.xml | 6 +++---
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt| 0
.../src/main/resources/META-INF/spring.provides | 2 +-
components-starter/pom.xml| 1 +
core/camel-spring-boot/src/main/docs/spring-boot.json | 5 +
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml| 15 +++
13 files changed, 40 insertions(+), 16 deletions(-)
copy components-starter/{camel-jfr-starter => camel-console-starter}/pom.xml
(93%)
copy {dsl-starter/camel-yaml-dsl-starter =>
components-starter/camel-console-starter}/src/main/resources/META-INF/LICENSE.txt
(100%)
copy {dsl-starter/camel-yaml-dsl-starter =>
components-starter/camel-console-starter}/src/main/resources/META-INF/NOTICE.txt
(100%)
copy components-starter/{camel-ahc-ws-starter =>
camel-console-starter}/src/main/resources/META-INF/spring.provides (97%)
[camel-spring-boot] 01/02: 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-spring-boot.git
commit 9e7474958c78fef785da9ff0d36f9cc189b97535
Author: Claus Ibsen
AuthorDate: Sun Jan 23 17:31:09 2022 +0100
Regen
---
.../springboot/catalog/components/google-calendar.json | 2 +-
.../camel/springboot/catalog/components/google-drive.json | 14 ++
.../camel/springboot/catalog/components/google-sheets.json | 2 +-
.../apache/camel/springboot/catalog/components/stub.json | 2 +-
.../org/apache/camel/springboot/catalog/others/jfr.json| 2 +-
core/camel-spring-boot/src/main/docs/spring-boot.json | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 10 ++
7 files changed, 25 insertions(+), 12 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-calendar.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-calendar.json
index c6836bb..e25b0be 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-calendar.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-calendar.json
@@ -78,7 +78,7 @@
"channels": { "consumerOnly": false, "producerOnly": false, "description":
"The channels collection of methods", "methods": { "stop": { "description":
"Stop watching resources through this channel", "signatures": [
"com.google.api.services.calendar.Calendar$Channels$Stop
stop(com.google.api.services.calendar.model.Channel content)" ] } } },
"events": { "consumerOnly": false, "producerOnly": false, "description":
"The events collection of methods", "methods": { "calendarImport": {
"description": "Imports an event", "signatures": [
"com.google.api.services.calendar.Calendar$Events$CalendarImport
calendarImport(String calendarId, com.google.api.services.calendar.model.Event
content)" ] }, "delete": { "description": "Deletes an event", "signatures": [
"com.google.api.services.calendar.Calendar$Events$Delete delete(String ca [...]
"freebusy": { "consumerOnly": false, "producerOnly": false, "description":
"The freebusy collection of methods", "methods": { "query": { "description":
"Returns free\/busy information for a set of calendars", "signatures": [
"com.google.api.services.calendar.Calendar$Freebusy$Query
query(com.google.api.services.calendar.model.FreeBusyRequest content)" ] } } },
-"list": { "consumerOnly": false, "producerOnly": false, "description":
"The calendarList collection of methods", "methods": { "delete": {
"description": "Deletes an entry on the user's calendar list", "signatures": [
"com.google.api.services.calendar.Calendar$CalendarList$Delete delete(String
calendarId)" ] }, "get": { "description": "Returns an entry on the user's
calendar list", "signatures": [
"com.google.api.services.calendar.Calendar$CalendarList$Get get(String
calendarId)" ] }, [...]
+"list": { "consumerOnly": false, "producerOnly": false, "description":
"The calendarList collection of methods", "methods": { "delete": {
"description": "Removes a calendar from the user's calendar list",
"signatures": [ "com.google.api.services.calendar.Calendar$CalendarList$Delete
delete(String calendarId)" ] }, "get": { "description": "Returns a calendar
from the user's calendar list", "signatures": [
"com.google.api.services.calendar.Calendar$CalendarList$Get get(String
calendarI [...]
"settings": { "consumerOnly": false, "producerOnly": false, "description":
"The settings collection of methods", "methods": { "get": { "description":
"Returns a single user setting", "signatures": [
"com.google.api.services.calendar.Calendar$Settings$Get get(String setting)" ]
}, "watch": { "description": "Watch for changes to Settings resources",
"signatures": [ "com.google.api.services.calendar.Calendar$Settings$Watch
watch(com.google.api.services.calendar.model.Channel content)" ] } } }
},
"apiProperties": {
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
index f2c1d5c..ec04f67 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
@@ -36,7 +36,7 @@
"refreshToken": { "kind": "property", "displayName": "Refresh Token",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType":
[GitHub] [camel] Steve973 opened a new pull request #6810: CAMEL-17500: Simplified Dynamic Router control channel messages.
Steve973 opened a new pull request #6810: URL: https://github.com/apache/camel/pull/6810 This pull requests provides simplification to the Dynamic Router EIP component with regard to control channel messages. Instead of only having the option to create and send a POJO for all of the parameters of subscribing or unsubscribing, this pull request allows a user to: - use the URI for all parameters, or to use a combination of URI parameters and a bean in the registry that contains the exchange filtering predicate - use a combination of URI parameters and a Predicate as the message body to use as the exchange filtering predicate - omit the subscription ID URI parameter to have the subscription ID generated as a UUID string and returned as the message body A pull request will follow this one, in the near future for: - an update to the corresponding Spring Boot starter - an update to the corresponding Spring Boot example -- 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] annotated tag camel-spring-boot-3.14.1 created (now 968092c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-spring-boot-3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. at 968092c (tag) tagging 3629fe7947e60c970e5737102af2c29fbe548768 (commit) replaces camel-spring-boot-3.14.0 by Gregor Zurowski on Sun Jan 23 15:53:44 2022 + - Log - [maven-release-plugin] copy for tag camel-spring-boot-3.14.1 --- No new revisions were added by this update.
[camel-spring-boot] branch release/3.14.1 updated (dd112fe -> 3629fe7)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from dd112fe Regen new c6a2936 Target Camel 3.14.1 for release new 3629fe7 [maven-release-plugin] prepare release camel-spring-boot-3.14.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- archetypes/pom.xml | 2 +- catalog/camel-catalog-provider-springboot/pom.xml | 2 +- catalog/pom.xml| 2 +- components-starter/camel-activemq-starter/pom.xml | 2 +- components-starter/camel-ahc-starter/pom.xml | 2 +- components-starter/camel-ahc-ws-starter/pom.xml| 2 +- components-starter/camel-amqp-starter/pom.xml | 2 +- components-starter/camel-any23-starter/pom.xml | 2 +- components-starter/camel-arangodb-starter/pom.xml | 2 +- components-starter/camel-as2-starter/pom.xml | 2 +- components-starter/camel-asn1-starter/pom.xml | 2 +- components-starter/camel-asterisk-starter/pom.xml | 2 +- components-starter/camel-atlasmap-starter/pom.xml | 2 +- components-starter/camel-atmos-starter/pom.xml | 2 +- .../camel-atmosphere-websocket-starter/pom.xml | 2 +- components-starter/camel-atom-starter/pom.xml | 2 +- components-starter/camel-atomix-starter/pom.xml| 2 +- components-starter/camel-avro-rpc-starter/pom.xml | 2 +- components-starter/camel-avro-starter/pom.xml | 2 +- .../camel-aws-secrets-manager-starter/pom.xml | 2 +- components-starter/camel-aws-xray-starter/pom.xml | 2 +- .../camel-aws2-athena-starter/pom.xml | 2 +- components-starter/camel-aws2-cw-starter/pom.xml | 2 +- components-starter/camel-aws2-ddb-starter/pom.xml | 2 +- components-starter/camel-aws2-ec2-starter/pom.xml | 2 +- components-starter/camel-aws2-ecs-starter/pom.xml | 2 +- components-starter/camel-aws2-eks-starter/pom.xml | 2 +- .../camel-aws2-eventbridge-starter/pom.xml | 2 +- components-starter/camel-aws2-iam-starter/pom.xml | 2 +- .../camel-aws2-kinesis-starter/pom.xml | 2 +- components-starter/camel-aws2-kms-starter/pom.xml | 2 +- .../camel-aws2-lambda-starter/pom.xml | 2 +- components-starter/camel-aws2-mq-starter/pom.xml | 2 +- components-starter/camel-aws2-msk-starter/pom.xml | 2 +- components-starter/camel-aws2-s3-starter/pom.xml | 2 +- components-starter/camel-aws2-ses-starter/pom.xml | 2 +- components-starter/camel-aws2-sns-starter/pom.xml | 2 +- components-starter/camel-aws2-sqs-starter/pom.xml | 2 +- components-starter/camel-aws2-sts-starter/pom.xml | 2 +- .../camel-aws2-translate-starter/pom.xml | 2 +- .../camel-azure-cosmosdb-starter/pom.xml | 2 +- .../camel-azure-eventhubs-starter/pom.xml | 2 +- .../camel-azure-servicebus-starter/pom.xml | 2 +- .../camel-azure-storage-blob-starter/pom.xml | 2 +- .../camel-azure-storage-datalake-starter/pom.xml | 2 +- .../camel-azure-storage-queue-starter/pom.xml | 2 +- components-starter/camel-barcode-starter/pom.xml | 2 +- components-starter/camel-base64-starter/pom.xml| 2 +- components-starter/camel-bean-starter/pom.xml | 2 +- .../camel-bean-validator-starter/pom.xml | 2 +- components-starter/camel-beanio-starter/pom.xml| 2 +- components-starter/camel-beanstalk-starter/pom.xml | 2 +- components-starter/camel-bindy-starter/pom.xml | 2 +- components-starter/camel-bonita-starter/pom.xml| 2 +- components-starter/camel-box-starter/pom.xml | 2 +- components-starter/camel-braintree-starter/pom.xml | 2 +- components-starter/camel-browse-starter/pom.xml| 2 +- .../camel-caffeine-lrucache-starter/pom.xml| 2 +- components-starter/camel-caffeine-starter/pom.xml | 2 +- .../camel-cassandraql-starter/pom.xml | 2 +- components-starter/camel-cbor-starter/pom.xml | 2 +- .../camel-chatscript-starter/pom.xml | 2 +- components-starter/camel-chunk-starter/pom.xml | 2 +- components-starter/camel-cm-sms-starter/pom.xml| 2 +- components-starter/camel-cmis-starter/pom.xml | 2 +- components-starter/camel-coap-starter/pom.xml | 2 +- components-starter/camel-cometd-starter/pom.xml| 2 +- components-starter/camel-consul-starter/pom.xml| 2 +- .../camel-controlbus-starter/pom.xml | 2 +- components-starter/camel-corda-starter/pom.xml | 2 +- components-starter/camel-core-starter/pom.xml | 2 +-
[camel-spring-boot] 01/02: Target Camel 3.14.1 for release
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit c6a29364a325c4c08ab31f593305d4774c595248 Author: Gregor Zurowski AuthorDate: Sun Jan 23 15:13:53 2022 + Target Camel 3.14.1 for release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b7d14f2..04fa482 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.14.1-SNAPSHOT +3.14.1 org.apache.camel.springboot @@ -111,7 +111,7 @@ 2.6.3 -3.14.1-SNAPSHOT +3.14.1 1.0.2.v20150114 @@ -453,7 +453,7 @@ dev -3.14.1-SNAPSHOT +3.14.1
[camel-spring-boot] branch release/3.14.1 created (now dd112fe)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. at dd112fe Regen No new revisions were added by this update.
[camel-karaf] branch release/3.14.1 created (now d50e04e)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git. at d50e04e Update features.xml (#110) No new revisions were added by this update.
[camel] branch regen_bot updated (fca214d -> fb83a04)
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 fca214d Fixed camel-jbang detecting platform-http auto downloaded registering the http vertx router could lead to component creation circular dependency issue. 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 (fb83a04) \ O -- O -- O (fca214d) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel/main/DependencyDownloaderComponentResolver.java | 7 ++- .../main/java/org/apache/camel/main/VertxHttpServer.java| 13 ++--- 2 files changed, 8 insertions(+), 12 deletions(-)
[camel] branch regen_bot updated (84a0574 -> fca214d)
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 84a0574 Regen add fb83a04 Polished title on JFR add fca214d Fixed camel-jbang detecting platform-http auto downloaded registering the http vertx router could lead to component creation circular dependency issue. No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/others/jfr.json | 2 +- components/camel-jfr/pom.xml| 1 + components/camel-jfr/src/generated/resources/jfr.json | 2 +- components/camel-jfr/src/main/docs/jfr.adoc | 4 ++-- docs/components/modules/others/nav.adoc | 2 +- .../camel/main/DependencyDownloaderComponentResolver.java | 7 +-- .../main/java/org/apache/camel/main/VertxHttpServer.java| 13 +++-- 7 files changed, 18 insertions(+), 13 deletions(-)
[camel] branch regen_bot updated (68dabf0 -> 84a0574)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. discard 68dabf0 Regen for commit ed4d79bef73fdb650d8c4b8531f3441b7224f620 add 2ecd092 CAMEL-17384: Developer Console SPI add 84a0574 Regen 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 (68dabf0) \ N -- N -- N refs/heads/regen_bot (84a0574) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: apache-camel/pom.xml | 10 +- bom/camel-bom/pom.xml | 10 ++ catalog/camel-catalog-console/pom.xml | 135 +++ .../services/org/apache/camel/dev-console/catalog | 2 + .../camel/catalog/console/CatalogConsole.java | 88 ++ .../main/camel-main-configuration-metadata.json| 1 + catalog/pom.xml| 1 + .../apache/camel/spi/annotations/DevConsole.java} | 28 ++-- .../main/java/org/apache/camel/CamelContext.java | 14 ++ .../org/apache/camel/ExtendedCamelContext.java | 15 ++ .../java/org/apache/camel/console/DevConsole.java | 78 + .../apache/camel/console/DevConsoleRegistry.java | 113 + .../apache/camel/console/DevConsoleResolver.java} | 23 ++- .../java/org/apache/camel/health/HealthCheck.java | 2 +- .../camel/impl/engine/AbstractCamelContext.java| 54 ++ .../impl/engine/DefaultDevConsoleResolver.java | 89 ++ .../camel/impl/engine/SimpleCamelContext.java | 18 ++ .../impl/event/CamelContextResumeFailureEvent.java | 2 +- .../event/CamelContextStartupFailureEvent.java | 2 +- .../impl/event/CamelContextStopFailureEvent.java | 2 +- .../apache/camel/impl/event/RouteAddedEvent.java | 2 +- .../camel/impl/event/RouteReloadedEvent.java | 2 +- .../apache/camel/impl/event/RouteRemovedEvent.java | 2 +- .../apache/camel/impl/event/RouteStartedEvent.java | 2 +- .../camel/impl/event/RouteStartingEvent.java | 2 +- .../apache/camel/impl/event/RouteStoppedEvent.java | 2 +- .../camel/impl/event/RouteStoppingEvent.java | 2 +- .../impl/event/ServiceStartupFailureEvent.java | 2 +- .../camel/impl/event/ServiceStopFailureEvent.java | 2 +- .../camel/impl/event/StepCompletedEvent.java | 2 +- .../apache/camel/impl/event/StepFailedEvent.java | 2 +- .../apache/camel/impl/event/StepStartedEvent.java | 2 +- core/camel-console/pom.xml | 80 + .../camel/impl/console/EventConsoleConfigurer.java | 55 ++ .../impl/console/JvmDevConsoleConfigurer.java | 55 ++ .../impl/console/MemoryDevConsoleConfigurer.java | 49 ++ .../org.apache.camel.impl.console.EventConsole | 2 + .../org.apache.camel.impl.console.JvmDevConsole| 2 + .../org.apache.camel.impl.console.MemoryDevConsole | 2 + .../services/org/apache/camel/dev-console/context | 2 + .../org/apache/camel/dev-console/default-registry | 2 + .../services/org/apache/camel/dev-console/event| 2 + .../services/org/apache/camel/dev-console/health | 2 + .../services/org/apache/camel/dev-console/jvm | 2 + .../services/org/apache/camel/dev-console/memory | 2 + .../org/apache/camel/dev-console/properties| 2 + .../camel/impl/console/AbstractDevConsole.java | 114 + .../camel/impl/console/ContextDevConsole.java | 53 ++ .../impl/console/DefaultDevConsoleRegistry.java| 185 + .../impl/console/DefaultDevConsolesLoader.java}| 54 +++--- .../apache/camel/impl/console/EventConsole.java| 111 + .../camel/impl/console/HealthDevConsole.java | 65 .../apache/camel/impl/console/JvmDevConsole.java | 76 + .../camel/impl/console/MemoryDevConsole.java | 58 +++ .../camel/impl/console/PropertiesDevConsole.java | 49 ++ .../camel/impl/console/ContextDevConsoleTest.java | 39 + .../console/DefaultDevConsolesLoaderTest.java} | 23 +-- .../src/test/resources/log4j2.properties | 33 .../camel/impl/ExtendedCamelContextConfigurer.java | 12 ++ .../camel/impl/lw/LightweightCamelContext.java | 21 +++ .../impl/lw/LightweightRuntimeCamelContext.java| 23 +++
[GitHub] [camel] github-actions[bot] closed pull request #6809: Generated sources regen
github-actions[bot] closed pull request #6809: URL: https://github.com/apache/camel/pull/6809 -- 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] annotated tag camel-3.14.1 created (now ed46f59)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-3.14.1 in repository https://gitbox.apache.org/repos/asf/camel.git. at ed46f59 (tag) tagging 551357dac466c8d6e11c5d9721361a956255d9f1 (commit) replaces camel-3.14.0 by Gregor Zurowski on Sun Jan 23 12:02:45 2022 + - Log - [maven-release-plugin] copy for tag camel-3.14.1 --- No new revisions were added by this update.
[camel] branch release/3.14.1 created (now 551357d)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel.git. at 551357d [maven-release-plugin] prepare release camel-3.14.1 This branch includes the following new commits: new 551357d [maven-release-plugin] prepare release camel-3.14.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch main updated: Fixed camel-jbang detecting platform-http auto downloaded registering the http vertx router could lead to component creation circular dependency issue.
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 fca214d Fixed camel-jbang detecting platform-http auto downloaded
registering the http vertx router could lead to component creation circular
dependency issue.
fca214d is described below
commit fca214dc9eb7e7cd7ef46a0e7047c68fedcdca2a
Author: Claus Ibsen
AuthorDate: Sun Jan 23 12:57:16 2022 +0100
Fixed camel-jbang detecting platform-http auto downloaded registering the
http vertx router could lead to component creation circular dependency issue.
---
.../camel/main/DependencyDownloaderComponentResolver.java | 7 +--
.../main/java/org/apache/camel/main/VertxHttpServer.java| 13 +++--
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderComponentResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderComponentResolver.java
index ed16322..05dcc63 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderComponentResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderComponentResolver.java
@@ -21,6 +21,7 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.Component;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
+import org.apache.camel.component.platform.http.PlatformHttpComponent;
import org.apache.camel.impl.engine.DefaultComponentResolver;
import org.apache.camel.tooling.model.ComponentModel;
@@ -52,13 +53,15 @@ final class DependencyDownloaderComponentResolver extends
DefaultComponentResolv
if (model != null &&
!DownloaderHelper.alreadyOnClasspath(camelContext, model.getArtifactId())) {
DownloaderHelper.downloadDependency(camelContext,
model.getGroupId(), model.getArtifactId(), model.getVersion());
}
+Component answer = super.resolveComponent(name, context);
-if ("platform-http".equals(name)) {
+if (answer instanceof PlatformHttpComponent) {
// setup a default http server on port 8080 if not already done
+VertxHttpServer.phc = (PlatformHttpComponent) answer;
VertxHttpServer.registerServer(camelContext);
}
-return super.resolveComponent(name, context);
+return answer;
}
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
index e53cda0..7ab379e 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
@@ -43,15 +43,14 @@ import org.slf4j.LoggerFactory;
*/
public final class VertxHttpServer {
-private static final Logger LOG =
LoggerFactory.getLogger(VertxHttpServer.class);
+static VertxPlatformHttpRouter router;
+static VertxPlatformHttpServer server;
+static PlatformHttpComponent phc;
+private static final Logger LOG =
LoggerFactory.getLogger(VertxHttpServer.class);
private static final AtomicBoolean REGISTERED = new AtomicBoolean();
private static final AtomicBoolean CONSOLE = new AtomicBoolean();
-private static VertxPlatformHttpRouter router;
-private static VertxPlatformHttpServer server;
-private static PlatformHttpComponent phc;
-
private VertxHttpServer() {
}
@@ -75,7 +74,9 @@ public final class VertxHttpServer {
camelContext.addService(server);
server.start();
router = VertxPlatformHttpRouter.lookup(camelContext);
-phc = camelContext.getComponent("platform-http",
PlatformHttpComponent.class);
+if (phc == null) {
+phc = camelContext.getComponent("platform-http",
PlatformHttpComponent.class);
+}
// after camel is started then add event notifier
camelContext.addStartupListener(new StartupListener() {
[camel] branch main updated: Polished title on JFR
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 fb83a04 Polished title on JFR
fb83a04 is described below
commit fb83a04b4e7c70d22e354023a170ef48693d1bd1
Author: Claus Ibsen
AuthorDate: Sun Jan 23 12:44:13 2022 +0100
Polished title on JFR
---
.../src/generated/resources/org/apache/camel/catalog/others/jfr.json | 2 +-
components/camel-jfr/pom.xml | 1 +
components/camel-jfr/src/generated/resources/jfr.json | 2 +-
components/camel-jfr/src/main/docs/jfr.adoc | 4 ++--
docs/components/modules/others/nav.adoc | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
index 98a6ad0..73d5944 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/jfr.json
@@ -2,7 +2,7 @@
"other": {
"kind": "other",
"name": "jfr",
-"title": "Jfr",
+"title": "JFR",
"description": "Diagnose Camel applications with Java Flight Recorder",
"deprecated": false,
"firstVersion": "3.8.0",
diff --git a/components/camel-jfr/pom.xml b/components/camel-jfr/pom.xml
index fb8b132..a384d4a 100644
--- a/components/camel-jfr/pom.xml
+++ b/components/camel-jfr/pom.xml
@@ -34,6 +34,7 @@
3.8.0
monitoring
+JFR
diff --git a/components/camel-jfr/src/generated/resources/jfr.json
b/components/camel-jfr/src/generated/resources/jfr.json
index 98a6ad0..73d5944 100644
--- a/components/camel-jfr/src/generated/resources/jfr.json
+++ b/components/camel-jfr/src/generated/resources/jfr.json
@@ -2,7 +2,7 @@
"other": {
"kind": "other",
"name": "jfr",
-"title": "Jfr",
+"title": "JFR",
"description": "Diagnose Camel applications with Java Flight Recorder",
"deprecated": false,
"firstVersion": "3.8.0",
diff --git a/components/camel-jfr/src/main/docs/jfr.adoc
b/components/camel-jfr/src/main/docs/jfr.adoc
index 7f716df..0c923ef 100644
--- a/components/camel-jfr/src/main/docs/jfr.adoc
+++ b/components/camel-jfr/src/main/docs/jfr.adoc
@@ -1,5 +1,5 @@
-= Jfr Component
-:doctitle: Jfr
+= JFR Component
+:doctitle: JFR
:shortname: jfr
:artifactid: camel-jfr
:description: Diagnose Camel applications with Java Flight Recorder
diff --git a/docs/components/modules/others/nav.adoc
b/docs/components/modules/others/nav.adoc
index d4130a2..6b35d0a 100644
--- a/docs/components/modules/others/nav.adoc
+++ b/docs/components/modules/others/nav.adoc
@@ -27,7 +27,7 @@
** xref:headersmap.adoc[Headersmap]
** xref:hystrix.adoc[Hystrix]
** xref:jasypt.adoc[Jasypt]
-** xref:jfr.adoc[Jfr]
+** xref:jfr.adoc[JFR]
** xref:jta.adoc[JTA]
** xref:knative-api.adoc[Knative Api]
** xref:knative-http.adoc[Knative Http]
[camel] 02/02: 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 commit 84a057436d39b7ea4cad43d9cd966e8d8de08d23 Author: Claus Ibsen AuthorDate: Sun Jan 23 12:17:53 2022 +0100 Regen --- .../org/apache/camel/catalog/schemas/camel-spring.xsd | 10 ++ 1 file changed, 10 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index dfb17ca..631ce4f 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -12238,6 +12238,16 @@ Sets a reference to use for lookup the policy in the registry. + + + + +
[camel] branch main updated (ed4d79b -> 84a0574)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from ed4d79b CAMEL-17307: Add exception factory for predicate validation. Thanks to Tom Cassimon for the original work. new 2ecd092 CAMEL-17384: Developer Console SPI new 84a0574 Regen 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: apache-camel/pom.xml | 10 +- bom/camel-bom/pom.xml | 10 ++ catalog/camel-catalog-console/pom.xml | 135 +++ .../services/org/apache/camel/dev-console/catalog | 2 + .../camel/catalog/console/CatalogConsole.java | 88 ++ .../main/camel-main-configuration-metadata.json| 1 + .../apache/camel/catalog/schemas/camel-spring.xsd | 10 ++ catalog/pom.xml| 1 + .../apache/camel/spi/annotations/DevConsole.java} | 28 ++-- .../main/java/org/apache/camel/CamelContext.java | 14 ++ .../org/apache/camel/ExtendedCamelContext.java | 15 ++ .../java/org/apache/camel/console/DevConsole.java | 78 + .../apache/camel/console/DevConsoleRegistry.java | 113 + .../apache/camel/console/DevConsoleResolver.java} | 23 ++- .../java/org/apache/camel/health/HealthCheck.java | 2 +- .../camel/impl/engine/AbstractCamelContext.java| 54 ++ .../impl/engine/DefaultDevConsoleResolver.java | 89 ++ .../camel/impl/engine/SimpleCamelContext.java | 18 ++ .../impl/event/CamelContextResumeFailureEvent.java | 2 +- .../event/CamelContextStartupFailureEvent.java | 2 +- .../impl/event/CamelContextStopFailureEvent.java | 2 +- .../apache/camel/impl/event/RouteAddedEvent.java | 2 +- .../camel/impl/event/RouteReloadedEvent.java | 2 +- .../apache/camel/impl/event/RouteRemovedEvent.java | 2 +- .../apache/camel/impl/event/RouteStartedEvent.java | 2 +- .../camel/impl/event/RouteStartingEvent.java | 2 +- .../apache/camel/impl/event/RouteStoppedEvent.java | 2 +- .../camel/impl/event/RouteStoppingEvent.java | 2 +- .../impl/event/ServiceStartupFailureEvent.java | 2 +- .../camel/impl/event/ServiceStopFailureEvent.java | 2 +- .../camel/impl/event/StepCompletedEvent.java | 2 +- .../apache/camel/impl/event/StepFailedEvent.java | 2 +- .../apache/camel/impl/event/StepStartedEvent.java | 2 +- core/camel-console/pom.xml | 80 + .../camel/impl/console/EventConsoleConfigurer.java | 55 ++ .../impl/console/JvmDevConsoleConfigurer.java | 55 ++ .../impl/console/MemoryDevConsoleConfigurer.java | 49 ++ .../org.apache.camel.impl.console.EventConsole | 2 + .../org.apache.camel.impl.console.JvmDevConsole| 2 + .../org.apache.camel.impl.console.MemoryDevConsole | 2 + .../services/org/apache/camel/dev-console/context | 2 + .../org/apache/camel/dev-console/default-registry | 2 + .../services/org/apache/camel/dev-console/event| 2 + .../services/org/apache/camel/dev-console/health | 2 + .../services/org/apache/camel/dev-console/jvm | 2 + .../services/org/apache/camel/dev-console/memory | 2 + .../org/apache/camel/dev-console/properties| 2 + .../camel/impl/console/AbstractDevConsole.java | 114 + .../camel/impl/console/ContextDevConsole.java | 53 ++ .../impl/console/DefaultDevConsoleRegistry.java| 185 + .../impl/console/DefaultDevConsolesLoader.java}| 54 +++--- .../apache/camel/impl/console/EventConsole.java| 111 + .../camel/impl/console/HealthDevConsole.java | 65 .../apache/camel/impl/console/JvmDevConsole.java | 76 + .../camel/impl/console/MemoryDevConsole.java | 58 +++ .../camel/impl/console/PropertiesDevConsole.java | 49 ++ .../camel/impl/console/ContextDevConsoleTest.java | 39 + .../console/DefaultDevConsolesLoaderTest.java} | 23 +-- .../src/test/resources/log4j2.properties | 33 .../camel/impl/ExtendedCamelContextConfigurer.java | 12 ++ .../camel/impl/lw/LightweightCamelContext.java | 21 +++ .../impl/lw/LightweightRuntimeCamelContext.java| 23 +++ .../core/xml/AbstractCamelContextFactoryBean.java | 21 +++ ...ventNotifierServiceStoppingFailedEventTest.java | 2 +- .../camel/impl/health/ContextHealthCheck.java | 23 +-- .../impl/health/DefaultHealthChecksLoader.java | 2 +- .../MainConfigurationPropertiesConfigurer.java | 6 + .../camel-main-configuration-metadata.json | 1 + core/camel-main/src/main/docs/main.adoc| 3 +-
[camel] branch regen_bot updated (cee3f1d -> 68dabf0)
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 cee3f1d Upgrade to vertx 4.2.4
add ed4d79b CAMEL-17307: Add exception factory for predicate validation.
Thanks to Tom Cassimon for the original work.
add 68dabf0 Regen for commit ed4d79bef73fdb650d8c4b8531f3441b7224f620
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/models/validate.json | 1 +
.../apache/camel/catalog/schemas/camel-spring.xsd | 10 +
...ndpoint.java => PredicateExceptionFactory.java} | 21 ++
.../resources/org/apache/camel/model/validate.json | 1 +
.../org/apache/camel/model/ValidateDefinition.java | 48 ++
.../org/apache/camel/reifier/ValidateReifier.java | 13 +-
...lidatePredicateExceptionFactoryGlobalTest.java} | 22 +++---
... => ValidatePredicateExceptionFactoryTest.java} | 40 --
.../apache/camel/support/CamelContextHelper.java | 1 +
.../processor/PredicateValidatingProcessor.java| 39 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 9 +++-
.../dsl/yaml/deserializers/ModelDeserializers.java | 8 +++-
.../src/generated/resources/camel-yaml-dsl.json| 3 ++
.../src/generated/resources/camelYamlDsl.json | 3 ++
14 files changed, 195 insertions(+), 24 deletions(-)
copy core/camel-api/src/main/java/org/apache/camel/spi/{BrowsableEndpoint.java
=> PredicateExceptionFactory.java} (53%)
copy
core/camel-core/src/test/java/org/apache/camel/processor/{ValidateSimpleTest.java
=> ValidatePredicateExceptionFactoryGlobalTest.java} (76%)
copy
core/camel-core/src/test/java/org/apache/camel/processor/{ValidateSimpleTest.java
=> ValidatePredicateExceptionFactoryTest.java} (65%)
[GitHub] [camel] github-actions[bot] opened a new pull request #6809: Generated sources regen
github-actions[bot] opened a new pull request #6809: URL: https://github.com/apache/camel/pull/6809 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
[GitHub] [camel] davsclaus commented on pull request #6531: CAMEL-17307: camel-support - Added ThrowingPredicate interface to cre…
davsclaus commented on pull request #6531: URL: https://github.com/apache/camel/pull/6531#issuecomment-1019456845 Take a look at https://github.com/apache/camel/commit/ed4d79bef73fdb650d8c4b8531f3441b7224f620 The unit tests show what you can do. If you have feedback, suggestions then you are welcome to post them, or send a PR from the main 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
[GitHub] [camel] TCke83 commented on pull request #6531: CAMEL-17307: camel-support - Added ThrowingPredicate interface to cre…
TCke83 commented on pull request #6531: URL: https://github.com/apache/camel/pull/6531#issuecomment-1019455916 @davsclaus okay thanks, looking forward to use it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17307: Add exception factory for predicate validation. Thanks to Tom Cassimon for the original work.
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 ed4d79b CAMEL-17307: Add exception factory for predicate validation.
Thanks to Tom Cassimon for the original work.
ed4d79b is described below
commit ed4d79bef73fdb650d8c4b8531f3441b7224f620
Author: Claus Ibsen
AuthorDate: Sun Jan 23 11:28:51 2022 +0100
CAMEL-17307: Add exception factory for predicate validation. Thanks to Tom
Cassimon for the original work.
---
.../org/apache/camel/catalog/models/validate.json | 1 +
.../camel/spi/PredicateExceptionFactory.java | 39
.../resources/org/apache/camel/model/validate.json | 1 +
.../org/apache/camel/model/ValidateDefinition.java | 48 +
.../org/apache/camel/reifier/ValidateReifier.java | 13 ++-
...alidatePredicateExceptionFactoryGlobalTest.java | 90 +
.../ValidatePredicateExceptionFactoryTest.java | 110 +
.../apache/camel/support/CamelContextHelper.java | 1 +
.../processor/PredicateValidatingProcessor.java| 39 +++-
.../java/org/apache/camel/xml/in/ModelParser.java | 9 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 8 +-
.../src/generated/resources/camel-yaml-dsl.json| 3 +
.../src/generated/resources/camelYamlDsl.json | 3 +
13 files changed, 359 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/validate.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/validate.json
index d0fe8db..1a4dffd 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/validate.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/validate.json
@@ -13,6 +13,7 @@
},
"properties": {
"expression": { "kind": "expression", "displayName": "Expression",
"required": true, "type": "object", "javaType":
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant",
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser",
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple",
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false,
"autowired": false, "secret": false, "asPredicate": true, "descrip [...]
+"predicateExceptionFactory": { "kind": "attribute", "displayName":
"Predicate Exception Factory", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The bean id of custom PredicateExceptionFactory to use for
creating the exception when the validation fails. By default, Camel will throw
PredicateValidationException. By using a custom factory you can control which
exception to throw instead." },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/PredicateExceptionFactory.java
b/core/camel-api/src/main/java/org/apache/camel/spi/PredicateExceptionFactory.java
new file mode 100644
index 000..8e70a5c
--- /dev/null
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/PredicateExceptionFactory.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spi;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Predicate;
+
+/**
+ * A factory that can be used to create a specific exception when a {@link
Predicate} returning false, which can be used
+ * by camel-validator and other components.
+ */
+public interface
[GitHub] [camel] davsclaus commented on pull request #6531: CAMEL-17307: camel-support - Added ThrowingPredicate interface to cre…
davsclaus commented on pull request #6531: URL: https://github.com/apache/camel/pull/6531#issuecomment-1019455144 Oh sorry in the mean time I have been working on this. Have the implemented ready, just doing a rebuild of code before merging. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus closed pull request #6531: CAMEL-17307: camel-support - Added ThrowingPredicate interface to cre…
davsclaus closed pull request #6531: URL: https://github.com/apache/camel/pull/6531 -- 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 release/3.14.1 deleted (was e886512)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel.git. was e886512 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard e886512 [maven-release-plugin] prepare for next development iteration discard 6a52752 [maven-release-plugin] prepare release camel-3.14.1
[camel] annotated tag camel-3.14.1 deleted (was 984238c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-3.14.1 in repository https://gitbox.apache.org/repos/asf/camel.git. *** WARNING: tag camel-3.14.1 was deleted! *** tag was 984238c The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] annotated tag camel-3.14.1 created (now 984238c)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-3.14.1 in repository https://gitbox.apache.org/repos/asf/camel.git. at 984238c (tag) tagging 6a52752bdf6306c69eeeb27c936ec50ac347346d (commit) replaces camel-3.14.0 by Gregor Zurowski on Sun Jan 23 10:11:22 2022 + - Log - [maven-release-plugin] copy for tag camel-3.14.1 --- No new revisions were added by this update.
[camel] branch regen_bot updated (2bfa255 -> cee3f1d)
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 2bfa255 CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown add cee3f1d Upgrade to vertx 4.2.4 No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-spring-boot] branch camel-spring-boot-3.11.x updated: CAMEL-17522: Upgrade to spring boot 2.5.9
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.11.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-3.11.x by this push: new e9fbaba CAMEL-17522: Upgrade to spring boot 2.5.9 e9fbaba is described below commit e9fbabab07480967138ce820d9f29f2d61b216cd Author: Claus Ibsen AuthorDate: Sun Jan 23 10:52:00 2022 +0100 CAMEL-17522: Upgrade to spring boot 2.5.9 --- archetypes/camel-archetype-spring-boot/pom.xml | 2 +- pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml index 1722a71..ac004b7 100644 --- a/archetypes/camel-archetype-spring-boot/pom.xml +++ b/archetypes/camel-archetype-spring-boot/pom.xml @@ -34,7 +34,7 @@ maven-archetype - 2.5.8 + 2.5.9 src/test/resources/settings.xml diff --git a/pom.xml b/pom.xml index 9dcd900..5d7c69c 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.5.8 +2.5.9 3.11.6-SNAPSHOT
[camel] branch regen_bot updated (26d40cb -> 2bfa255)
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 26d40cb Polished add bef1c22 CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown add 2bfa255 CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown No new revisions were added by this update. Summary of changes: .../org/apache/camel/support/cache/ServicePool.java | 21 + 1 file changed, 17 insertions(+), 4 deletions(-)
[camel] branch regen_bot_3.14.x updated (9134d00 -> 2cfebb0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 9134d00 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. add 46cab4e CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown add 2cfebb0 CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown No new revisions were added by this update. Summary of changes: .../org/apache/camel/support/cache/ServicePool.java | 21 + 1 file changed, 17 insertions(+), 4 deletions(-)
[GitHub] [camel] TCke83 commented on pull request #6531: CAMEL-17307: camel-support - Added ThrowingPredicate interface to cre…
TCke83 commented on pull request #6531: URL: https://github.com/apache/camel/pull/6531#issuecomment-1019446757 @davsclaus i'm going to try to do this next week. I'll keep this pull request updated. -- 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 (9548385 -> 26d40cb)
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 9548385 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. add 26d40cb Polished No new revisions were added by this update. Summary of changes: core/camel-api/src/main/java/org/apache/camel/IsSingleton.java | 2 +- .../src/main/java/org/apache/camel/processor/SendProcessor.java| 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
[camel] branch main updated: Upgrade to vertx 4.2.4
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 cee3f1d Upgrade to vertx 4.2.4 cee3f1d is described below commit cee3f1d55127b82e52781cb6395d34f3a04d4e76 Author: Claus Ibsen AuthorDate: Sun Jan 23 09:51:26 2022 +0100 Upgrade to vertx 4.2.4 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2126f95..36a1a66 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -533,7 +533,7 @@ 0.10.2 3.1 2.3 -4.2.3 +4.2.4 0.7 3.6.0 0.8.0
[GitHub] [camel] davsclaus commented on pull request #6806: CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
davsclaus commented on pull request #6806: URL: https://github.com/apache/camel/pull/6806#issuecomment-1019439787 Thanks for this PR. I modified it a bit to only use synchronized in acquire if we are stopping -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/02: CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
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
commit 46cab4eceb2a0ec2765d8268d05f722bf57b034b
Author: Krzysztof Jamróz
AuthorDate: Fri Jan 21 19:23:19 2022 +0100
CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
---
.../java/org/apache/camel/support/cache/ServicePool.java| 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
index a797ec8..4ac811b 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
@@ -51,6 +51,8 @@ abstract class ServicePool extends
ServiceSupport implements
private final ConcurrentMap> singlePoolEvicted = new
ConcurrentHashMap<>();
private int capacity;
private Map cache;
+// synchronizes access only to cache
+private final Object cacheLock;
private interface Pool {
S acquire() throws Exception;
@@ -71,6 +73,7 @@ abstract class ServicePool extends
ServiceSupport implements
this.getEndpoint = getEndpoint;
this.capacity = capacity;
this.cache = capacity > 0 ? LRUCacheFactory.newLRUCache(capacity,
this::onEvict) : null;
+this.cacheLock = capacity > 0 ? new Object() : null;
}
/**
@@ -108,7 +111,9 @@ abstract class ServicePool extends
ServiceSupport implements
}
S s = getOrCreatePool(endpoint).acquire();
if (s != null && cache != null) {
-cache.putIfAbsent(s, s);
+synchronized (cacheLock) {
+cache.putIfAbsent(s, s);
+}
}
return s;
}
@@ -178,8 +183,10 @@ abstract class ServicePool extends
ServiceSupport implements
pool.values().forEach(Pool::stop);
pool.clear();
if (cache != null) {
-cache.values().forEach(ServicePool::stop);
-cache.clear();
+synchronized (cacheLock) {
+cache.values().forEach(ServicePool::stop);
+cache.clear();
+}
}
singlePoolEvicted.values().forEach(Pool::stop);
singlePoolEvicted.clear();
[camel] 02/02: CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
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
commit 2cfebb0429311e5f84c07a7d92c1ad50cb9c13ae
Author: Claus Ibsen
AuthorDate: Sun Jan 23 09:35:49 2022 +0100
CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
---
.../main/java/org/apache/camel/support/cache/ServicePool.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
index 4ac811b..fe0b6fe 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
@@ -111,7 +111,13 @@ abstract class ServicePool extends
ServiceSupport implements
}
S s = getOrCreatePool(endpoint).acquire();
if (s != null && cache != null) {
-synchronized (cacheLock) {
+if (isStoppingOrStopped()) {
+// during stopping then access to the cache is synchronized
+synchronized (cacheLock) {
+cache.putIfAbsent(s, s);
+}
+} else {
+// optimize for normal operation
cache.putIfAbsent(s, s);
}
}
@@ -132,7 +138,7 @@ abstract class ServicePool extends
ServiceSupport implements
}
private Pool getOrCreatePool(Endpoint endpoint) {
-// its a pool so we have a lot more hits, so use regular get, and then
fallback to computeIfAbsent
+// it is a pool, so we have a lot more hits, so use regular get, and
then fallback to computeIfAbsent
Pool answer = pool.get(endpoint);
if (answer == null) {
boolean singleton = endpoint.isSingletonProducer();
[GitHub] [camel] davsclaus closed pull request #6806: CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
davsclaus closed pull request #6806: URL: https://github.com/apache/camel/pull/6806 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.14.x updated (9134d00 -> 2cfebb0)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 9134d00 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. new 46cab4e CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown new 2cfebb0 CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown 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: .../org/apache/camel/support/cache/ServicePool.java | 21 + 1 file changed, 17 insertions(+), 4 deletions(-)
[camel] 01/02: CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bef1c22700930ad1d493890d216e5ac9b5374663
Author: Krzysztof Jamróz
AuthorDate: Fri Jan 21 19:23:19 2022 +0100
CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
---
.../java/org/apache/camel/support/cache/ServicePool.java| 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
index a797ec8..4ac811b 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
@@ -51,6 +51,8 @@ abstract class ServicePool extends
ServiceSupport implements
private final ConcurrentMap> singlePoolEvicted = new
ConcurrentHashMap<>();
private int capacity;
private Map cache;
+// synchronizes access only to cache
+private final Object cacheLock;
private interface Pool {
S acquire() throws Exception;
@@ -71,6 +73,7 @@ abstract class ServicePool extends
ServiceSupport implements
this.getEndpoint = getEndpoint;
this.capacity = capacity;
this.cache = capacity > 0 ? LRUCacheFactory.newLRUCache(capacity,
this::onEvict) : null;
+this.cacheLock = capacity > 0 ? new Object() : null;
}
/**
@@ -108,7 +111,9 @@ abstract class ServicePool extends
ServiceSupport implements
}
S s = getOrCreatePool(endpoint).acquire();
if (s != null && cache != null) {
-cache.putIfAbsent(s, s);
+synchronized (cacheLock) {
+cache.putIfAbsent(s, s);
+}
}
return s;
}
@@ -178,8 +183,10 @@ abstract class ServicePool extends
ServiceSupport implements
pool.values().forEach(Pool::stop);
pool.clear();
if (cache != null) {
-cache.values().forEach(ServicePool::stop);
-cache.clear();
+synchronized (cacheLock) {
+cache.values().forEach(ServicePool::stop);
+cache.clear();
+}
}
singlePoolEvicted.values().forEach(Pool::stop);
singlePoolEvicted.clear();
[camel] branch main updated (26d40cb -> 2bfa255)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 26d40cb Polished new bef1c22 CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown new 2bfa255 CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown 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: .../org/apache/camel/support/cache/ServicePool.java | 21 + 1 file changed, 17 insertions(+), 4 deletions(-)
[camel] 02/02: CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2bfa25566b361d489d4048cc61d610437ee6606d
Author: Claus Ibsen
AuthorDate: Sun Jan 23 09:35:49 2022 +0100
CAMEL-17536 Fixed: ServicePool.doStop hangs during shutdown
---
.../main/java/org/apache/camel/support/cache/ServicePool.java | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
index 4ac811b..fe0b6fe 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/cache/ServicePool.java
@@ -111,7 +111,13 @@ abstract class ServicePool extends
ServiceSupport implements
}
S s = getOrCreatePool(endpoint).acquire();
if (s != null && cache != null) {
-synchronized (cacheLock) {
+if (isStoppingOrStopped()) {
+// during stopping then access to the cache is synchronized
+synchronized (cacheLock) {
+cache.putIfAbsent(s, s);
+}
+} else {
+// optimize for normal operation
cache.putIfAbsent(s, s);
}
}
@@ -132,7 +138,7 @@ abstract class ServicePool extends
ServiceSupport implements
}
private Pool getOrCreatePool(Endpoint endpoint) {
-// its a pool so we have a lot more hits, so use regular get, and then
fallback to computeIfAbsent
+// it is a pool, so we have a lot more hits, so use regular get, and
then fallback to computeIfAbsent
Pool answer = pool.get(endpoint);
if (answer == null) {
boolean singleton = endpoint.isSingletonProducer();
[camel] branch main updated (9548385 -> 26d40cb)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 9548385 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. add 26d40cb Polished No new revisions were added by this update. Summary of changes: core/camel-api/src/main/java/org/apache/camel/IsSingleton.java | 2 +- .../src/main/java/org/apache/camel/processor/SendProcessor.java| 3 --- 2 files changed, 1 insertion(+), 4 deletions(-)
[camel] branch release/3.14.1 created (now 9134d00)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.1 in repository https://gitbox.apache.org/repos/asf/camel.git. at 9134d00 CAMEL-17514: Fix MDC logging to ensure data is setup before processing. Error handler calling processors must do so in UoW. No new revisions were added by this update.
