[camel-quarkus] branch camel-main updated: Tika - aded explabation and limitation regarding pdf, see #5234
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 74c7f8713f Tika - aded explabation and limitation regarding pdf, see
#5234
74c7f8713f is described below
commit 74c7f8713f6a42dc77184cb011cfaf3b8c8b6ca8
Author: JiriOndrusek
AuthorDate: Thu Aug 31 14:28:31 2023 +0200
Tika - aded explabation and limitation regarding pdf, see #5234
---
docs/modules/ROOT/pages/reference/extensions/tika.adoc| 2 ++
extensions/tika/runtime/src/main/doc/limitations.adoc | 2 ++
integration-tests/tika/src/main/resources/application.properties | 3 ++-
.../java/org/apache/camel/quarkus/component/tika/it/TikaTest.java | 4 ++--
4 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/tika.adoc
b/docs/modules/ROOT/pages/reference/extensions/tika.adoc
index bf5efdddc7..56712b2cda 100644
--- a/docs/modules/ROOT/pages/reference/extensions/tika.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/tika.adoc
@@ -54,6 +54,8 @@ can be changed only via `application.properties`.
While you can use any of the available
https://tika.apache.org/1.24.1/formats.html[Tika parsers] in JVM mode,
only some of those are supported in native mode - see the
https://quarkiverse.github.io/quarkiverse-docs/quarkus-tika/dev/index.html[Quarkus
Tika guide].
+PDF and ODF parsers can not be used both in JVM mode or in the native mode.
Pdf extension is suggested for purposes of pdf consumption to avoid a version
conflict between Camel and Quarkus-tika extension involving PdfBox dependency.
+
Use of the Tika parser without any configuration will initialize all available
parsers. Unfortunately as some of them
don't work in the native mode, the whole execution will fail.
diff --git a/extensions/tika/runtime/src/main/doc/limitations.adoc
b/extensions/tika/runtime/src/main/doc/limitations.adoc
index 8edfbeddbc..1d0f7a75c4 100644
--- a/extensions/tika/runtime/src/main/doc/limitations.adoc
+++ b/extensions/tika/runtime/src/main/doc/limitations.adoc
@@ -4,6 +4,8 @@ can be changed only via `application.properties`.
While you can use any of the available
https://tika.apache.org/1.24.1/formats.html[Tika parsers] in JVM mode,
only some of those are supported in native mode - see the
https://quarkiverse.github.io/quarkiverse-docs/quarkus-tika/dev/index.html[Quarkus
Tika guide].
+PDF and ODF parsers can not be used both in JVM mode or in the native mode.
Pdf extension is suggested for purposes of pdf consumption to avoid a version
conflict between Camel and Quarkus-tika extension involving PdfBox dependency.
+
Use of the Tika parser without any configuration will initialize all available
parsers. Unfortunately as some of them
don't work in the native mode, the whole execution will fail.
diff --git a/integration-tests/tika/src/main/resources/application.properties
b/integration-tests/tika/src/main/resources/application.properties
index fb3468886b..536d32868c 100644
--- a/integration-tests/tika/src/main/resources/application.properties
+++ b/integration-tests/tika/src/main/resources/application.properties
@@ -15,7 +15,8 @@
## limitations under the License.
## ---
-quarkus.tika.parsers= pdf,odf,office,xml,image
+#quarkus.tika.parsers= pdf,odf,office,xml,image //Requires new release of
quarkiverse-tike, which adopts tika with pdfBox 3.x
+quarkus.tika.parsers= odf,office,xml,image
quarkus.tika.parser.office = org.apache.tika.parser.microsoft.OfficeParser
quarkus.tika.parser.image = org.apache.tika.parser.image.ImageParser
quarkus.tika.parser.xml = org.apache.tika.parser.xml.DcXMLParser
\ No newline at end of file
diff --git
a/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaTest.java
b/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaTest.java
index 45fc59d695..adf61f13f1 100644
---
a/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaTest.java
+++
b/integration-tests/tika/src/test/java/org/apache/camel/quarkus/component/tika/it/TikaTest.java
@@ -34,13 +34,13 @@ import static org.hamcrest.Matchers.startsWith;
@QuarkusTest
class TikaTest {
-@Disabled //https://github.com/apache/camel-quarkus/issues/5234
+@Disabled //Requires new release of quarkiverse-tike, which adopts tika
with pdfBox 3.x https://github.com/apache/camel-quarkus/issues/5234
@Test
public void testPdf() throws Exception {
testParse("quarkus.pdf", "application/pdf", "Hello Quarkus");
}
-@Disabled //https://github.com/apache/camel-quarkus/issues/5234
+@Disabled //Requires new release of quarkiverse-tike, which adopts tika
with pdfBox 3.x ht
[GitHub] [camel] oscerd commented on pull request #11228: Camel-Tracing: Removing NsqSpanDecorator since component is no more a…
oscerd commented on PR #11228: URL: https://github.com/apache/camel/pull/11228#issuecomment-1702224190 I think it would be beneficial to have a look at what we have as decorators today and do a little example to what we want to have -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11267: Upgrade Fastjson to version 2.0.39
github-actions[bot] commented on PR #11267: URL: https://github.com/apache/camel/pull/11267#issuecomment-1702221170 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd commented on pull request #11267: Upgrade Fastjson to version 2.0.39
oscerd commented on PR #11267: URL: https://github.com/apache/camel/pull/11267#issuecomment-1702221010 /component-tests camel-fastjson -- 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] oscerd opened a new pull request, #11267: Upgrade Fastjson to version 2.0.39
oscerd opened a new pull request, #11267: URL: https://github.com/apache/camel/pull/11267 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: Upgrade Fastjson to version 2.0.39
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch fastjson-2.0.39 in repository https://gitbox.apache.org/repos/asf/camel.git commit 73213aa9520a0b55452681d6484738bc05b1caba Author: Andrea Cosentino AuthorDate: Fri Sep 1 08:11:28 2023 +0200 Upgrade Fastjson to version 2.0.39 Signed-off-by: Andrea Cosentino --- dsl/camel-jbang/camel-jbang-container/Dockerfile | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-container/Dockerfile b/dsl/camel-jbang/camel-jbang-container/Dockerfile index 1e448e4771e..1064a31a37e 100644 --- a/dsl/camel-jbang/camel-jbang-container/Dockerfile +++ b/dsl/camel-jbang/camel-jbang-container/Dockerfile @@ -19,5 +19,5 @@ FROM docker.io/jbangdev/jbang-action RUN jbang trust add https://github.com/apache/camel -ENTRYPOINT [ "jbang", "-Dcamel.jbang.version=4.0.0", "camel@apache/camel"] +ENTRYPOINT [ "jbang", "-Dcamel.jbang.version=3.20.6", "camel@apache/camel"] diff --git a/parent/pom.xml b/parent/pom.xml index 18e1cffd863..d1c9586cbf7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -142,7 +142,7 @@ 1.10.2.Final 3.1.0 2.4.13 -2.0.38 +2.0.39 3.0.5 2.2.0 4.0.18
[GitHub] [camel] github-actions[bot] commented on pull request #11267: Upgrade Fastjson to version 2.0.39
github-actions[bot] commented on PR #11267: URL: https://github.com/apache/camel/pull/11267#issuecomment-1702220994 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch fastjson-2.0.39 created (now 73213aa9520)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch fastjson-2.0.39 in repository https://gitbox.apache.org/repos/asf/camel.git at 73213aa9520 Upgrade Fastjson to version 2.0.39 This branch includes the following new commits: new 73213aa9520 Upgrade Fastjson to version 2.0.39 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-kamelets] branch regen_bot updated (1bad4ca5 -> 55462b65)
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 1bad4ca5 Mongodb kamelets lack kamelets-utils dependency (#1603) add 5916e97b Updated CHANGELOG.md add a6a34882 Update .asf.yaml add 55462b65 Use Data Type Transformer API provided by Camel 4.0 (#1607) No new revisions were added by this update. Summary of changes: .asf.yaml | 2 +- .github/workflows/yaks-tests.yaml | 6 +- CHANGELOG.md | 11 ++ kamelets/aws-ddb-sink.kamelet.yaml | 13 +- kamelets/data-type-action.kamelet.yaml | 27 +-- .../utils/format/AnnotationDataTypeLoader.java | 172 - .../kamelets/utils/format/DataTypeProcessor.java | 110 --- .../utils/format/DefaultDataTypeConverter.java | 85 - .../format/DefaultDataTypeConverterResolver.java | 67 --- .../utils/format/DefaultDataTypeRegistry.java | 206 - .../format/converter/avro/AvroBinaryDataType.java | 42 +++-- .../format/converter/avro/AvroStructDataType.java | 30 +-- .../converter/aws2/ddb/Ddb2JsonInputType.java | 67 +++ .../aws2/s3/AWS2S3CloudEventOutputType.java| 23 +-- .../format/converter/bytes/ByteArrayDataType.java | 41 .../converter/http/HttpCloudEventOutputType.java | 18 +- .../utils/format/converter/json/JsonDataType.java | 24 +-- .../format/converter/json/JsonStructDataType.java | 26 +-- .../format/converter/pojo/JavaObjectDataType.java | 40 ++-- .../format/converter/text/StringDataType.java | 47 - .../utils/format/spi/DataTypeConverter.java| 75 .../format/spi/DataTypeConverterResolver.java | 53 -- .../kamelets/utils/format/spi/DataTypeLoader.java | 31 .../utils/format/spi/DataTypeRegistry.java | 68 --- .../utils/format/spi/annotations/DataType.java | 56 -- .../converter/camel-application-octet-stream | 18 -- .../camel/datatype/converter/camel-plain-text | 18 -- .../application-json} | 0 .../application-x-java-object} | 0 .../application-x-struct} | 0 .../camel-avro-binary => transformer/avro-binary} | 0 .../avro-x-struct} | 0 .../aws2-ddb-application-json | 0 .../aws2-s3-application-cloudevents| 0 .../http-application-cloudevents | 0 .../utils/format/DataTypeProcessorTest.java| 99 -- .../DefaultDataTypeConverterResolverTest.java | 76 .../utils/format/DefaultDataTypeRegistryTest.java | 56 -- .../converter/aws2/ddb/Ddb2JsonInputTypeTest.java | 28 ++- .../aws2/s3/AWS2S3CloudEventOutputTypeTest.java| 68 --- .../http/HttpCloudEventOutputTypeTest.java | 15 +- .../standard/bytes/ByteArrayDataTypeTest.java | 103 --- .../standard/text/StringDataTypeTest.java | 91 - .../format/converter/test/UppercaseDataType.java | 31 .../services/org/apache/camel/DataTypeConverter| 18 -- .../camel/datatype/converter/camel-lowercase | 18 -- .../org/apache/camel/datatype/converter/foo-json | 18 -- .../resources/kamelets/aws-ddb-sink.kamelet.yaml | 13 +- .../kamelets/data-type-action.kamelet.yaml | 27 +-- test/avro-data-type/avro-to-log-binding.yaml | 1 - test/avro-data-type/json-to-avro-binding.yaml | 1 - 51 files changed, 212 insertions(+), 1827 deletions(-) delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/AnnotationDataTypeLoader.java delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/DataTypeProcessor.java delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/DefaultDataTypeConverter.java delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/DefaultDataTypeConverterResolver.java delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/DefaultDataTypeRegistry.java delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/bytes/ByteArrayDataType.java delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/converter/text/StringDataType.java delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/spi/DataTypeConverter.java delete mode 100644 library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/format/spi/DataTypeConverterResolver.java delete mode 100644 librar
[GitHub] [camel-kamelets] oscerd closed issue #875: Salesforce Sink Kamelet: Provide a general sink
oscerd closed issue #875: Salesforce Sink Kamelet: Provide a general sink URL: https://github.com/apache/camel-kamelets/issues/875 -- 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 commented on pull request #1607: Use Data Type Transformer API provided by Camel 4.0
oscerd commented on PR #1607: URL: https://github.com/apache/camel-kamelets/pull/1607#issuecomment-1702195855 Thanks a lot. -- 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: Use Data Type Transformer API provided by Camel 4.0 (#1607)
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 55462b65 Use Data Type Transformer API provided by Camel 4.0 (#1607) 55462b65 is described below commit 55462b657d5034df7019a73cdd49e40dac682189 Author: Christoph Deppisch AuthorDate: Fri Sep 1 07:42:35 2023 +0200 Use Data Type Transformer API provided by Camel 4.0 (#1607) - Camel 4.0 introduces a data type support based on the transformer API. Use this instead of the interim implementation in utils - Remove data type transformers that are now provided by Camel core - Remove interim data type processor implementation in this repository and use data type processor implementation provided by Camel 4 - Refactor data type action Kamelet to use new Camel 4 data type processor - Keep those data type transformer implementations (Avro, Json Struct, ...) that have not been ported to Camel core yet - Update to YAKS 0.16.0 as it allows to explicitly set the camel-kamelets version in Camel JBang - Update aws-ddb-sink Kamelet to use new data type transform API --- .github/workflows/yaks-tests.yaml | 6 +- kamelets/aws-ddb-sink.kamelet.yaml | 13 +- kamelets/data-type-action.kamelet.yaml | 27 +-- .../utils/format/AnnotationDataTypeLoader.java | 172 - .../kamelets/utils/format/DataTypeProcessor.java | 110 --- .../utils/format/DefaultDataTypeConverter.java | 85 - .../format/DefaultDataTypeConverterResolver.java | 67 --- .../utils/format/DefaultDataTypeRegistry.java | 206 - .../format/converter/avro/AvroBinaryDataType.java | 42 +++-- .../format/converter/avro/AvroStructDataType.java | 30 +-- .../converter/aws2/ddb/Ddb2JsonInputType.java | 67 +++ .../aws2/s3/AWS2S3CloudEventOutputType.java| 23 +-- .../format/converter/bytes/ByteArrayDataType.java | 41 .../converter/http/HttpCloudEventOutputType.java | 18 +- .../utils/format/converter/json/JsonDataType.java | 24 +-- .../format/converter/json/JsonStructDataType.java | 26 +-- .../format/converter/pojo/JavaObjectDataType.java | 40 ++-- .../format/converter/text/StringDataType.java | 47 - .../utils/format/spi/DataTypeConverter.java| 75 .../format/spi/DataTypeConverterResolver.java | 53 -- .../kamelets/utils/format/spi/DataTypeLoader.java | 31 .../utils/format/spi/DataTypeRegistry.java | 68 --- .../utils/format/spi/annotations/DataType.java | 56 -- .../converter/camel-application-octet-stream | 18 -- .../camel/datatype/converter/camel-plain-text | 18 -- .../application-json} | 0 .../application-x-java-object} | 0 .../application-x-struct} | 0 .../camel-avro-binary => transformer/avro-binary} | 0 .../avro-x-struct} | 0 .../aws2-ddb-application-json | 0 .../aws2-s3-application-cloudevents| 0 .../http-application-cloudevents | 0 .../utils/format/DataTypeProcessorTest.java| 99 -- .../DefaultDataTypeConverterResolverTest.java | 76 .../utils/format/DefaultDataTypeRegistryTest.java | 56 -- .../converter/aws2/ddb/Ddb2JsonInputTypeTest.java | 28 ++- .../aws2/s3/AWS2S3CloudEventOutputTypeTest.java| 68 --- .../http/HttpCloudEventOutputTypeTest.java | 15 +- .../standard/bytes/ByteArrayDataTypeTest.java | 103 --- .../standard/text/StringDataTypeTest.java | 91 - .../format/converter/test/UppercaseDataType.java | 31 .../services/org/apache/camel/DataTypeConverter| 18 -- .../camel/datatype/converter/camel-lowercase | 18 -- .../org/apache/camel/datatype/converter/foo-json | 18 -- .../resources/kamelets/aws-ddb-sink.kamelet.yaml | 13 +- .../kamelets/data-type-action.kamelet.yaml | 27 +-- test/avro-data-type/avro-to-log-binding.yaml | 1 - test/avro-data-type/json-to-avro-binding.yaml | 1 - 49 files changed, 200 insertions(+), 1826 deletions(-) diff --git a/.github/workflows/yaks-tests.yaml b/.github/workflows/yaks-tests.yaml index 627d5821..45a9c4c9 100644 --- a/.github/workflows/yaks-tests.yaml +++ b/.github/workflows/yaks-tests.yaml @@ -41,8 +41,8 @@ concurrency: cancel-in-progress: true env: - YAKS_VERSION: 0.15.1 - YAKS_RUN_OPTIONS: "--timeout=15m --local -e YAKS_CAMELK_MAX_ATTEMPTS=10 -e YAKS_JBANG_CAMEL_VERSION=4.0.0 -e YAKS_JBANG_KAMELETS_LOCAL_DIR=../../../kamelets -e YAKS_CAMELK_KAMELET_API_VERSION=v1alpha1" + YAKS_VERSION: 0.16.0 + YAKS_RUN_OPTIONS: "--timeout=15m --local -e YAKS_
[GitHub] [camel-kamelets] oscerd merged pull request #1607: Use Data Type Transformer API provided by Camel 4.0
oscerd merged PR #1607: URL: https://github.com/apache/camel-kamelets/pull/1607 -- 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: Update .asf.yaml
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 a6a34882 Update .asf.yaml a6a34882 is described below commit a6a34882848211022bbadd2527cee5df9c074bcd Author: Andrea Cosentino AuthorDate: Fri Sep 1 07:41:57 2023 +0200 Update .asf.yaml --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index ebf02741..8c367120 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -20,7 +20,7 @@ notifications: issues: commits@camel.apache.org pullrequests: commits@camel.apache.org github: - description: "Apache Camel Kamelet Repository" + description: "Apache Camel Kamelets Repository" homepage: https://camel.apache.org labels: - camel
[camel] branch regen_bot updated (d415b2b4fd5 -> 5d4a1fc8138)
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 d415b2b4fd5 [CAMEL-19703] Follow up: Align kebab-case properties usage to camelCase (#11264) add 5d4a1fc8138 Upgrade Vertx to version 4.4.5 (#11266) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch main updated: Point Dockerfile for camel-jbang to version 4.0.0
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 f0fd846c660 Point Dockerfile for camel-jbang to version 4.0.0 f0fd846c660 is described below commit f0fd846c66030ddfc241f86aa2d26081a1d74a4f Author: Andrea Cosentino AuthorDate: Fri Sep 1 07:27:11 2023 +0200 Point Dockerfile for camel-jbang to version 4.0.0 Signed-off-by: Andrea Cosentino --- dsl/camel-jbang/camel-jbang-container/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dsl/camel-jbang/camel-jbang-container/Dockerfile b/dsl/camel-jbang/camel-jbang-container/Dockerfile index 7ba63f12560..1e448e4771e 100644 --- a/dsl/camel-jbang/camel-jbang-container/Dockerfile +++ b/dsl/camel-jbang/camel-jbang-container/Dockerfile @@ -19,5 +19,5 @@ FROM docker.io/jbangdev/jbang-action RUN jbang trust add https://github.com/apache/camel -ENTRYPOINT [ "jbang", "-Dcamel.jbang.version=4.0.0-RC1", "camel@apache/camel"] +ENTRYPOINT [ "jbang", "-Dcamel.jbang.version=4.0.0", "camel@apache/camel"]
[camel] branch aws-sdk-2.20.138 deleted (was 1d1a6ffa67c)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch aws-sdk-2.20.138 in repository https://gitbox.apache.org/repos/asf/camel.git was 1d1a6ffa67c Regen The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: Upgrade AWS SDK v2 to version 2.20.138 (#11265)
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 b6fe4f25202 Upgrade AWS SDK v2 to version 2.20.138 (#11265)
b6fe4f25202 is described below
commit b6fe4f2520281f0f1d30a0277faba43feeb3edbc
Author: Andrea Cosentino
AuthorDate: Fri Sep 1 07:21:46 2023 +0200
Upgrade AWS SDK v2 to version 2.20.138 (#11265)
* Upgrade AWS SDK v2 to version 2.20.138
Signed-off-by: Andrea Cosentino
* Regen
Signed-off-by: Andrea Cosentino
-
Signed-off-by: Andrea Cosentino
---
.../camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java| 2 +-
.../java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java| 1 -
.../camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java | 4 ++--
.../java/org/apache/camel/component/mllp/MllpTcpClientProducer.java | 1 -
.../src/main/java/org/apache/camel/component/seda/SedaEndpoint.java | 3 ---
parent/pom.xml| 2 +-
6 files changed, 4 insertions(+), 9 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
index e0a9e69beb2..138995c6e59 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
@@ -213,7 +213,7 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
}
state = null;
}
-
+
} catch (Exception e) {
getEndpoint().getS3Client()
.abortMultipartUpload(AbortMultipartUploadRequest.builder().bucket(getConfiguration().getBucketName())
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
index d99e4405afa..fa166fdcdb8 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
@@ -26,7 +26,6 @@ import org.apache.camel.StreamCache;
import org.apache.camel.component.aws2.s3.AWS2S3Configuration;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.StringHelper;
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
index f1eef645c19..d8d52d687ec 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
@@ -43,9 +43,9 @@ public class S3StreamUploadTimeoutIT extends Aws2S3Base {
@Test
public void sendIn() throws Exception {
-for(int i = 1; i <= 2; i++) {
+for (int i = 1; i <= 2; i++) {
int count = i * 23;
-
+
result.expectedMessageCount(count);
for (int j = 0; j < 23; j++) {
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
index 19796a11e4b..802d7b8914b 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
@@ -112,7 +112,6 @@ public class MllpTcpClientProducer extends DefaultProducer
implements Runnable {
String fullEndpointKey = getEndpoint().getEndpointKey();
String endpointKey = StringHelper.before(fullEndpointKey, "?",
fullEndpointKey);
-
idleTimeoutExecutor =
Executors.newSingleThreadScheduledExecutor(new
IdleTimeoutThreadFactory(endpointKey));
}
diff --git
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoin
[GitHub] [camel] oscerd merged pull request #11265: Upgrade AWS SDK v2 to version 2.20.138
oscerd merged PR #11265: URL: https://github.com/apache/camel/pull/11265 -- 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 vertx-4.4.5 deleted (was 353d282c482)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch vertx-4.4.5 in repository https://gitbox.apache.org/repos/asf/camel.git was 353d282c482 Upgrade Vertx to version 4.4.5 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: Upgrade Vertx to version 4.4.5 (#11266)
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 5d4a1fc8138 Upgrade Vertx to version 4.4.5 (#11266) 5d4a1fc8138 is described below commit 5d4a1fc813804c4a0f541f2715e6c01e20ad58ea Author: Andrea Cosentino AuthorDate: Fri Sep 1 07:21:34 2023 +0200 Upgrade Vertx to version 4.4.5 (#11266) Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a1655fd31ac..3d5cd4e8baa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -453,7 +453,7 @@ 0.10.4 3.1 2.3 -4.4.4 +4.4.5 0.7 5.0.0 4.10.0
[GitHub] [camel] oscerd merged pull request #11266: Upgrade Vertx to version 4.4.5
oscerd merged PR #11266: URL: https://github.com/apache/camel/pull/11266 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11266: Upgrade Vertx to version 4.4.5
github-actions[bot] commented on PR #11266: URL: https://github.com/apache/camel/pull/11266#issuecomment-1702159785 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd commented on pull request #11266: Upgrade Vertx to version 4.4.5
oscerd commented on PR #11266: URL: https://github.com/apache/camel/pull/11266#issuecomment-1702159676 /component-tests camel-vertx/camel-vertx camel-vertx/camel-vertx-common camel-vertx/camel-vertx-http camel-vertx/camel-vertx-websocket -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11266: Upgrade Vertx to version 4.4.5
github-actions[bot] commented on PR #11266: URL: https://github.com/apache/camel/pull/11266#issuecomment-1702158269 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd commented on pull request #11266: Upgrade Vertx to version 4.4.5
oscerd commented on PR #11266: URL: https://github.com/apache/camel/pull/11266#issuecomment-1702158162 /component-tests camel-vertx/camel-vertx camel-vertx/camel-vertx-coimmon camel-vertx/camel-vertx-http camel-vertx/camel-vertx-websocket -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11266: Upgrade Vertx to version 4.4.5
github-actions[bot] commented on PR #11266: URL: https://github.com/apache/camel/pull/11266#issuecomment-1702157788 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd opened a new pull request, #11266: Upgrade Vertx to version 4.4.5
oscerd opened a new pull request, #11266: URL: https://github.com/apache/camel/pull/11266 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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 vertx-4.4.5 created (now 353d282c482)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch vertx-4.4.5 in repository https://gitbox.apache.org/repos/asf/camel.git at 353d282c482 Upgrade Vertx to version 4.4.5 This branch includes the following new commits: new 353d282c482 Upgrade Vertx to version 4.4.5 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 01/01: Upgrade Vertx to version 4.4.5
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch vertx-4.4.5 in repository https://gitbox.apache.org/repos/asf/camel.git commit 353d282c482472486fd3c46bfa75194eca68a8e2 Author: Andrea Cosentino AuthorDate: Fri Sep 1 06:54:51 2023 +0200 Upgrade Vertx to version 4.4.5 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a1655fd31ac..3d5cd4e8baa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -453,7 +453,7 @@ 0.10.4 3.1 2.3 -4.4.4 +4.4.5 0.7 5.0.0 4.10.0
[GitHub] [camel] github-actions[bot] commented on pull request #11265: Upgrade AWS SDK v2 to version 2.20.138
github-actions[bot] commented on PR #11265: URL: https://github.com/apache/camel/pull/11265#issuecomment-1702149094 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd opened a new pull request, #11265: Upgrade AWS SDK v2 to version 2.20.138
oscerd opened a new pull request, #11265: URL: https://github.com/apache/camel/pull/11265 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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 aws-sdk-2.20.138 created (now 1d1a6ffa67c)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch aws-sdk-2.20.138 in repository https://gitbox.apache.org/repos/asf/camel.git at 1d1a6ffa67c Regen This branch includes the following new commits: new 9080d1b4d8d Upgrade AWS SDK v2 to version 2.20.138 new 1d1a6ffa67c 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.
[camel] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch aws-sdk-2.20.138
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1d1a6ffa67c00a8461389bd180ac858b39f58d24
Author: Andrea Cosentino
AuthorDate: Fri Sep 1 06:42:02 2023 +0200
Regen
Signed-off-by: Andrea Cosentino
---
.../camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java| 2 +-
.../java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java| 1 -
.../camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java | 4 ++--
.../java/org/apache/camel/component/mllp/MllpTcpClientProducer.java | 1 -
.../src/main/java/org/apache/camel/component/seda/SedaEndpoint.java | 3 ---
5 files changed, 3 insertions(+), 8 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
index e0a9e69beb2..138995c6e59 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
@@ -213,7 +213,7 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
}
state = null;
}
-
+
} catch (Exception e) {
getEndpoint().getS3Client()
.abortMultipartUpload(AbortMultipartUploadRequest.builder().bucket(getConfiguration().getBucketName())
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
index d99e4405afa..fa166fdcdb8 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
@@ -26,7 +26,6 @@ import org.apache.camel.StreamCache;
import org.apache.camel.component.aws2.s3.AWS2S3Configuration;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.StringHelper;
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
diff --git
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
index f1eef645c19..d8d52d687ec 100644
---
a/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
+++
b/components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/S3StreamUploadTimeoutIT.java
@@ -43,9 +43,9 @@ public class S3StreamUploadTimeoutIT extends Aws2S3Base {
@Test
public void sendIn() throws Exception {
-for(int i = 1; i <= 2; i++) {
+for (int i = 1; i <= 2; i++) {
int count = i * 23;
-
+
result.expectedMessageCount(count);
for (int j = 0; j < 23; j++) {
diff --git
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
index 19796a11e4b..802d7b8914b 100644
---
a/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
+++
b/components/camel-mllp/src/main/java/org/apache/camel/component/mllp/MllpTcpClientProducer.java
@@ -112,7 +112,6 @@ public class MllpTcpClientProducer extends DefaultProducer
implements Runnable {
String fullEndpointKey = getEndpoint().getEndpointKey();
String endpointKey = StringHelper.before(fullEndpointKey, "?",
fullEndpointKey);
-
idleTimeoutExecutor =
Executors.newSingleThreadScheduledExecutor(new
IdleTimeoutThreadFactory(endpointKey));
}
diff --git
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
index e59dc325e1e..7f9f58d0398 100644
---
a/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
+++
b/components/camel-seda/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java
@@ -221,7 +221,6 @@ public class SedaEndpoint extends DefaultEndpoint
implements AsyncEndpoint, Brow
}
}
-
[camel] 01/02: Upgrade AWS SDK v2 to version 2.20.138
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch aws-sdk-2.20.138 in repository https://gitbox.apache.org/repos/asf/camel.git commit 9080d1b4d8d6723770f3cad0a955b6d8052349ca Author: Andrea Cosentino AuthorDate: Fri Sep 1 06:35:40 2023 +0200 Upgrade AWS SDK v2 to version 2.20.138 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a1655fd31ac..232d8617a35 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,7 +68,7 @@ 1.11.2 1.11.2 4.2.0 -2.20.137 +2.20.138 2.14.0 1.2.15 12.0.0-beta.18
[GitHub] [camel-quarkus] zhfeng commented on issue #5242: Error while compiling application
zhfeng commented on issue #5242: URL: https://github.com/apache/camel-quarkus/issues/5242#issuecomment-1702034012 Did you use the parallel building, such like `-T2` was passed to maven? As far as I know, the `camel-quarkus-3.2.0` is just released and it is based on Quarkus 3.2.5.Final, can you try this one? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1702016275 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 6044604233-1226-90fb66da-e1ab-4b2f-9aa0-891c910436fd * Camel Quarkus Commit: ea4f079edca85059b9aa42c730f2ebe491b58c03 * Quarkus Main Commit: Unknown * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6044604233 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-2.0.x updated: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-2.0.x by this push:
new 3e5945cf8 chore: nightly SBOM update
3e5945cf8 is described below
commit 3e5945cf8d4d303477a10c17a90420b435bc618a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Sep 1 00:52:55 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index d6092a295..f9f9dba49 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:db3c40f0-9309-422d-8ac1-6927a6856c86",
+ "serialNumber": "urn:uuid:4c732b3c-6b9f-4470-aeb1-ed16430c7c02",
"version": 1,
"metadata": {
-"timestamp": "2023-08-31T00:51:02Z",
+"timestamp": "2023-09-01T00:52:55Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831004641-a3dfdf0acd15?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831005102-dd1bac9952a9?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20230831004641-a3dfdf0acd15",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831004641-a3dfdf0acd15?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230831005102-dd1bac9952a9",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831005102-dd1bac9952a9?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -4021,7 +4021,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831004641-a3dfdf0acd15?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831005102-dd1bac9952a9?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.29?type=module",
[camel] branch regen_bot updated (5188ef9de6b -> d415b2b4fd5)
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 5188ef9de6b CAMEL-19818: handle all schema references in response types. (#11262) add d415b2b4fd5 [CAMEL-19703] Follow up: Align kebab-case properties usage to camelCase (#11264) No new revisions were added by this update. Summary of changes: .../maven/dsl/yaml/GenerateYamlSchemaMojo.java | 48 +- .../generated/resources/schema/camelYamlDsl.json | 637 ++--- .../org/apache/camel/dsl/yaml/MarshalTest.groovy | 6 +- .../src/it/simple-yaml-dto-v3/verify.groovy| 2 +- .../generator/openapi/RestDslYamlGenerator.java| 2 +- .../OpenApiV3PetstoreWithRestComponentYaml.txt | 2 +- 6 files changed, 343 insertions(+), 354 deletions(-)
[camel-k] branch release-1.12.x updated: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.12.x by this push:
new e2a5e6f0b Periodic Sync of Camel K Main Branch for SBOM Generation
e2a5e6f0b is described below
commit e2a5e6f0b59a13ff99676b098842ed09cb29367a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Sep 1 00:39:36 2023 +
Periodic Sync of Camel K Main Branch for SBOM Generation
---
camel-k-sbom/camel-k-sbom.json | 54 +-
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 589cd97a3..a477ca804 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:a1309d76-68ac-40b2-bc74-32b6c2bc392b",
+ "serialNumber": "urn:uuid:70e138a3-742c-4270-bda6-67d5f4f4e9bc",
"version": 1,
"metadata": {
-"timestamp": "2023-08-31T00:35:08Z",
+"timestamp": "2023-09-01T00:39:36Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230831003019-265a944d03eb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230831003508-e46a7b8f9281?type=module",
"type": "application",
"name": "github.com/apache/camel-k",
- "version": "v0.0.0-20230831003019-265a944d03eb",
- "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230831003019-265a944d03eb?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230831003508-e46a7b8f9281",
+ "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230831003508-e46a7b8f9281?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -510,18 +510,18 @@
}
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230831003019-265a944d03eb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230831003508-e46a7b8f9281?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/apis/camel",
- "version": "v0.0.0-20230831003019-265a944d03eb",
+ "version": "v0.0.0-20230831003508-e46a7b8f9281",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"2242efe0c7f85becaa0a6678109ecc7c436b16e773e355b81bb3b5f16da01723"
+ "content":
"ca93579b2d838ac7f6fdc7b0b3aab98743554d0ec8bcfaedc573bbbc49d4413c"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230831003019-265a944d03eb?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230831003508-e46a7b8f9281?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/apis/camel";,
@@ -530,18 +530,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230831003019-265a944d03eb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230831003508-e46a7b8f9281?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/client/camel",
- "version": "v0.0.0-20230831003019-265a944d03eb",
+ "version": "v0.0.0-20230831003508-e46a7b8f9281",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"5da52d5196ee92b038ee9fe1e96d6924e8e30d242e7afc3264417e595fe8ca34"
+ "content":
"fbec98c4be660d00dc61ac2cf14105c5386003b21310f812fa677b6f4df11fcf"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230831003019-265a944d03eb?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230831003508-e46a7b8f9281?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/client/camel";,
@@ -550,18 +550,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230831003019-265a944d03eb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230831003508-e46a7b8f9281?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/kamelet/repository",
-
[camel] branch main updated: [CAMEL-19703] Follow up: Align kebab-case properties usage to camelCase (#11264)
This is an automated email from the ASF dual-hosted git repository.
igarashitm 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 d415b2b4fd5 [CAMEL-19703] Follow up: Align kebab-case properties usage
to camelCase (#11264)
d415b2b4fd5 is described below
commit d415b2b4fd5c87cdf196e410444e676ba4f020ef
Author: Tomohisa Igarashi
AuthorDate: Thu Aug 31 20:30:18 2023 -0400
[CAMEL-19703] Follow up: Align kebab-case properties usage to camelCase
(#11264)
* Fixed openapi-rest generator to use `restConfiguration`
* Fixed YAML DSL schema to use camelCase properties deeper in the schema
composition
---
.../maven/dsl/yaml/GenerateYamlSchemaMojo.java | 48 +-
.../generated/resources/schema/camelYamlDsl.json | 637 ++---
.../org/apache/camel/dsl/yaml/MarshalTest.groovy | 6 +-
.../src/it/simple-yaml-dto-v3/verify.groovy| 2 +-
.../generator/openapi/RestDslYamlGenerator.java| 2 +-
.../OpenApiV3PetstoreWithRestComponentYaml.txt | 2 +-
6 files changed, 343 insertions(+), 354 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSchemaMojo.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSchemaMojo.java
index b12fb86c624..6f49eab9dda 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSchemaMojo.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSchemaMojo.java
@@ -307,27 +307,39 @@ public class GenerateYamlSchemaMojo extends
GenerateYamlSupportMojo {
}
private void kebabToCamelCase(JsonNode node) {
-if (node instanceof ObjectNode) {
-ObjectNode on = (ObjectNode) node;
-JsonNode jn = on.get("properties");
-if (jn == null || jn.isEmpty()) {
-jn = on.findPath("properties");
+if (node.has("not")) {
+node = node.withObject("/not");
+}
+var composition = extractComposition(node);
+if (composition != null) {
+composition.forEach(this::kebabToCamelCase);
+}
+if (node.has("properties")) {
+ObjectNode props = node.withObject("/properties");
+ArrayNode required = null;
+if (node.has("required")) {
+required = node.withArray("required");
}
-if (jn != null && !jn.isEmpty() && jn instanceof ObjectNode) {
-ObjectNode p = (ObjectNode) jn;
-Map rebuild = new LinkedHashMap<>();
-// the properties are in mixed kebab-case and camelCase
-for (Iterator it = p.fieldNames(); it.hasNext();) {
-String n = it.next();
-String t = StringHelper.dashToCamelCase(n);
-JsonNode prop = p.get(n);
-rebuild.put(t, prop);
-}
-if (!rebuild.isEmpty()) {
-p.removeAll();
-rebuild.forEach(p::set);
+Map rebuild = new LinkedHashMap<>();
+// the properties are in mixed kebab-case and camelCase
+for (Iterator it = props.fieldNames(); it.hasNext();) {
+String n = it.next();
+String t = StringHelper.dashToCamelCase(n);
+JsonNode prop = props.get(n);
+rebuild.put(t, prop);
+if (required != null) {
+for (int i = 0; i < required.size(); i++) {
+String r = required.get(i).asText();
+if (r.equals(n)) {
+required.set(i, t);
+}
+}
}
}
+if (!rebuild.isEmpty()) {
+props.removeAll();
+rebuild.forEach(props::set);
+}
}
}
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index d64d99b17a0..26eff2dafa7 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -793,7 +793,7 @@
}, {
"required" : [ "datasonnet" ]
}, {
-"required" : [ "exchange-property" ]
+"required" : [ "exchangeProperty" ]
}, {
"required" : [ "exchangeProperty" ]
}, {
@@ -885,7 +885,6 @@
"constant" : { },
"csimple" : { },
"datasonnet" : { },
- "excha
[GitHub] [camel] igarashitm merged pull request #11264: [CAMEL-19703] Follow up: Align kebab-case properties usage to camelCase
igarashitm merged PR #11264: URL: https://github.com/apache/camel/pull/11264 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated (ad18c2c38 -> 535fa6308)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from ad18c2c38 chore: nightly coverage badge update new 6f0f0c311 chore: changelog automatic update new 535fa6308 chore: nightly SBOM update 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: CHANGELOG.md | 1 + camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 6f0f0c311e9ed5ac2fd3f71d0731afb38b942485 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Aug 31 23:44:04 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57e435a77..c0b6a7f7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ **Closed issues:** - \[Bug\]: TEST [\#4702](https://github.com/apache/camel-k/issues/4702) +- camel-k with spring config [\#4376](https://github.com/apache/camel-k/issues/4376) - jib builder [\#1656](https://github.com/apache/camel-k/issues/1656) **Merged pull requests:**
[camel-k] 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 535fa63089af4942fba2e0a5f57a62b96828caf8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 31 23:49:40 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 768095967..f672b36d4 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:c45e284f-d6fe-4e36-8c44-7d3fb10cbced",
+ "serialNumber": "urn:uuid:66d85524-f614-41a1-8a86-76d2f0ad3331",
"version": 1,
"metadata": {
-"timestamp": "2023-08-30T23:46:50Z",
+"timestamp": "2023-08-31T23:49:40Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230830234625-806d24c9a9f7?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831234404-6f0f0c311e9e?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20230830234625-806d24c9a9f7",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230830234625-806d24c9a9f7?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230831234404-6f0f0c311e9e",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831234404-6f0f0c311e9e?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -4021,7 +4021,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230830234625-806d24c9a9f7?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230831234404-6f0f0c311e9e?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.34?type=module",
[camel-spring-boot-examples] branch main updated: Use current version of camel in property.
This is an automated email from the ASF dual-hosted git repository. klease pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git The following commit(s) were added to refs/heads/main by this push: new ce884ca Use current version of camel in property. ce884ca is described below commit ce884ca2f6ef3db26dd9d6d14abc9e42cad72c1c Author: klease AuthorDate: Thu Aug 31 23:37:30 2023 +0200 Use current version of camel in property. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6bc5e3e..420ded6 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ - 4.0.0-SNAPSHOT + 4.1.0-SNAPSHOT false 4.0.1 1.9.1
[GitHub] [camel] igarashitm opened a new pull request, #11264: [CAMEL-19703] Follow up: Align kebab-case properties usage to camelCase
igarashitm opened a new pull request, #11264: URL: https://github.com/apache/camel/pull/11264 * Fixed openapi-rest generator to use `restConfiguration` * Fixed YAML DSL schema to use camelCase properties deeper in the schema composition # Description Following up previous PR #11245, fixes kebab-case leftover. # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). https://issues.apache.org/jira/browse/CAMEL-19703 # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: CAMEL-19793: update dependencies. (#925)
This is an automated email from the ASF dual-hosted git repository.
klease pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 4c5a0cd4b61 CAMEL-19793: update dependencies. (#925)
4c5a0cd4b61 is described below
commit 4c5a0cd4b6182e2f5df574d97743396b48214944
Author: klease <38634989+kle...@users.noreply.github.com>
AuthorDate: Thu Aug 31 23:06:35 2023 +0200
CAMEL-19793: update dependencies. (#925)
Replace springdoc-openapi-ui with springdoc-openapi-starter-webmvc-ui.
Update version in the parent pom.
Remove swagger-parser-v3 dependency since it is provided by
camel-openapi-java.
Fix missing assignment in SpringdocAutoConfiguration.java.
---
components-starter/camel-springdoc-starter/pom.xml | 7 +--
.../camel/springboot/springdoc/SpringdocAutoConfiguration.java | 1 +
pom.xml| 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/components-starter/camel-springdoc-starter/pom.xml
b/components-starter/camel-springdoc-starter/pom.xml
index eea805c9f8d..2958308ef7e 100644
--- a/components-starter/camel-springdoc-starter/pom.xml
+++ b/components-starter/camel-springdoc-starter/pom.xml
@@ -41,14 +41,9 @@
org.springdoc
-springdoc-openapi-ui
+springdoc-openapi-starter-webmvc-ui
${springdoc-version}
-
-io.swagger.parser.v3
-swagger-parser-v3
-${swagger-parser-v3-version}
-
org.apache.camel.springboot
camel-core-starter
diff --git
a/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
b/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
index 337f8b96a7c..f8f2e75b9a5 100644
---
a/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
+++
b/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java
@@ -121,6 +121,7 @@ public class SpringdocAutoConfiguration {
final BeanConfig bc = new BeanConfig();
final Info info = new Info();
+bc.setInfo(info);
final RestConfiguration rc = camelContext.getRestConfiguration();
Map apiProps =
Optional.ofNullable(rc.getApiProperties()).orElseGet(HashMap::new);
initOpenApi(bc, info, apiProps,
diff --git a/pom.xml b/pom.xml
index 294727001f2..2403fbc0fc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
3.4.1
3.1.2
3.0
-1.7.0
+2.2.0
${maven-surefire-plugin-version}
2.1.10
2.7.9
[GitHub] [camel] oscerd commented on pull request #11255: CAMEL-17027 make camel-aws-s3 threadsafe so it can be used concurrently
oscerd commented on PR #11255: URL: https://github.com/apache/camel/pull/11255#issuecomment-1701774285 Do we need to backport to 4.0.x too? -- 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] klease commented on pull request #11262: CAMEL-19818: handle all schema references in response types.
klease commented on PR #11262: URL: https://github.com/apache/camel/pull/11262#issuecomment-1701765989 Backported to 4.0.x -- 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 fix-openapi deleted (was 5b26d1b182f)
This is an automated email from the ASF dual-hosted git repository. klease pushed a change to branch fix-openapi in repository https://gitbox.apache.org/repos/asf/camel.git was 5b26d1b182f CAMEL-19818: handle all schema references in response types. (#11262) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch camel-4.0.x updated: CAMEL-19818: handle all schema references in response types. (#11262) (#11263)
This is an automated email from the ASF dual-hosted git repository.
klease pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 955270a1d76 CAMEL-19818: handle all schema references in response
types. (#11262) (#11263)
955270a1d76 is described below
commit 955270a1d76740ba9e9cb340abaa1931423308c7
Author: klease <38634989+kle...@users.noreply.github.com>
AuthorDate: Thu Aug 31 22:52:40 2023 +0200
CAMEL-19818: handle all schema references in response types. (#11262)
(#11263)
---
.../java/org/apache/camel/openapi/RestOpenApiReader.java | 14 --
.../apache/camel/openapi/RestOpenApiReaderModelTest.java | 2 ++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index f5e38ebff75..6c298f46b6b 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -1066,7 +1066,7 @@ public class RestOpenApiReader {
Parameter parameter, Operation operation, ApiDescription api,
Map> params, Map cookies,
Map> headers) {
if (parameter.getContent() != null) {
-processRefsInContent(parameter.getContent());
+processRefsInContent(parameter.getContent(), params, cookies,
headers);
}
return Optional.of(parameter);
}
@@ -1076,7 +1076,7 @@ public class RestOpenApiReader {
RequestBody requestBody, Operation operation, ApiDescription
api,
Map> params, Map cookies,
Map> headers) {
if (requestBody.getContent() != null) {
-processRefsInContent(requestBody.getContent());
+processRefsInContent(requestBody.getContent(), params,
cookies, headers);
}
return Optional.of(requestBody);
}
@@ -1086,7 +1086,7 @@ public class RestOpenApiReader {
ApiResponse response, Operation operation, ApiDescription api,
Map> params, Map cookies,
Map> headers) {
if (response.getContent() != null) {
-processRefsInContent(response.getContent());
+processRefsInContent(response.getContent(), params, cookies,
headers);
}
return Optional.of(response);
}
@@ -1135,10 +1135,12 @@ public class RestOpenApiReader {
return Optional.of(schema);
}
-private void processRefsInContent(Content content) {
+private void processRefsInContent(
+Content content, Map> params,
+Map cookies, Map>
headers) {
for (MediaType media : content.values()) {
-if (media.getSchema() != null && media.getSchema().get$ref()
!= null) {
-
media.getSchema().set$ref(fixSchemaReference(media.getSchema().get$ref(),
OAS30_SCHEMA_DEFINITION_PREFIX));
+if (media.getSchema() != null) {
+filterSchema(media.getSchema(), params, cookies, headers);
}
}
}
diff --git
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
index e343c16bfb5..2d630abb16e 100644
---
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
+++
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
@@ -89,6 +89,7 @@ public class RestOpenApiReaderModelTest extends
CamelTestSupport {
assertTrue(json.contains("\"host\" : \"localhost:8080\""));
assertTrue(json.contains("\"description\" : \"The user returned\""));
assertTrue(json.contains("\"$ref\" : \"#/definitions/User\""));
+assertFalse(json.contains("\"$ref\" :
\"#/definitions/org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"x-className\""));
assertTrue(json.contains("\"format\" :
\"org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"type\" : \"string\""));
@@ -119,6 +120,7 @@ public class RestOpenApiReaderModelTest extends
CamelTestSupport {
assertTrue(json.contains("\"url\" : \"http://localhost:8080/api\"";));
assertTrue(json.contains("\"description\" : \"The user returned\""));
assertTrue(json.contains("\"$ref\" : \"#/components/schemas/User\""));
+assertFalse(json.contains("\"$ref\" :
\"#/components/schemas/org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"format\
[GitHub] [camel] klease merged pull request #11263: CAMEL-19818: handle all schema references in response types. (#11262)
klease merged PR #11263: URL: https://github.com/apache/camel/pull/11263 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11263: CAMEL-19818: handle all schema references in response types. (#11262)
github-actions[bot] commented on PR #11263: URL: https://github.com/apache/camel/pull/11263#issuecomment-1701764499 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] klease opened a new pull request, #11263: CAMEL-19818: handle all schema references in response types. (#11262)
klease opened a new pull request, #11263: URL: https://github.com/apache/camel/pull/11263 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: CAMEL-19818: handle all schema references in response types. (#11262)
This is an automated email from the ASF dual-hosted git repository.
klease pushed a commit to branch fix-openapi
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5b26d1b182fd0b208133e67ecbf3bb51f52b047e
Author: klease
AuthorDate: Thu Aug 31 22:49:44 2023 +0200
CAMEL-19818: handle all schema references in response types. (#11262)
---
.../java/org/apache/camel/openapi/RestOpenApiReader.java | 14 --
.../apache/camel/openapi/RestOpenApiReaderModelTest.java | 2 ++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index f5e38ebff75..6c298f46b6b 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -1066,7 +1066,7 @@ public class RestOpenApiReader {
Parameter parameter, Operation operation, ApiDescription api,
Map> params, Map cookies,
Map> headers) {
if (parameter.getContent() != null) {
-processRefsInContent(parameter.getContent());
+processRefsInContent(parameter.getContent(), params, cookies,
headers);
}
return Optional.of(parameter);
}
@@ -1076,7 +1076,7 @@ public class RestOpenApiReader {
RequestBody requestBody, Operation operation, ApiDescription
api,
Map> params, Map cookies,
Map> headers) {
if (requestBody.getContent() != null) {
-processRefsInContent(requestBody.getContent());
+processRefsInContent(requestBody.getContent(), params,
cookies, headers);
}
return Optional.of(requestBody);
}
@@ -1086,7 +1086,7 @@ public class RestOpenApiReader {
ApiResponse response, Operation operation, ApiDescription api,
Map> params, Map cookies,
Map> headers) {
if (response.getContent() != null) {
-processRefsInContent(response.getContent());
+processRefsInContent(response.getContent(), params, cookies,
headers);
}
return Optional.of(response);
}
@@ -1135,10 +1135,12 @@ public class RestOpenApiReader {
return Optional.of(schema);
}
-private void processRefsInContent(Content content) {
+private void processRefsInContent(
+Content content, Map> params,
+Map cookies, Map>
headers) {
for (MediaType media : content.values()) {
-if (media.getSchema() != null && media.getSchema().get$ref()
!= null) {
-
media.getSchema().set$ref(fixSchemaReference(media.getSchema().get$ref(),
OAS30_SCHEMA_DEFINITION_PREFIX));
+if (media.getSchema() != null) {
+filterSchema(media.getSchema(), params, cookies, headers);
}
}
}
diff --git
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
index e343c16bfb5..2d630abb16e 100644
---
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
+++
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
@@ -89,6 +89,7 @@ public class RestOpenApiReaderModelTest extends
CamelTestSupport {
assertTrue(json.contains("\"host\" : \"localhost:8080\""));
assertTrue(json.contains("\"description\" : \"The user returned\""));
assertTrue(json.contains("\"$ref\" : \"#/definitions/User\""));
+assertFalse(json.contains("\"$ref\" :
\"#/definitions/org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"x-className\""));
assertTrue(json.contains("\"format\" :
\"org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"type\" : \"string\""));
@@ -119,6 +120,7 @@ public class RestOpenApiReaderModelTest extends
CamelTestSupport {
assertTrue(json.contains("\"url\" : \"http://localhost:8080/api\"";));
assertTrue(json.contains("\"description\" : \"The user returned\""));
assertTrue(json.contains("\"$ref\" : \"#/components/schemas/User\""));
+assertFalse(json.contains("\"$ref\" :
\"#/components/schemas/org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"format\" :
\"org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"type\" : \"string\""));
assertTrue(json.contains("\"format\" : \"date\""));
[camel] branch fix-openapi created (now 5b26d1b182f)
This is an automated email from the ASF dual-hosted git repository. klease pushed a change to branch fix-openapi in repository https://gitbox.apache.org/repos/asf/camel.git at 5b26d1b182f CAMEL-19818: handle all schema references in response types. (#11262) This branch includes the following new commits: new 5b26d1b182f CAMEL-19818: handle all schema references in response types. (#11262) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch regen_bot updated (df3e080a138 -> 5188ef9de6b)
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 df3e080a138 CAMEL-17027 make camel-aws-s3 threadsafe so it can be used concurrently (#11255) add 905eac37204 Mapstruct: Method must be public in DefaultMapStructFinder.discoverMappings (#11261) add 5188ef9de6b CAMEL-19818: handle all schema references in response types. (#11262) No new revisions were added by this update. Summary of changes: .../camel/component/mapstruct/DefaultMapStructFinder.java | 5 + .../java/org/apache/camel/openapi/RestOpenApiReader.java | 14 -- .../apache/camel/openapi/RestOpenApiReaderModelTest.java | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-)
[camel] branch main updated: CAMEL-19818: handle all schema references in response types. (#11262)
This is an automated email from the ASF dual-hosted git repository.
klease 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 5188ef9de6b CAMEL-19818: handle all schema references in response
types. (#11262)
5188ef9de6b is described below
commit 5188ef9de6b2a8c72b7c0011fdfd9b28bddb6dbf
Author: klease <38634989+kle...@users.noreply.github.com>
AuthorDate: Thu Aug 31 22:32:00 2023 +0200
CAMEL-19818: handle all schema references in response types. (#11262)
This includes in arrays or other nested schema references.
---
.../java/org/apache/camel/openapi/RestOpenApiReader.java | 14 --
.../apache/camel/openapi/RestOpenApiReaderModelTest.java | 2 ++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index f5e38ebff75..6c298f46b6b 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -1066,7 +1066,7 @@ public class RestOpenApiReader {
Parameter parameter, Operation operation, ApiDescription api,
Map> params, Map cookies,
Map> headers) {
if (parameter.getContent() != null) {
-processRefsInContent(parameter.getContent());
+processRefsInContent(parameter.getContent(), params, cookies,
headers);
}
return Optional.of(parameter);
}
@@ -1076,7 +1076,7 @@ public class RestOpenApiReader {
RequestBody requestBody, Operation operation, ApiDescription
api,
Map> params, Map cookies,
Map> headers) {
if (requestBody.getContent() != null) {
-processRefsInContent(requestBody.getContent());
+processRefsInContent(requestBody.getContent(), params,
cookies, headers);
}
return Optional.of(requestBody);
}
@@ -1086,7 +1086,7 @@ public class RestOpenApiReader {
ApiResponse response, Operation operation, ApiDescription api,
Map> params, Map cookies,
Map> headers) {
if (response.getContent() != null) {
-processRefsInContent(response.getContent());
+processRefsInContent(response.getContent(), params, cookies,
headers);
}
return Optional.of(response);
}
@@ -1135,10 +1135,12 @@ public class RestOpenApiReader {
return Optional.of(schema);
}
-private void processRefsInContent(Content content) {
+private void processRefsInContent(
+Content content, Map> params,
+Map cookies, Map>
headers) {
for (MediaType media : content.values()) {
-if (media.getSchema() != null && media.getSchema().get$ref()
!= null) {
-
media.getSchema().set$ref(fixSchemaReference(media.getSchema().get$ref(),
OAS30_SCHEMA_DEFINITION_PREFIX));
+if (media.getSchema() != null) {
+filterSchema(media.getSchema(), params, cookies, headers);
}
}
}
diff --git
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
index e343c16bfb5..2d630abb16e 100644
---
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
+++
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
@@ -89,6 +89,7 @@ public class RestOpenApiReaderModelTest extends
CamelTestSupport {
assertTrue(json.contains("\"host\" : \"localhost:8080\""));
assertTrue(json.contains("\"description\" : \"The user returned\""));
assertTrue(json.contains("\"$ref\" : \"#/definitions/User\""));
+assertFalse(json.contains("\"$ref\" :
\"#/definitions/org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"x-className\""));
assertTrue(json.contains("\"format\" :
\"org.apache.camel.openapi.User\""));
assertTrue(json.contains("\"type\" : \"string\""));
@@ -119,6 +120,7 @@ public class RestOpenApiReaderModelTest extends
CamelTestSupport {
assertTrue(json.contains("\"url\" : \"http://localhost:8080/api\"";));
assertTrue(json.contains("\"description\" : \"The user returned\""));
assertTrue(json.contains("\"$ref\" : \"#/components/schemas/User\""));
+assertFalse(json.contains("\"$ref\" :
\"#/components/schemas/org.apache.camel.openapi.User\""));
[GitHub] [camel] klease merged pull request #11262: CAMEL-19818: handle all schema references in response types.
klease merged PR #11262: URL: https://github.com/apache/camel/pull/11262 -- 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] christophd commented on pull request #1607: Use Data Type Transformer API provided by Camel 4.0
christophd commented on PR #1607:
URL: https://github.com/apache/camel-kamelets/pull/1607#issuecomment-1701740481
YAY, tests are green!
@claudio4j thank you! Yes I really like the new way to use transform EIP in
combination with data types:
```yaml
from:
uri: "kamelet:source"
steps:
- transform:
to-type: "aws2-ddb:application-json"
- to:
uri: "aws2-ddb:{{table}}"
```
Also the built-in data type support on Kamelet source/sink makes it easy to
use it in a pipe/binding:
```yaml
kind: KameletBinding
metadata:
name: aws-s3-to-http
spec:
source:
ref:
kind: Kamelet
apiVersion: camel.apache.org/v1alpha1
name: aws-s3-source
properties:
# ...
dataTypes:
out:
format: "aws2-s3:application-cloudevents"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11262: CAMEL-19818: handle all schema references in response types.
github-actions[bot] commented on PR #11262: URL: https://github.com/apache/camel/pull/11262#issuecomment-1701700177 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] klease opened a new pull request, #11262: CAMEL-19818: handle all schema references in response types.
klease opened a new pull request, #11262: URL: https://github.com/apache/camel/pull/11262 This includes in arrays or other nested schema references. # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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 (905eac37204 -> df3e080a138)
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 905eac37204 Mapstruct: Method must be public in DefaultMapStructFinder.discoverMappings (#11261) 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 (df3e080a138) \ O -- O -- O (905eac37204) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/camel/component/mapstruct/DefaultMapStructFinder.java | 5 - 1 file changed, 5 deletions(-)
[camel] branch regen_bot updated (785dc429eab -> 905eac37204)
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 785dc429eab (chores) camel-components: replace duplicated code (#11258)
add 78c2f31110e Scheduler meta (#11260)
add df3e080a138 CAMEL-17027 make camel-aws-s3 threadsafe so it can be used
concurrently (#11255)
add 905eac37204 Mapstruct: Method must be public in
DefaultMapStructFinder.discoverMappings (#11261)
No new revisions were added by this update.
Summary of changes:
.../apache/camel/catalog/components/scheduler.json | 52 +++
.../aws2/s3/stream/AWS2S3StreamUploadProducer.java | 153 +
...IT.java => S3StreamUploadMultipartAsyncIT.java} | 13 +-
...IT.java => S3StreamUploadOperationAsyncIT.java} | 12 +-
.../s3/integration/S3StreamUploadTimeoutIT.java| 29 ++--
.../mapstruct/DefaultMapStructFinder.java | 5 +
.../scheduler/SchedulerComponentConfigurer.java| 6 +
.../scheduler/SchedulerEndpointConfigurer.java | 6 +
.../scheduler/SchedulerEndpointUriFactory.java | 3 +-
.../camel/component/scheduler/scheduler.json | 52 +++
.../component/scheduler/SchedulerComponent.java| 14 ++
.../component/scheduler/SchedulerConsumer.java | 11 +-
.../component/scheduler/SchedulerEndpoint.java | 13 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_1.adoc | 8 ++
.../dsl/SchedulerComponentBuilderFactory.java | 18 +++
.../dsl/SchedulerEndpointBuilderFactory.java | 33 +
16 files changed, 298 insertions(+), 130 deletions(-)
copy
components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/{S3StreamUploadMultipartIT.java
=> S3StreamUploadMultipartAsyncIT.java} (87%)
copy
components/camel-aws/camel-aws2-s3/src/test/java/org/apache/camel/component/aws2/s3/integration/{S3StreamUploadOperationIT.java
=> S3StreamUploadOperationAsyncIT.java} (83%)
[camel] branch camel-4.0.x updated: Mapstruct: Method must be public in DefaultMapStructFinder.discoverMappings (#11261)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 5b544c23b21 Mapstruct: Method must be public in
DefaultMapStructFinder.discoverMappings (#11261)
5b544c23b21 is described below
commit 5b544c23b216724a06eb00279a76766c9b5f6c5c
Author: Giacomo
AuthorDate: Thu Aug 31 20:27:00 2023 +0200
Mapstruct: Method must be public in DefaultMapStructFinder.discoverMappings
(#11261)
---
.../org/apache/camel/component/mapstruct/DefaultMapStructFinder.java | 5 +
1 file changed, 5 insertions(+)
diff --git
a/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/DefaultMapStructFinder.java
b/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/DefaultMapStructFinder.java
index d84a0707486..4cf015d8eb3 100644
---
a/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/DefaultMapStructFinder.java
+++
b/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/DefaultMapStructFinder.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.mapstruct;
+import java.lang.reflect.Modifier;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
@@ -59,6 +60,10 @@ public class DefaultMapStructFinder extends ServiceSupport
implements MapStructM
final Object mapper = Mappers.getMapper(clazz);
if (mapper != null) {
ReflectionHelper.doWithMethods(mapper.getClass(), mc -> {
+// must be public
+if (!Modifier.isPublic(mc.getModifiers())) {
+return;
+}
// must not be a default method
if (mc.isDefault()) {
return;
[camel] branch blueprint-noosgi created (now ee519679c19)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch blueprint-noosgi in repository https://gitbox.apache.org/repos/asf/camel.git at ee519679c19 CAMEL-19806: camel-jbang - Use aries blueprint-noosgi for parsing blueprint xml files. Experiemtal and WIP. This branch includes the following new commits: new ee519679c19 CAMEL-19806: camel-jbang - Use aries blueprint-noosgi for parsing blueprint xml files. Experiemtal and WIP. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 01/01: CAMEL-19806: camel-jbang - Use aries blueprint-noosgi for parsing blueprint xml files. Experiemtal and WIP.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch blueprint-noosgi
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ee519679c19c41a8e784e4261371dacec829ae69
Author: Claus Ibsen
AuthorDate: Thu Aug 31 20:29:55 2023 +0200
CAMEL-19806: camel-jbang - Use aries blueprint-noosgi for parsing blueprint
xml files. Experiemtal and WIP.
---
dsl/camel-kamelet-main/pom.xml | 7 +++
.../xml/blueprint/BlueprintXmlBeansHandler.java| 73 +-
2 files changed, 79 insertions(+), 1 deletion(-)
diff --git a/dsl/camel-kamelet-main/pom.xml b/dsl/camel-kamelet-main/pom.xml
index 1b80da944a8..481c9f0b2cc 100644
--- a/dsl/camel-kamelet-main/pom.xml
+++ b/dsl/camel-kamelet-main/pom.xml
@@ -40,6 +40,13 @@
+
+
+org.apache.aries.blueprint
+org.apache.aries.blueprint.noosgi
+1.2.0
+
+
org.apache.camel
camel-main
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
index 15a2e88b342..09ceb59d868 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/xml/blueprint/BlueprintXmlBeansHandler.java
@@ -16,27 +16,38 @@
*/
package org.apache.camel.main.xml.blueprint;
+import java.net.URI;
+import java.net.URL;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.StringJoiner;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.apache.aries.blueprint.NamespaceHandler;
+import org.apache.aries.blueprint.ParserContext;
+import org.apache.aries.blueprint.container.BlueprintContainerImpl;
+import org.apache.aries.blueprint.container.SimpleNamespaceHandlerSet;
import org.apache.camel.CamelContext;
import org.apache.camel.main.MainConfigurationProperties;
import org.apache.camel.main.util.XmlHelper;
import org.apache.camel.model.Model;
import org.apache.camel.model.app.RegistryBeanDefinition;
+import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.Resource;
import org.apache.camel.spi.ResourceLoader;
import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.util.StringHelper;
+import org.osgi.service.blueprint.reflect.ComponentMetadata;
+import org.osgi.service.blueprint.reflect.Metadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,7 +78,11 @@ public class BlueprintXmlBeansHandler {
if (id.startsWith("camel-xml-io-dsl-blueprint-xml:")) {
// this is a camel bean via camel-xml-io-dsl
String fileName = StringHelper.afterLast(id, ":");
-discoverBeans(camelContext, fileName, doc);
+try {
+discoverBeans(camelContext, fileName, doc);
+} catch (Exception e) {
+LOG.warn("Error due: " + e.getMessage(), e);
+}
}
});
}
@@ -76,6 +91,48 @@ public class BlueprintXmlBeansHandler {
* Invoked at later stage to create and register Blueprint beans into
Camel {@link org.apache.camel.spi.Registry}.
*/
public void createAndRegisterBeans(CamelContext camelContext) {
+
+for (Resource resource : resources.values()) {
+SimpleNamespaceHandlerSet ns = new SimpleNamespaceHandlerSet();
+
ns.addNamespace(URI.create("http://camel.apache.org/schema/blueprint";), null,
new NamespaceHandler() {
+@Override
+public URL getSchemaLocation(String s) {
+return null;
+}
+
+@Override
+public Set getManagedClasses() {
+return null;
+}
+
+@Override
+public Metadata parse(Element element, ParserContext
parserContext) {
+return null;
+}
+
+@Override
+public ComponentMetadata decorate(Node node, ComponentMetadata
componentMetadata, ParserContext parserContext) {
+return null;
+}
+});
+
+try {
+ClassLoader cl = new
MyClassLoader(camelContext.getClassResolver());
+BlueprintContainerImpl container
+= new BlueprintContainerImpl(
+cl, List.of(resource.getURL()), null,
+ns, false);
+System.out.println(container);
+
[camel] branch main updated: Mapstruct: Method must be public in DefaultMapStructFinder.discoverMappings (#11261)
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 905eac37204 Mapstruct: Method must be public in
DefaultMapStructFinder.discoverMappings (#11261)
905eac37204 is described below
commit 905eac37204dd5bf0d4bd0c6d4faffcf6b27bf9a
Author: Giacomo
AuthorDate: Thu Aug 31 20:27:00 2023 +0200
Mapstruct: Method must be public in DefaultMapStructFinder.discoverMappings
(#11261)
---
.../org/apache/camel/component/mapstruct/DefaultMapStructFinder.java | 5 +
1 file changed, 5 insertions(+)
diff --git
a/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/DefaultMapStructFinder.java
b/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/DefaultMapStructFinder.java
index d84a0707486..4cf015d8eb3 100644
---
a/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/DefaultMapStructFinder.java
+++
b/components/camel-mapstruct/src/main/java/org/apache/camel/component/mapstruct/DefaultMapStructFinder.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.mapstruct;
+import java.lang.reflect.Modifier;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
@@ -59,6 +60,10 @@ public class DefaultMapStructFinder extends ServiceSupport
implements MapStructM
final Object mapper = Mappers.getMapper(clazz);
if (mapper != null) {
ReflectionHelper.doWithMethods(mapper.getClass(), mc -> {
+// must be public
+if (!Modifier.isPublic(mc.getModifiers())) {
+return;
+}
// must not be a default method
if (mc.isDefault()) {
return;
[GitHub] [camel] davsclaus merged pull request #11261: Mapstruct: Method must be public in DefaultMapStructFinder.discoverMa…
davsclaus merged PR #11261: URL: https://github.com/apache/camel/pull/11261 -- 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-17027 make camel-aws-s3 threadsafe so it can be used concurrently (#11255)
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 df3e080a138 CAMEL-17027 make camel-aws-s3 threadsafe so it can be used
concurrently (#11255)
df3e080a138 is described below
commit df3e080a13814f530488557a7737eef90f840e6a
Author: Jono Morris
AuthorDate: Fri Sep 1 06:26:50 2023 +1200
CAMEL-17027 make camel-aws-s3 threadsafe so it can be used concurrently
(#11255)
---
.../aws2/s3/stream/AWS2S3StreamUploadProducer.java | 153 +
...IT.java => S3StreamUploadMultipartAsyncIT.java} | 50 ---
...IT.java => S3StreamUploadOperationAsyncIT.java} | 33 ++---
.../s3/integration/S3StreamUploadTimeoutIT.java| 29 ++--
4 files changed, 165 insertions(+), 100 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
index e491479f961..e0a9e69beb2 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
@@ -61,14 +61,9 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
private static final Logger LOG =
LoggerFactory.getLogger(AWS2S3StreamUploadProducer.class);
private static final String TIMEOUT_CHECKER_EXECUTOR_NAME =
"S3_Streaming_Upload_Timeout_Checker";
-ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-CreateMultipartUploadResponse initResponse;
-AtomicInteger index = new AtomicInteger(1);
-List completedParts;
-AtomicInteger part = new AtomicInteger();
-UUID id;
-String dynamicKeyName;
-CompleteMultipartUploadResponse uploadResult;
+private AtomicInteger part = new AtomicInteger();
+private UploadState uploadAggregate = null;
+private final Object lock = new Object();
private transient String s3ProducerToString;
private ScheduledExecutorService timeoutCheckerExecutorService;
@@ -94,12 +89,10 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
@Override
protected void doStop() throws Exception {
-if (ObjectHelper.isNotEmpty(initResponse)) {
-if (ObjectHelper.isNotEmpty(initResponse.uploadId())) {
-if (index.get() > 0) {
-uploadPart();
-completeUpload();
-}
+synchronized (lock) {
+if (ObjectHelper.isNotEmpty(uploadAggregate)) {
+uploadPart(uploadAggregate);
+completeUpload(uploadAggregate);
}
}
if (timeoutCheckerExecutorService != null) {
@@ -117,12 +110,11 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
@Override
public void run() {
-if (ObjectHelper.isNotEmpty(initResponse)) {
-if (ObjectHelper.isNotEmpty(initResponse.uploadId())) {
-if (index.get() > 0) {
-uploadPart();
-completeUpload();
-}
+synchronized (lock) {
+if (ObjectHelper.isNotEmpty(uploadAggregate)) {
+uploadPart(uploadAggregate);
+completeUpload(uploadAggregate);
+uploadAggregate = null;
}
}
}
@@ -132,21 +124,52 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
public void process(final Exchange exchange) throws Exception {
InputStream is = exchange.getIn().getMandatoryBody(InputStream.class);
+UploadState state = null;
int totalSize = 0;
byte[] b;
while ((b = AWS2S3Utils.toByteArray(is,
getConfiguration().getBufferSize())).length > 0) {
totalSize += b.length;
-buffer.write(b);
+synchronized (lock) {
+// aggregate with previously received exchanges
+if (ObjectHelper.isNotEmpty(uploadAggregate)) {
+uploadAggregate.buffer.write(b);
+uploadAggregate.index++;
+
+if (uploadAggregate.buffer.size() >=
getConfiguration().getBatchSize()
+|| uploadAggregate.index ==
getConfiguration().getBatchMessageNumber()) {
+
+uploadPart(uploadAggregate);
+CompleteMultipartUploadResponse uploadResult =
completeUpload(uploadAggregate);
+this.uploadAggregate = null;
+
+Message message = getMessageForResponse(exchange);
+
[GitHub] [camel] davsclaus merged pull request #11255: CAMEL-17027 make camel-aws-s3 threadsafe so it can be used concurrently
davsclaus merged PR #11255: URL: https://github.com/apache/camel/pull/11255 -- 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] carnevalegiacomo opened a new pull request, #11261: Mapstruct: Method must be public in DefaultMapStructFinder.discoverMa…
carnevalegiacomo opened a new pull request, #11261:
URL: https://github.com/apache/camel/pull/11261
Mapstruct component works with 4.0.0-RC2 version but It doesn't work with
4.0.0 version (get java.lang.IllegalAccessException).
In the 4.0.0, the method discoverMappings (class DefaultMapStructFinder)
considers implementation classes (autogenerated) and not interfaces.
Sometimes, in the implementation classes, there are private methods and so
discoverMappings method throws java.lang.IllegalAccessException.
## Skip private and protected methods
###
org.apache.camel.component.mapstruct.DefaultMapStructFinder:discoverMappings
```java
@Override
public int discoverMappings(Class clazz) {
final AtomicInteger answer = new AtomicInteger();
try {
// is there a generated mapper
final Object mapper = Mappers.getMapper(clazz);
if (mapper != null) {
ReflectionHelper.doWithMethods(mapper.getClass(), mc -> {
// must be public
if (!Modifier.isPublic(mc.getModifiers())) {
return;
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11261: Mapstruct: Method must be public in DefaultMapStructFinder.discoverMa…
github-actions[bot] commented on PR #11261: URL: https://github.com/apache/camel/pull/11261#issuecomment-1701385905 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] claudio4j commented on pull request #1607: Use Data Type Transformer API provided by Camel 4.0
claudio4j commented on PR #1607: URL: https://github.com/apache/camel-kamelets/pull/1607#issuecomment-1701348436 The implementation and kamelets are more clear and concise to use. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards co
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 71b351879ad CAMEL-19817: camel-scheduler - Turn off metadata headers
by default to make the exchange empty, and avoid leaking unwanted headers by
default. Add backwards compatible option on component to turn this on globally.
71b351879ad is described below
commit 71b351879ad5763fa19e2431d5d5d1e725d9e30c
Author: Claus Ibsen
AuthorDate: Thu Aug 31 17:12:29 2023 +0200
CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make
the exchange empty, and avoid leaking unwanted headers by default. Add
backwards compatible option on component to turn this on globally.
---
.../springboot/catalog/components/scheduler.json | 52 +++---
.../src/main/docs/scheduler.json | 7 +++
.../SchedulerComponentConfiguration.java | 13 ++
3 files changed, 47 insertions(+), 25 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scheduler.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scheduler.json
index 6f6cf3dd527..8e4be0a1462 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scheduler.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scheduler.json
@@ -23,36 +23,38 @@
},
"componentProperties": {
"bridgeErrorHandler": { "index": 0, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions occurred while the consumer is trying to pickup incoming
messages, or the likes, will now be proce [...]
-"autowiredEnabled": { "index": 1, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
-"healthCheckConsumerEnabled": { "index": 2, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
-"healthCheckProducerEnabled": { "index": 3, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on producer [...]
-"poolSize": { "index": 4, "kind": "property", "displayName": "Pool Size",
"group": "scheduler", "label": "scheduler", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "description": "Number of core threads in
the thread pool used by the scheduling thread pool. Is by default using a
single thread" }
+"includeMetadata": { "index": 1, "kind": "property", "displayName":
"Include Metadata", "group": "consumer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Whether to
include metadata in the exchange such as fired time, timer name, timer count
etc." },
+"autowiredEnabled": { "index": 2, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
+"healthCheckConsumerEnabled": { "index": 3, "kind":
[camel] branch scheduler-meta deleted (was ed24963a291)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch scheduler-meta in repository https://gitbox.apache.org/repos/asf/camel.git was ed24963a291 CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on component to turn this on globally. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: Scheduler meta (#11260)
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 78c2f31110e Scheduler meta (#11260)
78c2f31110e is described below
commit 78c2f31110e81f9dd6aa8add15444bca7faa93b4
Author: Claus Ibsen
AuthorDate: Thu Aug 31 17:38:21 2023 +0200
Scheduler meta (#11260)
* CAMEL-19817: camel-scheduler - Turn off metadata headers by default to
make the exchange empty, and avoid leaking unwanted headers by default. Add
backwards compatible option on component to turn this on globally.
---
.../apache/camel/catalog/components/scheduler.json | 52 +++---
.../scheduler/SchedulerComponentConfigurer.java| 6 +++
.../scheduler/SchedulerEndpointConfigurer.java | 6 +++
.../scheduler/SchedulerEndpointUriFactory.java | 3 +-
.../camel/component/scheduler/scheduler.json | 52 +++---
.../component/scheduler/SchedulerComponent.java| 14 ++
.../component/scheduler/SchedulerConsumer.java | 11 +++--
.../component/scheduler/SchedulerEndpoint.java | 13 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_1.adoc | 8
.../dsl/SchedulerComponentBuilderFactory.java | 18
.../dsl/SchedulerEndpointBuilderFactory.java | 33 ++
11 files changed, 161 insertions(+), 55 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
index d215921f8b3..d7ea213177f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
@@ -23,36 +23,38 @@
},
"componentProperties": {
"bridgeErrorHandler": { "index": 0, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions occurred while the consumer is trying to pickup incoming
messages, or the likes, will now be proce [...]
-"autowiredEnabled": { "index": 1, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
-"healthCheckConsumerEnabled": { "index": 2, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
-"healthCheckProducerEnabled": { "index": 3, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on producer [...]
-"poolSize": { "index": 4, "kind": "property", "displayName": "Pool Size",
"group": "scheduler", "label": "scheduler", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "description": "Number of core threads in
the thread pool used by the scheduling thread pool. Is by default using a
single thread" }
+"includeMetadata": { "index": 1, "kind": "property", "displayName":
"Include Metadata", "group": "consumer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Whether to
include metadata in the exchange such as fired time, timer name, timer count
etc." },
+"autowiredEnabled": { "index": 2, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether
[GitHub] [camel] davsclaus merged pull request #11260: Scheduler meta
davsclaus merged PR #11260: URL: https://github.com/apache/camel/pull/11260 -- 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] zbendhiba commented on issue #5237: Infinispan failing with Quarkus 3.3.1
zbendhiba commented on issue #5237: URL: https://github.com/apache/camel-quarkus/issues/5237#issuecomment-1701267423 Hello @tristantarrant I think it's fixed in future Camel version, can you confirm please : https://github.com/apache/camel/commit/8b1c982d24cd8b8046adddb3262b4975e333c207 The only thing is that we need to collaborate for the Quarkus platform when introducing these changes. The status right now, is that Camel infinspan is not working since Quarkus platform 3.3.1 (cf https://github.com/quarkusio/quarkus-platform/pull/946), and we can't do anything about until Camel 4.1 is released. -- 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 (24a7c000fa6 -> 785dc429eab)
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 24a7c000fa6 CAMEL-19817: camel-timer - Remove firedTime header and turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on component to turn this on globally. (#11259) add 785dc429eab (chores) camel-components: replace duplicated code (#11258) No new revisions were added by this update. Summary of changes: .../atmosphere/websocket/WebsocketEndpoint.java | 6 ++ .../camel/component/aws2/s3/utils/AWS2S3Utils.java | 1 + .../component/file/azure/FilesConfiguration.java| 1 - .../camel/component/file/azure/FilesURIStrings.java | 6 ++ .../component/disruptor/DisruptorComponent.java | 7 ++- .../camel/component/file/remote/FtpComponent.java | 7 ++- .../camel/component/file/remote/SftpComponent.java | 6 ++ .../camel/component/jms/JmsSendDynamicAware.java| 21 +++-- .../apache/camel/component/scp/ScpComponent.java| 5 +++-- .../component/kafka/KafkaSendDynamicAware.java | 8 +++- .../camel/component/mllp/MllpTcpClientProducer.java | 9 +++-- .../mllp/internal/TcpServerAcceptThread.java| 8 ++-- .../mllp/internal/TcpServerBindThread.java | 8 ++-- .../TcpServerConsumerValidationRunnable.java| 8 ++-- .../mllp/internal/TcpSocketConsumerRunnable.java| 8 ++-- .../handlers/HttpServerMultiplexChannelHandler.java | 6 ++ .../paho/mqtt5/PahoMqtt5SendDynamicAware.java | 8 +++- .../camel/component/paho/PahoSendDynamicAware.java | 9 - .../camel/component/sjms/SjmsSendDynamicAware.java | 8 +++- .../SpringRabbitMQSendDynamicAware.java | 8 +++- .../xtokenizer/XMLTokenExpressionIterator.java | 2 +- .../apache/camel/test/junit5/CamelTestSupport.java | 6 +- .../undertow/handlers/RestRootHandler.java | 6 ++ 23 files changed, 58 insertions(+), 104 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #11260: Scheduler meta
github-actions[bot] commented on PR #11260: URL: https://github.com/apache/camel/pull/11260#issuecomment-1701236177 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus opened a new pull request, #11260: Scheduler meta
davsclaus opened a new pull request, #11260: URL: https://github.com/apache/camel/pull/11260 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/02: CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on compone
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch scheduler-meta in repository https://gitbox.apache.org/repos/asf/camel.git commit ed24963a291ab5d1817e85ac9e9da52f54e44574 Author: Claus Ibsen AuthorDate: Thu Aug 31 17:11:47 2023 +0200 CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on component to turn this on globally. --- .../modules/ROOT/pages/camel-4x-upgrade-guide-4_1.adoc| 8 1 file changed, 8 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_1.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_1.adoc index de0562444b7..10093584fcb 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_1.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_1.adoc @@ -10,6 +10,14 @@ from both 4.0 to 4.1 and 4.1 to 4.2. Dumping routes to JMX no longer includes `customId="true"` in the XML nodes. +=== camel-scheduler + +The `scheduler` no longer includes header with the timestamp of when the exchange was fired. +This means the exchange by default has no headers, and `null` body. + +The option `includeMetadata` can be set to `true` on the endpoint or component level, to turn on +these additional metadata headers again. + === camel-timer The `timer` no longer includes header `firedTime` with the timestamp of when the exchange was fired.
[camel] branch scheduler-meta created (now ed24963a291)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch scheduler-meta in repository https://gitbox.apache.org/repos/asf/camel.git at ed24963a291 CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on component to turn this on globally. This branch includes the following new commits: new b3a1a558f37 CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on component to turn this on globally. new ed24963a291 CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on component to turn this on globally. 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.
[camel] 01/02: CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on compone
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch scheduler-meta
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b3a1a558f37d148003b67bc251cc1146efc0b0d5
Author: Claus Ibsen
AuthorDate: Thu Aug 31 17:10:55 2023 +0200
CAMEL-19817: camel-scheduler - Turn off metadata headers by default to make
the exchange empty, and avoid leaking unwanted headers by default. Add
backwards compatible option on component to turn this on globally.
---
.../apache/camel/catalog/components/scheduler.json | 52 +++---
.../scheduler/SchedulerComponentConfigurer.java| 6 +++
.../scheduler/SchedulerEndpointConfigurer.java | 6 +++
.../scheduler/SchedulerEndpointUriFactory.java | 3 +-
.../camel/component/scheduler/scheduler.json | 52 +++---
.../component/scheduler/SchedulerComponent.java| 14 ++
.../component/scheduler/SchedulerConsumer.java | 11 +++--
.../component/scheduler/SchedulerEndpoint.java | 13 ++
.../dsl/SchedulerComponentBuilderFactory.java | 18
.../dsl/SchedulerEndpointBuilderFactory.java | 33 ++
10 files changed, 153 insertions(+), 55 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
index d215921f8b3..d7ea213177f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/scheduler.json
@@ -23,36 +23,38 @@
},
"componentProperties": {
"bridgeErrorHandler": { "index": 0, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions occurred while the consumer is trying to pickup incoming
messages, or the likes, will now be proce [...]
-"autowiredEnabled": { "index": 1, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
-"healthCheckConsumerEnabled": { "index": 2, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
-"healthCheckProducerEnabled": { "index": 3, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on producer [...]
-"poolSize": { "index": 4, "kind": "property", "displayName": "Pool Size",
"group": "scheduler", "label": "scheduler", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 1, "description": "Number of core threads in
the thread pool used by the scheduling thread pool. Is by default using a
single thread" }
+"includeMetadata": { "index": 1, "kind": "property", "displayName":
"Include Metadata", "group": "consumer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Whether to
include metadata in the exchange such as fired time, timer name, timer count
etc." },
+"autowiredEnabled": { "index": 2, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
+"healthCheckConsumerEnabled
[camel] branch regen_bot updated (c623fc78477 -> 24a7c000fa6)
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 c623fc78477 [CAMEL-19703] [yaml dsl] remove kebab-case schema definition (#11245) add 24a7c000fa6 CAMEL-19817: camel-timer - Remove firedTime header and turn off metadata headers by default to make the exchange empty, and avoid leaking unwanted headers by default. Add backwards compatible option on component to turn this on globally. (#11259) No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components/timer.json| 7 --- .../component/timer/TimerComponentConfigurer.java | 6 ++ .../org/apache/camel/component/timer/timer.json | 7 --- .../apache/camel/component/timer/TimerComponent.java | 19 +++ .../apache/camel/component/timer/TimerConstants.java | 2 +- .../apache/camel/component/timer/TimerConsumer.java | 7 --- .../apache/camel/component/timer/TimerEndpoint.java | 7 +++ .../camel/component/timer/TimerFiredTimeTest.java | 4 ++-- .../timer/TimerNegativeNoRepeatCountDelayTest.java| 4 ++-- .../camel/component/timer/TimerRepeatCountTest.java | 2 +- .../ROOT/pages/camel-4x-upgrade-guide-4_1.adoc| 10 ++ .../component/dsl/TimerComponentBuilderFactory.java | 17 + .../endpoint/dsl/TimerEndpointBuilderFactory.java | 14 +++--- 13 files changed, 80 insertions(+), 26 deletions(-)
[camel] branch main updated: (chores) camel-components: replace duplicated code (#11258)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 785dc429eab (chores) camel-components: replace duplicated code (#11258)
785dc429eab is described below
commit 785dc429eabbb7084cfc4b9401fe9f55cadb9a07
Author: Otavio Rodolfo Piske
AuthorDate: Thu Aug 31 17:06:31 2023 +0200
(chores) camel-components: replace duplicated code (#11258)
Use the StringHelper before method as it avoids traversing the string twice
and is already defined on StringHelper
---
.../atmosphere/websocket/WebsocketEndpoint.java | 6 ++
.../camel/component/aws2/s3/utils/AWS2S3Utils.java | 1 +
.../component/file/azure/FilesConfiguration.java| 1 -
.../camel/component/file/azure/FilesURIStrings.java | 6 ++
.../component/disruptor/DisruptorComponent.java | 7 ++-
.../camel/component/file/remote/FtpComponent.java | 7 ++-
.../camel/component/file/remote/SftpComponent.java | 6 ++
.../camel/component/jms/JmsSendDynamicAware.java| 21 +++--
.../apache/camel/component/scp/ScpComponent.java| 5 +++--
.../component/kafka/KafkaSendDynamicAware.java | 8 +++-
.../camel/component/mllp/MllpTcpClientProducer.java | 9 +++--
.../mllp/internal/TcpServerAcceptThread.java| 8 ++--
.../mllp/internal/TcpServerBindThread.java | 8 ++--
.../TcpServerConsumerValidationRunnable.java| 8 ++--
.../mllp/internal/TcpSocketConsumerRunnable.java| 8 ++--
.../handlers/HttpServerMultiplexChannelHandler.java | 6 ++
.../paho/mqtt5/PahoMqtt5SendDynamicAware.java | 8 +++-
.../camel/component/paho/PahoSendDynamicAware.java | 9 -
.../camel/component/sjms/SjmsSendDynamicAware.java | 8 +++-
.../SpringRabbitMQSendDynamicAware.java | 8 +++-
.../xtokenizer/XMLTokenExpressionIterator.java | 2 +-
.../apache/camel/test/junit5/CamelTestSupport.java | 6 +-
.../undertow/handlers/RestRootHandler.java | 6 ++
23 files changed, 58 insertions(+), 104 deletions(-)
diff --git
a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
index f6f40d18d79..b8e89f424e1 100644
---
a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
+++
b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
@@ -28,6 +28,7 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
+import org.apache.camel.util.StringHelper;
/**
* Expose WebSocket endpoints using the Atmosphere framework.
@@ -56,10 +57,7 @@ public class WebsocketEndpoint extends ServletEndpoint {
public WebsocketEndpoint(String endPointURI, WebsocketComponent component,
URI httpUri) throws URISyntaxException {
super(endPointURI, component, httpUri);
-//TODO find a better way of assigning the store
-int idx = endPointURI.indexOf('?');
-
-this.servicePath = idx > -1 ? endPointURI.substring(0, idx) :
endPointURI;
+this.servicePath = StringHelper.before(endPointURI, "?", endPointURI);
this.store = component.getWebSocketStore(servicePath);
}
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
index fa166fdcdb8..d99e4405afa 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/utils/AWS2S3Utils.java
@@ -26,6 +26,7 @@ import org.apache.camel.StreamCache;
import org.apache.camel.component.aws2.s3.AWS2S3Configuration;
import org.apache.camel.component.aws2.s3.AWS2S3Constants;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StringHelper;
import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
import software.amazon.awssdk.services.s3.model.ServerSideEncryption;
diff --git
a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConfiguration.java
b/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConfiguration.java
index a70eeff832a..98ada132def 100644
---
a/components/camel-azure/camel-azure-files/src/main/java/org/apache/camel/component/file/azure/FilesConfi
[GitHub] [camel] orpiske merged pull request #11258: (chores) camel-components: replace duplicated code
orpiske merged PR #11258: URL: https://github.com/apache/camel/pull/11258 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus-examples] branch camel-quarkus-main updated (101e952 -> 7a5f08d)
This is an automated email from the ASF dual-hosted git repository. zbendhiba pushed a change to branch camel-quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git omit 101e952 Upgrade to Quarkus Platform 3.2.5.Final omit 8bf31c9 Restrict cluster-leader-election native build memory usage on CI builds omit 242444c Set Quarkus Platform version to 3.2.2.Final omit d3963dd Fix README formatting, typos and grammar omit 6700342 Improve Tracing docs omit ccb8b48 Fix observability docs omit a117263 Restore cluster-leader-election native profile apache/camel-quarkus#4957 omit fc9a8c4 Add Micrometer features to Observability example omit f7d0ee1 Update versions to 3.2.0.Final omit 6d664cf Enable tests for cluster-leader-election example omit c1cb357 Disable cluster-leader-election native profile due to kubernetes-client incompatibility apache/camel-quarkus#4957 omit fdbe006 Upgrade Quarkiverse Artemis to 3.0.0 omit af78333 Upgrade Kotlin to 1.8.21 omit 7dca5e1 Upgrade license-maven-plugin to 4.2 omit d8b1bae Upgrade maven-surefire-plugin to 3.1.2 omit 3e3e4c2 Upgrade maven-resources-plugin to 3.3.1 omit 04d8dff Upgrade maven-jar-plugin to 3.3.0 omit c797564 Upgrade maven-compiler-plugin to 3.11.0 omit 1432bc7 Upgrade impsort-maven-plugin to 1.9.0 omit 63bc1f1 Upgrade formatter-maven-plugin to 2.23.0 omit 132e09a Provide example for CXF SOAP omit 87982f3 Fix copy of eclipse-formatter-config.xml for MacOS omit 857a4fd Avoid path issues by changing into project directory before running the build omit c3b68dc Next is 3.0.0 add e30871a Next is 3.0.0 add 2776ff7 Avoid path issues by changing into project directory before running the build add 4e9cb89 Fix copy of eclipse-formatter-config.xml for MacOS add 3a97f90 Provide example for CXF SOAP add 49ce48e Upgrade formatter-maven-plugin to 2.23.0 add 1f77ef3 Upgrade impsort-maven-plugin to 1.9.0 add 2760a15 Upgrade maven-compiler-plugin to 3.11.0 add 071036f Upgrade maven-jar-plugin to 3.3.0 add 9c279cc Upgrade maven-resources-plugin to 3.3.1 add fcba7e3 Upgrade maven-surefire-plugin to 3.1.2 add 296c8f0 Upgrade license-maven-plugin to 4.2 add b69df86 Upgrade Kotlin to 1.8.21 add ac58e40 Upgrade Quarkiverse Artemis to 3.0.0 add 66eb89e Disable cluster-leader-election native profile due to kubernetes-client incompatibility apache/camel-quarkus#4957 add d0c4a17 Enable tests for cluster-leader-election example add 1259f67 Update versions to 3.2.0.Final add 7426f14 Add Micrometer features to Observability example add ee9cba0 Restore cluster-leader-election native profile apache/camel-quarkus#4957 add 821ee85 Fix observability docs add 41918f9 Improve Tracing docs add cf11dc6 Fix README formatting, typos and grammar add 4a85e00 Set Quarkus Platform version to 3.2.2.Final add ab6ae6d Restrict cluster-leader-election native build memory usage on CI builds add 704b77a Upgrade to Quarkus Platform 3.2.5.Final add c68ece3 Tag 3.0.0-RC2 new 7a5f08d Next is 3.0.0 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (101e952) \ N -- N -- N refs/heads/camel-quarkus-main (7a5f08d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: aws-lambda/pom.xml | 8 cluster-leader-election/pom.xml | 8 cxf-soap/pom.xml| 8 file-bindy-ftp/pom.xml | 8 file-split-log-xml/pom.xml | 8 health/pom.xml | 8 http-log/pom.xml| 8 jdbc-datasource/pom.xml | 8 jms-jpa/pom.xml | 8 jta-jpa/pom.xml | 8 kafka/pom.xml | 8 kamelet-chucknorris/pom.xml | 10 +- observability/pom.xml | 8 platform-http-security-keycloak/pom.xml | 8 rest-json/p
[camel-quarkus-examples] 01/01: Next is 3.0.0
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
commit 7a5f08de49817ec9be02b443575f9f3e91ce334d
Author: Zineb Bendhiba
AuthorDate: Thu Aug 31 17:04:04 2023 +0200
Next is 3.0.0
---
aws-lambda/pom.xml| 10 +-
cluster-leader-election/pom.xml | 10 +-
cxf-soap/pom.xml | 10 +-
file-bindy-ftp/pom.xml| 10 +-
file-bindy-ftp/src/main/kubernetes/kubernetes.yml | 12 ++--
file-bindy-ftp/src/main/kubernetes/openshift.yml | 12 ++--
file-split-log-xml/pom.xml| 10 +-
health/pom.xml| 10 +-
http-log/pom.xml | 10 +-
jdbc-datasource/pom.xml | 10 +-
jms-jpa/pom.xml | 10 +-
jta-jpa/pom.xml | 10 +-
kafka/pom.xml | 10 +-
kamelet-chucknorris/pom.xml | 12 ++--
observability/pom.xml | 10 +-
platform-http-security-keycloak/pom.xml | 10 +-
rest-json/pom.xml | 10 +-
timer-log-kotlin/pom.xml | 10 +-
timer-log-main/pom.xml| 12 ++--
timer-log/pom.xml | 10 +-
20 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/aws-lambda/pom.xml b/aws-lambda/pom.xml
index dc8ddf2..1654262 100644
--- a/aws-lambda/pom.xml
+++ b/aws-lambda/pom.xml
@@ -21,19 +21,19 @@
4.0.0
org.apache.camel.quarkus.examples
camel-quarkus-examples-aws-lambda
-3.0.0-RC2
+3.0.0-SNAPSHOT
Camel Quarkus :: Examples :: AWS Lambda
Camel Quarkus Example :: Deploying a Camel Route in AWS
Lambda
3.2.5.Final
-
${quarkus.platform.version}
+
3.0.0-SNAPSHOT
-
io.quarkus.platform
+io.quarkus
quarkus-bom
-
${quarkus.platform.group-id}
-
quarkus-camel-bom
+
org.apache.camel.quarkus
+
camel-quarkus-bom
UTF-8
UTF-8
diff --git a/cluster-leader-election/pom.xml b/cluster-leader-election/pom.xml
index ddd8c26..5c68199 100644
--- a/cluster-leader-election/pom.xml
+++ b/cluster-leader-election/pom.xml
@@ -23,19 +23,19 @@
camel-quarkus-examples-cluster-leader-election
org.apache.camel.quarkus.examples
-3.0.0-RC2
+3.0.0-SNAPSHOT
Camel Quarkus :: Examples :: Cluster leader election
Camel Quarkus Example :: Cluster leader election
3.2.5.Final
-
${quarkus.platform.version}
+
3.0.0-SNAPSHOT
-
io.quarkus.platform
+io.quarkus
quarkus-bom
-
${quarkus.platform.group-id}
-
quarkus-camel-bom
+
org.apache.camel.quarkus
+
camel-quarkus-bom
UTF-8
UTF-8
diff --git a/cxf-soap/pom.xml b/cxf-soap/pom.xml
index 2e251cc..e4184b8 100644
--- a/cxf-soap/pom.xml
+++ b/cxf-soap/pom.xml
@@ -23,19 +23,19 @@
camel-quarkus-examples-cxf-soap
org.apache.camel.quarkus.examples
-3.0.0-RC2
+3.0.0-SNAPSHOT
Camel Quarkus :: Examples :: CXF SOAP
Camel Quarkus Example :: CXF SOAP
3.2.5.Final
-
${quarkus.platform.version}
+
3.0.0-SNAPSHOT
-
io.quarkus.platform
+io.quarkus
quarkus-bom
-
${quarkus.platform.group-id}
-
quarkus-camel-bom
+
org.apache.camel.quarkus
+
camel-quarkus-bom
UTF-8
UTF-8
diff --git a/file-bindy-ftp/pom.xml b/file-bindy-ftp/pom.xml
index 0cfcdfa..a6b0fd5 100644
--- a/file-bindy-ftp/pom.xml
+++ b/file-bindy-ftp/pom.xml
@@ -22,19 +22,19 @@
camel-quarkus-examples-file-bindy-ftp
org.apache.camel.quarkus.examples
-3.0.0-RC2
+3.0.0-SNAPSHOT
Camel Quarkus :: Examples :: File Bindy FTP
Camel Quarkus Example :: File Bindy FTP
3.2.5.Final
-
${quarkus.platform.version}
+
3.0.0-SNAPSHOT
-
io.quarkus.platform
+io.quarkus
quarkus-bom
-
${quarkus.platform.group-id}
-
quarkus-camel-bom
+
org.apache.camel.quarkus
+
camel-quarkus-bom
UTF-8
UTF-8
diff --git a/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
b/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
index 73425ae..7170727 100644
--- a/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
+++ b/file-bindy-ftp/src/main/kubernetes/kubernetes.yml
@@ -21,18 +21,18 @@ metadata:
name: ssh-server-deployment
labels:
app.kubernetes.io/name: camel-quarkus-
[camel-quarkus] 07/11: Upgrade to Quarkus 3.3.1
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 90930f6517b02061711dd8462a44d6664b1fe6d0
Author: Zineb Bendhiba
AuthorDate: Wed Aug 30 11:39:12 2023 +0200
Upgrade to Quarkus 3.3.1
---
docs/antora.yml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 609275a83d..37340027a8 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.0.0 # replace ${camel.version}
camel-docs-version: 4.0.x # replace ${camel.docs.components.version}
-quarkus-version: 3.3.0 # replace ${quarkus.version}
+quarkus-version: 3.3.1 # replace ${quarkus.version}
graalvm-version: 23.0.1 # replace ${graalvm.version}
graalvm-docs-version: 22.3
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
diff --git a/pom.xml b/pom.xml
index fbf9fd9db3..f46ba9ec2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
2.1.0
2.0.2
2.0.2
-3.3.0
+3.3.1
4.0.0
2.4.0
[camel-quarkus] 08/11: Infinispan test: fix broken immutable list
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3d361b5c2bdb6e8b7fd7bf79c4d9b41f3d278557
Author: Zineb Bendhiba
AuthorDate: Thu Aug 31 09:34:48 2023 +0200
Infinispan test: fix broken immutable list
---
integration-tests/infinispan/src/main/java/InfinispanRoutes.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/integration-tests/infinispan/src/main/java/InfinispanRoutes.java
b/integration-tests/infinispan/src/main/java/InfinispanRoutes.java
index 7c9e26c8da..f45143c769 100644
--- a/integration-tests/infinispan/src/main/java/InfinispanRoutes.java
+++ b/integration-tests/infinispan/src/main/java/InfinispanRoutes.java
@@ -15,6 +15,7 @@
* limitations under the License.
*/
+import java.util.HashMap;
import java.util.Map;
import jakarta.inject.Named;
@@ -36,7 +37,8 @@ public class InfinispanRoutes extends InfinispanCommonRoutes {
@Produces
@Named("additionalConfig")
Map additionalInfinispanConfig() {
-Map config = Map.of(MARSHALLER,
ProtoStreamMarshaller.class.getName());
+Map config = new HashMap<>();
+config.put(MARSHALLER, ProtoStreamMarshaller.class.getName());
if (OS.getCurrentOs().equals(OS.MAC_OS) ||
OS.getCurrentOs().equals(OS.WINDOWS)) {
config.put(CLIENT_INTELLIGENCE, "BASIC");
}
[camel-quarkus] 05/11: Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.0.1 to 3.1.0
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 42ef92adec13425c1090d92b1db6f4f8e9cd2247
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Aug 21 21:50:24 2023 +
Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.0.1 to 3.1.0
Bumps
[io.quarkiverse.artemis:quarkus-artemis-bom](https://github.com/quarkiverse/quarkus-artemis)
from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/quarkiverse/quarkus-artemis/releases)
-
[Commits](https://github.com/quarkiverse/quarkus-artemis/compare/3.0.1...3.1.0)
---
updated-dependencies:
- dependency-name: io.quarkiverse.artemis:quarkus-artemis-bom
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e1e4270cef..0687b75b0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
${debezium-version}
9.37.0.Final
2.4.5
-3.0.1
+3.1.0
2.3.0
1.0.0
3.2.2
[camel-quarkus] 11/11: Disabling temporary Quartz Clustered native test
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 93057f174c83d06e882ea345e2145a9683d64e69
Author: Zineb Bendhiba
AuthorDate: Thu Aug 31 10:41:08 2023 +0200
Disabling temporary Quartz Clustered native test
---
.../org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java
b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java
index da405a54fb..d52c5e8d21 100644
---
a/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java
+++
b/integration-tests/quartz-clustered/src/test/java/org/apache/camel/quarkus/component/quartz/it/QuartzClusteredIT.java
@@ -17,8 +17,10 @@
package org.apache.camel.quarkus.component.quartz.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
@QuarkusIntegrationTest
+@Disabled // https://github.com/apache/camel-quarkus/issues/5241
class QuartzClusteredIT extends QuartzClusteredTest {
}
[camel-quarkus] 06/11: Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit fea72be316b162c1439c2c589513a01b9e3e86ea
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Aug 21 22:14:39 2023 +
Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom
Bumps
[io.quarkiverse.amazonservices:quarkus-amazon-services-bom](https://github.com/quarkiverse/quarkus-amazon-services)
from 2.4.4 to 2.5.0.
- [Release
notes](https://github.com/quarkiverse/quarkus-amazon-services/releases)
-
[Commits](https://github.com/quarkiverse/quarkus-amazon-services/compare/2.4.4...2.5.0)
---
updated-dependencies:
- dependency-name: io.quarkiverse.amazonservices:quarkus-amazon-services-bom
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0687b75b0a..fbf9fd9db3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,7 @@
1.2.0
${debezium-version}
9.37.0.Final
-
2.4.5
+
2.5.0
3.1.0
2.3.0
1.0.0
[camel-quarkus] 09/11: Disable infinispan tests
This is an automated email from the ASF dual-hosted git repository. zbendhiba pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit de45fab0ec6926d3700afcbc8110a54a97f5e70d Author: Zineb Bendhiba AuthorDate: Thu Aug 31 09:37:30 2023 +0200 Disable infinispan tests --- integration-tests/pom.xml| 4 ++-- tooling/scripts/test-categories.yaml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index f2c9f8eb97..e3a0dd67a1 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -110,9 +110,9 @@ headersmap hl7 http-grouped -infinispan + infinispan-common -infinispan-quarkus-client + influxdb jackson-avro jackson-protobuf diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index b7d99a8ca9..db8689b8d7 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -22,8 +22,6 @@ group-01: - google-storage - hazelcast - http-grouped - - infinispan - - infinispan-quarkus-client - jcache - jms-artemis-client - jms-ibmmq-client
[camel-quarkus] 03/11: Temporarily disable debezium tests due to #5110
This is an automated email from the ASF dual-hosted git repository. zbendhiba pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit c0524b71c344154f5df08db4f66fe88a437a7195 Author: James Netherton AuthorDate: Fri Jul 21 15:12:20 2023 +0100 Temporarily disable debezium tests due to #5110 --- integration-tests/debezium/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/integration-tests/debezium/pom.xml b/integration-tests/debezium/pom.xml index 60cdc4ce0e..feb4dc2093 100644 --- a/integration-tests/debezium/pom.xml +++ b/integration-tests/debezium/pom.xml @@ -38,6 +38,9 @@ src/test/resources/container-license-acceptance.txt + + +true @@ -128,6 +131,7 @@ + mysqlDriver
[camel-quarkus] 04/11: Upgrade to Quarkus CXF 2.3.0
This is an automated email from the ASF dual-hosted git repository. zbendhiba pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 1418ccc0bcef21dbe1f742c6ee5dbde44afa0a6d Author: Peter Palaga AuthorDate: Wed Aug 16 21:51:20 2023 +0200 Upgrade to Quarkus CXF 2.3.0 --- pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 500 ++--- .../src/main/generated/flattened-reduced-pom.xml | 42 +- .../generated/flattened-reduced-verbose-pom.xml| 500 ++--- 4 files changed, 522 insertions(+), 522 deletions(-) diff --git a/pom.xml b/pom.xml index 4c5d0a465d..e1e4270cef 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 9.37.0.Final 2.4.5 3.0.1 -2.2.2 +2.3.0 1.0.0 3.2.2 2.0.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 2a0ba6bee6..07bf3bbdd2 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6781,436 +6781,436 @@ 3.6.4 -org.apache.cxf -cxf-core -4.0.2 +org.apache.cxf +cxf-core +4.0.2 -org.apache.cxf -cxf-rt-features-logging -4.0.2 +org.apache.cxf +cxf-rt-features-logging +4.0.2 -org.apache.cxf -cxf-rt-features-metrics -4.0.2 +org.apache.cxf +cxf-rt-features-metrics +4.0.2 -org.apache.cxf -cxf-rt-frontend-jaxws -4.0.2 +org.apache.cxf +cxf-rt-frontend-jaxws +4.0.2 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf -cxf-rt-transports-http -4.0.2 +org.apache.cxf +cxf-rt-transports-http +4.0.2 -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.2 +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.2 -org.slf4j -jcl-over-slf4j +org.slf4j +jcl-over-slf4j -org.apache.cxf -cxf-rt-ws-mex -4.0.2 +org.apache.cxf +cxf-rt-ws-mex +4.0.2 -org.apache.cxf -cxf-rt-ws-security -4.0.2 +org.apache.cxf +cxf-rt-ws-security +4.0.2 -org.apache.cxf -cxf-rt-ws-rm -4.0.2 +org.apache.cxf +cxf-rt-ws-rm +4.0.2 -org.apache.cxf -cxf-rt-wsdl -4.0.2 +org.apache.cxf +cxf-rt-wsdl +4.0.2 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf.services.sts -cxf-services-sts-core -4.0.2 +org.apache.cxf.services.sts +cxf-services-sts-core +4.0.2 -org.apache.cxf.xjcplugins -cxf-xjc-boolean -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-boolean +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-dv -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-dv +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-javadoc -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-javadoc +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-pl -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-pl +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-ts -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-ts +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-wsdlextension -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-wsdlextension +4.0.0 -org.apache.cxf.xjc-utils -cxf-xjc-runtime -4.0.0 +org.apache.cxf.xjc-utils +cxf-xjc-runtime +4.0.0 -io.quarkiverse.cxf -quarkus-cxf -2.2.2 +io.quarkiverse.cxf +quarkus-cxf +2.3.0 -io.quarkiverse.cxf -quarkus-cxf-axiom-api-stub -2.2.2 +io.quarkiverse.cxf +quarkus-cxf-axiom-api-stub +2.3.0 -io.quarkiverse.cxf -quarkus-cxf-deployment -2.2.2 +io.quarkiverse.cxf +quarkus-cxf-deployment +2.3.0 -io.quarkiverse.cxf -quarkus-cxf-rt-features
[camel-quarkus] 10/11: Disabling temporary Opentelemetry native test
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit bc4a1599b41f46c138b0997b5477a1cd21214429
Author: Zineb Bendhiba
AuthorDate: Thu Aug 31 09:57:50 2023 +0200
Disabling temporary Opentelemetry native test
---
.../camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
index 823120c0c1..1a7e5757fd 100644
---
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
+++
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
@@ -17,8 +17,10 @@
package org.apache.camel.quarkus.component.opentelemetry.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
@QuarkusIntegrationTest
+@Disabled //https://github.com/apache/camel-quarkus/issues/5240
class OpenTelemetryIT extends OpenTelemetryTest {
}
