(camel-quarkus) branch camel-4.7.0-upgrade created (now 43e4b1a1e9)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-4.7.0-upgrade in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 43e4b1a1e9 Add Camel 4.7.0 staging repository This branch includes the following new commits: new 43e4b1a1e9 Add Camel 4.7.0 staging repository 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-quarkus) 01/01: Add Camel 4.7.0 staging repository
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-4.7.0-upgrade in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 43e4b1a1e932d74262891204ffa6a3b6f58d6fb3 Author: JiriOndrusek AuthorDate: Wed Jul 10 08:34:17 2024 +0200 Add Camel 4.7.0 staging repository --- pom.xml | 44 1 file changed, 44 insertions(+) diff --git a/pom.xml b/pom.xml index d56e3923aa..f084b78232 100644 --- a/pom.xml +++ b/pom.xml @@ -341,6 +341,28 @@ + +central +Maven Central Repo +https://repo.maven.apache.org/maven2 + +false + + +true + + + +apache.staging.camel + https://repository.apache.org/content/repositories/orgapachecamel-1732/ +Apache Camel 3.19.0 Staging Repo + +false + + +true + + apache.snapshots https://repository.apache.org/snapshots/ @@ -354,6 +376,28 @@ + +central +Maven Central Repo +https://repo.maven.apache.org/maven2 + +false + + +true + + + +apache.staging.camel + https://repository.apache.org/content/repositories/orgapachecamel-1732/ +Apache Camel 3.19.0 Staging Repo + +false + + +true + + apache.snapshots https://repository.apache.org/snapshots/
(camel-upgrade-recipes) 01/01: Create README.adoc
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-upgrade-recipes.git commit 028b0a0763c73ebe459e0f0bb230ec6fa5f390ae Author: JiriOndrusek AuthorDate: Tue Jul 9 09:55:05 2024 +0200 Create README.adoc --- README.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/README.adoc b/README.adoc new file mode 100644 index 000..f90a58d --- /dev/null +++ b/README.adoc @@ -0,0 +1 @@ += Camel Upgrade Recipes
(camel-upgrade-recipes) branch main created (now 028b0a0)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-upgrade-recipes.git at 028b0a0 Create README.adoc This branch includes the following new commits: new 028b0a0 Create README.adoc 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-quarkus) branch camel-main updated: generated poms
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 05dc90e08d generated poms 05dc90e08d is described below commit 05dc90e08d25e4919533ddcc45aa8070d9605499 Author: JiriOndrusek AuthorDate: Mon Jul 8 16:39:34 2024 +0200 generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 20 ++-- .../bom/src/main/generated/flattened-reduced-pom.xml | 20 ++-- .../main/generated/flattened-reduced-verbose-pom.xml | 20 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index d4ee3982f3..66dd06355f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6273,16 +6273,6 @@ camel-quarkus-zookeeper-master-deployment 3.13.0-SNAPSHOT - -dev.langchain4j -langchain4j -0.31.0 - - -dev.langchain4j -langchain4j-core -0.31.0 - ca.uhn.hapi hapi-base @@ -6633,6 +6623,16 @@ commons-lang 2.6 + +dev.langchain4j +langchain4j +0.31.0 + + +dev.langchain4j +langchain4j-core +0.31.0 + io.dropwizard.metrics dropwizard-core diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 0172fc249e..3ced11ec9b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6273,16 +6273,6 @@ camel-quarkus-zookeeper-master-deployment 3.13.0-SNAPSHOT - -dev.langchain4j -langchain4j -0.31.0 - - -dev.langchain4j -langchain4j-core -0.31.0 - ca.uhn.hapi hapi-base @@ -6613,6 +6603,16 @@ commons-cli 1.4 + +dev.langchain4j +langchain4j +0.31.0 + + +dev.langchain4j +langchain4j-core +0.31.0 + io.minio minio diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 33d2b30502..1cc832f849 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6273,16 +6273,6 @@ camel-quarkus-zookeeper-master-deployment 3.13.0-SNAPSHOT - -dev.langchain4j -langchain4j -0.31.0 - - -dev.langchain4j -langchain4j-core -0.31.0 - ca.uhn.hapi hapi-base @@ -6613,6 +6603,16 @@ commons-cli 1.4 + +dev.langchain4j +langchain4j +0.31.0 + + +dev.langchain4j +langchain4j-core +0.31.0 + io.minio minio
(camel-quarkus) branch camel-main updated: fixed wrong alpjhabetic order from last change
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 1c7de89866 fixed wrong alpjhabetic order from last change 1c7de89866 is described below commit 1c7de89866e4b8ef55f82b3775983cda076c8504 Author: JiriOndrusek AuthorDate: Mon Jul 8 15:46:57 2024 +0200 fixed wrong alpjhabetic order from last change --- poms/bom/pom.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index d797a9c576..c285b54efb 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6352,16 +6352,6 @@ - -dev.langchain4j -langchain4j -${langchain4j.version} - - -dev.langchain4j -langchain4j-core -${langchain4j.version} - ca.uhn.hapi hapi-base @@ -6713,6 +6703,16 @@ commons-lang ${commons-lang.version} + +dev.langchain4j +langchain4j +${langchain4j.version} + + +dev.langchain4j +langchain4j-core +${langchain4j.version} + io.dropwizard.metrics dropwizard-core
(camel-quarkus) branch camel-main updated: fixed langchain4j-embeddings
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 71cd95b035 fixed langchain4j-embeddings 71cd95b035 is described below commit 71cd95b03540c102ae75e1e8346608d5b5c4099a Author: JiriOndrusek AuthorDate: Mon Jul 8 15:20:30 2024 +0200 fixed langchain4j-embeddings --- extensions-jvm/langchain4j-embeddings/runtime/pom.xml | 9 + poms/bom/pom.xml | 10 ++ poms/bom/src/main/generated/flattened-full-pom.xml| 10 ++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 ++ poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 10 ++ 5 files changed, 49 insertions(+) diff --git a/extensions-jvm/langchain4j-embeddings/runtime/pom.xml b/extensions-jvm/langchain4j-embeddings/runtime/pom.xml index 12a67d7655..8f9a1f0049 100644 --- a/extensions-jvm/langchain4j-embeddings/runtime/pom.xml +++ b/extensions-jvm/langchain4j-embeddings/runtime/pom.xml @@ -43,6 +43,15 @@ org.apache.camel camel-langchain4j-embeddings + + +langchain4j-core +dev.langchain4j + + +langchain4j +dev.langchain4j + diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 4919376b8d..d797a9c576 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6352,6 +6352,16 @@ + +dev.langchain4j +langchain4j +${langchain4j.version} + + +dev.langchain4j +langchain4j-core +${langchain4j.version} + ca.uhn.hapi hapi-base diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4e64abb35b..d4ee3982f3 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6273,6 +6273,16 @@ camel-quarkus-zookeeper-master-deployment 3.13.0-SNAPSHOT + +dev.langchain4j +langchain4j +0.31.0 + + +dev.langchain4j +langchain4j-core +0.31.0 + ca.uhn.hapi hapi-base diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 58e1b37565..0172fc249e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6273,6 +6273,16 @@ camel-quarkus-zookeeper-master-deployment 3.13.0-SNAPSHOT + +dev.langchain4j +langchain4j +0.31.0 + + +dev.langchain4j +langchain4j-core +0.31.0 + ca.uhn.hapi hapi-base diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 80f014e96d..33d2b30502 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6273,6 +6273,16 @@ camel-quarkus-zookeeper-master-deployment 3.13.0-SNAPSHOT + +dev.langchain4j +langchain4j +0.31.0 + + +dev.langchain4j +langchain4j-core +0.31.0 + ca.uhn.hapi hapi-base
(camel-quarkus) branch camel-main updated: Fixed twilio and langchain4j conflict
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 8ce3614191 Fixed twilio and langchain4j conflict 8ce3614191 is described below commit 8ce3614191e9c018d92e078d58fc6f7dc2b38200 Author: JiriOndrusek AuthorDate: Mon Jul 8 11:12:48 2024 +0200 Fixed twilio and langchain4j conflict --- .../component/twilio/it/TwilioResource.java| 5 - poms/bom/pom.xml | 22 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 20 .../src/main/generated/flattened-reduced-pom.xml | 20 .../generated/flattened-reduced-verbose-pom.xml| 20 5 files changed, 86 insertions(+), 1 deletion(-) diff --git a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java index c81d4054a8..4b38c2db23 100644 --- a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java +++ b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java @@ -22,6 +22,7 @@ import java.util.Optional; import com.twilio.constant.EnumConstants; import com.twilio.http.HttpClient; +import com.twilio.http.IRequest; import com.twilio.http.NetworkHttpClient; import com.twilio.http.Request; import com.twilio.http.TwilioRestClient; @@ -80,8 +81,10 @@ public class TwilioResource { Optional wireMockUrl = ConfigProvider.getConfig().getOptionalValue("wiremock.url", String.class); if (wireMockUrl.isPresent()) { HttpClient client = new NetworkHttpClient() { + @Override -public com.twilio.http.Response makeRequest(Request originalRequest) { +public com.twilio.http.Response makeRequest(T r) { +Request originalRequest = (Request) r; String url = originalRequest.getUrl(); Request modified = new Request(originalRequest.getMethod(), diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 5f7d920a52..4919376b8d 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1808,11 +1808,33 @@ org.apache.camel camel-langchain4j-chat ${camel.version} + + + +langchain4j-core +dev.langchain4j + + +langchain4j +dev.langchain4j + + org.apache.camel camel-langchain4j-core ${camel.version} + + + +langchain4j-core +dev.langchain4j + + +langchain4j +dev.langchain4j + + org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index de847b6692..4e64abb35b 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1745,11 +1745,31 @@ org.apache.camel camel-langchain4j-chat 4.7.0-SNAPSHOT + + +dev.langchain4j +langchain4j-core + + +dev.langchain4j +langchain4j + + org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT + + +dev.langchain4j +langchain4j-core + + +dev.langchain4j +langchain4j + + org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 972c015568..58e1b37565 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1745,11 +1745,31 @@ org.apache.camel camel-langchain4j-chat 4.7.0-SNAPSHOT + + +dev.langchain4j +langchain4j-core + + +dev.langchain4j +langchain4j + + org.apache.camel camel-langchain4j-core 4.7.
(camel-quarkus) branch camel-main updated: Generated poms
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 180ebee6ec Generated poms 180ebee6ec is described below commit 180ebee6ec2cb9883aa1e35fe019481fdc94f90d Author: JiriOndrusek AuthorDate: Wed Jul 3 09:28:44 2024 +0200 Generated poms --- poms/bom/pom.xml | 6 ++ poms/bom/src/main/generated/flattened-full-pom.xml| 6 ++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 ++ poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 ++ 4 files changed, 24 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 9011599068..5f7d920a52 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -883,6 +883,12 @@ org.apache.camel camel-djl ${camel.version} + + +org.checkerframework +checker-qual + + org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4442f1fadc..b02454826f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -821,6 +821,12 @@ org.apache.camel camel-djl 4.7.0-SNAPSHOT + + +org.checkerframework +checker-qual + + org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d8df2d0c22..6634f7b1d1 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -821,6 +821,12 @@ org.apache.camel camel-djl 4.7.0-SNAPSHOT + + +org.checkerframework +checker-qual + + org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 5eacccabc5..4159a8d9cc 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -821,6 +821,12 @@ org.apache.camel camel-djl 4.7.0-SNAPSHOT + + +org.checkerframework +checker-qual + + org.apache.camel
(camel-quarkus) 11/14: Add dynamic discovery of ical zoneinfo
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 commit 54faab786a5c44ecac4713a1d21cadcb5c2bcd4a Author: James Netherton AuthorDate: Fri Jun 28 14:23:17 2024 +0100 Add dynamic discovery of ical zoneinfo --- .../component/ical/deployment/IcalProcessor.java | 40 +- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java index fc92c7b22d..da5fd0eaa8 100644 --- a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java +++ b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java @@ -16,7 +16,10 @@ */ package org.apache.camel.quarkus.component.ical.deployment; -import java.util.stream.Stream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Objects; +import java.util.Properties; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; @@ -27,9 +30,10 @@ import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryB import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import net.fortuna.ical4j.model.TimeZoneRegistryImpl; import net.fortuna.ical4j.util.MapTimeZoneCache; +import org.jboss.logging.Logger; class IcalProcessor { - +private static final Logger LOG = Logger.getLogger(IcalProcessor.class); private static final String FEATURE = "camel-ical"; @BuildStep @@ -50,21 +54,23 @@ class IcalProcessor { nativeResources.produce(new NativeImageResourceBuildItem("net/fortuna/ical4j/model/tz.alias")); -Stream.of("zoneinfo/Africa", -"zoneinfo/America", -"zoneinfo/America/Argentina", -"zoneinfo/America/Indiana", -"zoneinfo/America/Kentucky", -"zoneinfo/America/North_Dakota", -"zoneinfo/Antarctica", -"zoneinfo/Arctic", -"zoneinfo/Asia", -"zoneinfo/Atlantic", -"zoneinfo/Australia", -"zoneinfo/Europe", -"zoneinfo/Indian", -"zoneinfo/Pacific") -.forEach(path -> nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem(path))); +try (InputStream stream = Thread.currentThread().getContextClassLoader() +.getResourceAsStream("net/fortuna/ical4j/model/tz.alias")) { +Properties timezoneData = new Properties(); +timezoneData.load(stream); +timezoneData.values() +.stream() +.map(Objects::toString) +.map(timeZone -> timeZone.split("/")[0]) +.distinct() +.forEach(region -> { +nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem("zoneinfo/" + region)); +nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem("zoneinfo-global/" + region)); +}); + +} catch (IOException e) { +throw new RuntimeException("Failed reading ical tz.alias"); +} } @BuildStep
(camel-quarkus) 14/14: generated files
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 commit a27ccbd92388378b79028b28881a1a7ffc3d926f Author: JiriOndrusek AuthorDate: Tue Jul 2 09:58:05 2024 +0200 generated files --- docs/modules/ROOT/examples/others/kotlin-dsl.yml | 4 +-- .../pages/reference/extensions/kotlin-dsl.adoc | 6 ++--- .../src/main/generated/flattened-reduced-pom.xml | 30 ++ .../generated/flattened-reduced-verbose-pom.xml| 30 ++ 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/docs/modules/ROOT/examples/others/kotlin-dsl.yml b/docs/modules/ROOT/examples/others/kotlin-dsl.yml index 66f23c3ded..3c4453bd19 100644 --- a/docs/modules/ROOT/examples/others/kotlin-dsl.yml +++ b/docs/modules/ROOT/examples/others/kotlin-dsl.yml @@ -4,10 +4,10 @@ cqArtifactId: camel-quarkus-kotlin-dsl cqArtifactIdBase: kotlin-dsl cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.8.0 cqNativeSince: 2.16.0 cqCamelPartName: kotlin-dsl cqCamelPartTitle: Kotlin DSL -cqCamelPartDescription: Camel DSL with Kotlin (Deprecated) +cqCamelPartDescription: Camel DSL with Kotlin (deprecated) cqExtensionPageTitle: Kotlin DSL diff --git a/docs/modules/ROOT/pages/reference/extensions/kotlin-dsl.adoc b/docs/modules/ROOT/pages/reference/extensions/kotlin-dsl.adoc index 4b940a1441..6801b933d1 100644 --- a/docs/modules/ROOT/pages/reference/extensions/kotlin-dsl.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/kotlin-dsl.adoc @@ -6,15 +6,15 @@ :cq-artifact-id: camel-quarkus-kotlin-dsl :cq-native-supported: true :cq-status: Stable -:cq-status-deprecation: Stable +:cq-status-deprecation: Stable Deprecated :cq-description: Support for parsing Kotlin route definitions at runtime -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.8.0 :cq-native-since: 2.16.0 ifeval::[{doc-show-badges} == true] [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.8.0## [.badge-key]##Native since##[.badge-supported]##2.16.0## +[.badge-key]##JVM since##[.badge-supported]##1.8.0## [.badge-key]##Native since##[.badge-supported]##2.16.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## endif::[] Support for parsing Kotlin route definitions at runtime diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 825f18741a..d8df2d0c22 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6412,6 +6412,11 @@ jnr-ffi 2.2.13 + +com.github.luben +zstd-jni +1.5.5-6 + com.github.mwiede jsch @@ -6627,12 +6632,12 @@ io.quarkiverse.groovy quarkus-groovy -3.11.0 +3.12.0 io.quarkiverse.groovy quarkus-groovy-deployment -3.11.0 +3.12.0 io.quarkiverse.jackson-jq @@ -6702,12 +6707,12 @@ io.quarkiverse.mybatis quarkus-mybatis -2.2.2 +2.2.3 io.quarkiverse.mybatis quarkus-mybatis-deployment -2.2.2 +2.2.3 io.quarkiverse.tika @@ -7032,6 +7037,21 @@ kotlinx-serialization-core-jvm 1.4.0 + +org.jxmpp +jxmpp-core +1.0.3 + + +org.jxmpp +jxmpp-jid +1.0.3 + + +org.jxmpp +jxmpp-util-cache +1.0.3 + org.kiwiproject consul-client @@ -7060,7 +7080,7 @@ org.mybatis mybatis -3.5.15 +3.5.16 org.opensearch.client diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 76b0de5326..5eacccabc5 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6412,6 +6412,11 @@ jnr-ffi 2.2.13 + +com.github.luben +zstd-jni +1.5.5-6 + com.github.mwiede jsch @@ -6627,12 +6632,12 @@ io.quarkiverse.groovy quarkus-groovy -3.11.0 +3.12.0 io.quarkiverse.groovy quarkus-groovy-deployment -3.11.0 +3.12.0 io.quarkiverse.jackson-jq @@ -6702,12 +6707,12 @@ io.quarkiverse.mybatis quarkus-mybatis -2.2.2 +2.2.3 io.quarkiverse.mybatis quarkus-mybatis-deployment -2.2.2 +2.2.3
(camel-quarkus) 10/14: Miscellaneous tidy ups
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 commit 8ca8e12cdfee0e9f5c1d2d4dadfce6351c92a985 Author: James Netherton AuthorDate: Fri Jun 28 08:55:36 2024 +0100 Miscellaneous tidy ups --- .../deployment/AzureStorageQueueProcessor.java | 2 +- .../xchange/deployment/XchangeProcessor.java | 5 +++-- integration-tests/dataformat/pom.xml | 2 +- .../component/langchain/chat/it/OllamaRoute.java | 22 -- 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java index 9f73e984fa..ca1214aeb5 100644 --- a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java +++ b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java @@ -57,7 +57,7 @@ class AzureStorageQueueProcessor { || n.startsWith("com.azure.storage.queue.models.")) .sorted() .toArray(String[]::new); - reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().serialization().build()); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().build()); final String[] knownSerializableImpls = combinedIndex.getIndex() .getAllKnownImplementors(XML_SERIALIZABLE_NAME) diff --git a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java index 6328d03b00..9c154e6a4f 100644 --- a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java +++ b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java @@ -110,12 +110,13 @@ class XchangeProcessor { .toArray(String[]::new); reflectiveClass.produce(ReflectiveClassBuildItem.builder(jaxrsAnnotations).methods().build()); -//constructors for converters +// reflective instantiation of xchange converters String[] converterClasses = index.getAllKnownSubclasses("com.fasterxml.jackson.databind.util.StdConverter") .stream() .map(classInfo -> classInfo.name().toString()) +.filter(className -> className.startsWith("org.knowm.xchange")) .toArray(String[]::new); - reflectiveClass.produce(ReflectiveClassBuildItem.builder(converterClasses).methods().fields().build()); + reflectiveClass.produce(ReflectiveClassBuildItem.builder(converterClasses).build()); } @BuildStep diff --git a/integration-tests/dataformat/pom.xml b/integration-tests/dataformat/pom.xml index bb1c87f5f7..7eed5cf0ef 100644 --- a/integration-tests/dataformat/pom.xml +++ b/integration-tests/dataformat/pom.xml @@ -67,7 +67,7 @@ - + native diff --git a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java index 47d9c68c40..c87d2cffe8 100644 --- a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java +++ b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java @@ -16,22 +16,11 @@ */ package org.apache.camel.quarkus.component.langchain.chat.it; -import dev.langchain4j.model.chat.ChatLanguageModel; -import io.quarkiverse.langchain4j.ollama.OllamaChatLanguageModel; -import io.quarkiverse.langchain4j.ollama.Options; import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Produces; import org.apache.camel.builder.RouteBuilder; -import org.eclipse.microprofile.config.inject.ConfigProperty; - -import static java.time.Duration.ofSeconds; @ApplicationScoped public class OllamaRoute extends RouteBuilder { - -@ConfigProperty(name = "quarkus.langchain4j.ollama.base-url") -private String ollamaUrl; - @Override public void configure() throws Exception { from("direct:send-simpl
(camel-quarkus) 13/14: fixes in type convertors (because of CAMEL-19897)x
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 commit 6394df757b45911c969f2524dc049957b7764c36 Author: JiriOndrusek AuthorDate: Mon Jul 1 10:16:23 2024 +0200 fixes in type convertors (because of CAMEL-19897)x --- .../ROOT/pages/reference/extensions/core.adoc | 6 ++ .../quarkus/core/deployment/CamelProcessor.java| 4 +- .../org/apache/camel/quarkus/core/CamelConfig.java | 16 ++ .../apache/camel/quarkus/core/CamelRecorder.java | 4 +- .../camel/quarkus/core/FastTypeConverter.java | 4 +- .../core/converter/it/ConverterResource.java | 11 ++-- .../quarkus/core/converter/it/ConverterTest.java | 35 --- .../core/converter/it/ConverterTestBase.java | 6 +- .../converter/it/ConverterWithStatisticsIT.java| 23 ...rTest.java => ConverterWithStatisticsTest.java} | 67 -- pom.xml| 2 +- .../quarkus/k/tooling/maven/GenerateRestXML.java | 24 ++-- 12 files changed, 88 insertions(+), 114 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc b/docs/modules/ROOT/pages/reference/extensions/core.adoc index f3a3328c80..672ec106df 100644 --- a/docs/modules/ROOT/pages/reference/extensions/core.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc @@ -395,6 +395,12 @@ Filter for tracing messages. | `string` | +|icon:lock[title=Fixed at build time] [[quarkus.camel.type-converter.statistics-enabled]]`link:#quarkus.camel.type-converter.statistics-enabled[quarkus.camel.type-converter.statistics-enabled]` + +Build time configuration options for enable/disable type converter statistics. +| `boolean` +| `true` + |icon:lock[title=Fixed at build time] [[quarkus.camel.main.shutdown.timeout]]`link:#quarkus.camel.main.shutdown.timeout[quarkus.camel.main.shutdown.timeout]` A timeout (with millisecond precision) to wait for `CamelMain++#++stop()` to finish diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java index cec76d1c94..e8184cf160 100644 --- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java @@ -249,6 +249,7 @@ class CamelProcessor { @BuildStep CamelTypeConverterRegistryBuildItem typeConverterRegistry( CamelRecorder recorder, +CamelConfig camelConfig, ApplicationArchivesBuildItem applicationArchives, List additionalLoaders, CombinedIndexBuildItem combinedIndex, @@ -256,7 +257,8 @@ class CamelProcessor { IndexView index = combinedIndex.getIndex(); -RuntimeValue typeConverterRegistry = recorder.createTypeConverterRegistry(); +RuntimeValue typeConverterRegistry = recorder + .createTypeConverterRegistry(camelConfig.typeConverter.statisticsEnabled); // // This should be simplified by searching for classes implementing TypeConverterLoader but that diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java index fb1b2a8f30..796283117a 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java @@ -91,6 +91,12 @@ public class CamelConfig { @ConfigItem public TraceConfig trace; +/** + * Build time configuration options for the Camel type converter. + */ +@ConfigItem +public TypeConverterConfig typeConverter; + @ConfigGroup public static class BootstrapConfig { /** @@ -504,4 +510,14 @@ public class CamelConfig { @ConfigItem public Optional traceFilter; } + +@ConfigGroup +public static class TypeConverterConfig { + +/** + * Build time configuration options for enable/disable type converter statistics. + */ +@ConfigItem(defaultValue = "true") +public boolean statisticsEnabled; +} } diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java index 95b77d2c6a..3dc39f6953 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java @@ -68,8 +6
(camel-quarkus) 02/14: Fiexd junit5 + generated poms
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 commit c07014ae424eaa72e3797a48c9ca09d58128ef0d Author: JiriOndrusek AuthorDate: Wed Jun 26 09:01:34 2024 +0200 Fiexd junit5 + generated poms --- poms/bom/pom.xml | 8 poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 .../org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java| 2 +- 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 4d0918c222..50df7ee791 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -889,6 +889,14 @@ camel-drill ${camel.version} + +ch.qos.logback +logback-classic + + +ch.qos.logback +logback-core + com.google.guava listenablefuture diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index f5dcdf68e7..c3bf52c8cd 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -827,6 +827,14 @@ camel-drill 4.7.0-SNAPSHOT + +ch.qos.logback +logback-classic + + +ch.qos.logback +logback-core + com.google.guava listenablefuture diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 1e75e8b57d..e65de42a1a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -827,6 +827,14 @@ camel-drill 4.7.0-SNAPSHOT + +ch.qos.logback +logback-classic + + +ch.qos.logback +logback-core + com.google.guava listenablefuture diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 2fc626a507..c8f2f22454 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -827,6 +827,14 @@ camel-drill 4.7.0-SNAPSHOT + +ch.qos.logback +logback-classic + + +ch.qos.logback +logback-core + com.google.guava listenablefuture diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 41b6ac8317..a69f45f17f 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -195,7 +195,6 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport */ protected void bindToRegistry(Registry registry) throws Exception { assertTestClassCamelContextMatchesAppCamelContext(); -super.bindToRegistry(registry); } /** @@ -495,6 +494,7 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport Exchange exchange, Processor processor, ProcessorDefinition definition, String id, String label, long timeTaken) { } + Set getCreatedRoutes() { return createdRoutes; }
(camel-quarkus) 12/14: Handle special case ical zones during build time processing
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 commit f28d97b29b9474f5930c332160f8cae571d2d140 Author: James Netherton AuthorDate: Fri Jun 28 14:36:13 2024 +0100 Handle special case ical zones during build time processing --- .../quarkus/component/ical/deployment/IcalProcessor.java | 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java index da5fd0eaa8..8a1afdd616 100644 --- a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java +++ b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java @@ -61,11 +61,21 @@ class IcalProcessor { timezoneData.values() .stream() .map(Objects::toString) -.map(timeZone -> timeZone.split("/")[0]) +.map(timeZone -> { +String[] zoneParts = timeZone.split("/"); +if (zoneParts.length == 2) { +return zoneParts[0]; +} else if (zoneParts.length == 3) { +return zoneParts[0] + "/" + zoneParts[1]; +} +return null; +}) .distinct() .forEach(region -> { -nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem("zoneinfo/" + region)); -nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem("zoneinfo-global/" + region)); +if (region != null) { +nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem("zoneinfo/" + region)); +nativeResourceDirs.produce(new NativeImageResourceDirectoryBuildItem("zoneinfo-global/" + region)); +} }); } catch (IOException e) {
(camel-quarkus) 08/14: More native mode fixes for ical
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 commit 4f4893ae978876faac464973935fc25cc9ec7193 Author: James Netherton AuthorDate: Fri Jun 28 08:37:25 2024 +0100 More native mode fixes for ical --- docs/modules/ROOT/pages/reference/extensions/ical.adoc | 7 +++ .../quarkus/component/ical/deployment/IcalProcessor.java | 14 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/ical.adoc b/docs/modules/ROOT/pages/reference/extensions/ical.adoc index 05ead6562a..268157d298 100644 --- a/docs/modules/ROOT/pages/reference/extensions/ical.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/ical.adoc @@ -44,3 +44,10 @@ Or add the coordinates to your existing project: ifeval::[{doc-show-user-guide-link} == true] Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. endif::[] + +[id="extensions-ical-ssl-in-native-mode"] +== SSL in native mode + +This extension auto-enables SSL support in native mode. Hence you do not need to add +`quarkus.ssl.native=true` to your `application.properties` yourself. See also +https://quarkus.io/guides/native-and-ssl[Quarkus SSL guide]. diff --git a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java index f928511cec..fc92c7b22d 100644 --- a/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java +++ b/extensions/ical/deployment/src/main/java/org/apache/camel/quarkus/component/ical/deployment/IcalProcessor.java @@ -20,12 +20,11 @@ import java.util.stream.Stream; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceDirectoryBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; -import net.fortuna.ical4j.model.TimeZoneLoader; import net.fortuna.ical4j.model.TimeZoneRegistryImpl; import net.fortuna.ical4j.util.MapTimeZoneCache; @@ -38,6 +37,12 @@ class IcalProcessor { return new FeatureBuildItem(FEATURE); } +@BuildStep +ExtensionSslNativeSupportBuildItem enableSSLNativeSupport() { +// Required by TimeZoneUpdater$UrlBuilder.toUrl +return new ExtensionSslNativeSupportBuildItem(FEATURE); +} + @BuildStep void nativeResources( BuildProducer nativeResources, @@ -69,9 +74,4 @@ class IcalProcessor { MapTimeZoneCache.class, TimeZoneRegistryImpl.class).build()); } - -@BuildStep -RuntimeReinitializedClassBuildItem runtimeReinitializedClasses() { -return new RuntimeReinitializedClassBuildItem(TimeZoneLoader.class.getName()); -} }
(camel-quarkus) 05/14: Quick fix of crypto
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 commit 839afdff9d74211fc261065b33ed96f2ef8e5cac Author: JiriOndrusek AuthorDate: Wed Jun 26 15:26:29 2024 +0200 Quick fix of crypto --- docs/modules/ROOT/examples/dataformats/pgp.yml | 13 - extensions/crypto/runtime/pom.xml | 4 poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml | 7 ++- .../src/main/generated/flattened-reduced-pom.xml | 22 ++ .../generated/flattened-reduced-verbose-pom.xml| 22 ++ 6 files changed, 27 insertions(+), 46 deletions(-) diff --git a/docs/modules/ROOT/examples/dataformats/pgp.yml b/docs/modules/ROOT/examples/dataformats/pgp.yml deleted file mode 100644 index d9e37bc125..00 --- a/docs/modules/ROOT/examples/dataformats/pgp.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Do not edit directly! -# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -cqArtifactId: camel-quarkus-crypto -cqArtifactIdBase: crypto -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: false -cqJvmSince: 1.1.0 -cqNativeSince: 1.2.0 -cqCamelPartName: pgp -cqCamelPartTitle: PGP -cqCamelPartDescription: Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP. -cqExtensionPageTitle: Crypto (JCE) diff --git a/extensions/crypto/runtime/pom.xml b/extensions/crypto/runtime/pom.xml index 73f4ef8ad1..dd5c7cf2a0 100644 --- a/extensions/crypto/runtime/pom.xml +++ b/extensions/crypto/runtime/pom.xml @@ -48,6 +48,10 @@ org.apache.camel camel-crypto + +org.apache.camel +camel-crypto-pgp + org.bouncycastle bcpg-jdk18on diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 50df7ee791..9011599068 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -760,6 +760,11 @@ camel-crypto ${camel.version} + +org.apache.camel +camel-crypto-pgp +${camel.version} + org.apache.camel camel-csv diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b02793864f..7278684326 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel +camel-crypto-pgp +4.7.0-SNAPSHOT + org.apache.camel camel-csv @@ -7161,7 +7166,7 @@ org.opensearch.client opensearch-rest-client -2.15.0 +2.14.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 23bace122a..cea3cc3833 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel +camel-crypto-pgp +4.7.0-SNAPSHOT + org.apache.camel camel-csv @@ -7022,11 +7027,6 @@ kotlin-scripting-jvm-host 2.0.0 - -org.jetbrains.kotlinx -kotlinx-serialization-core-jvm -1.4.0 - org.kiwiproject consul-client @@ -7060,7 +7060,7 @@ org.opensearch.client opensearch-rest-client -2.15.0 +2.14.0 org.optaplanner @@ -7866,11 +7866,6 @@ netty-nio-client 2.25.60 - -software.amazon.awssdk -url-connection-client -2.25.60 - software.amazon.awssdk utils @@ -7916,11 +7911,6 @@ firehose 2.25.60 - -software.amazon.awssdk -glue -2.25.60 - software.amazon.awssdk iam diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index ef38cbef01..d00d5af137 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel +camel-crypto-pgp +4.7.0-SNAPSHOT + org.apache.camel camel-csv @@ -7022,11 +7027,6 @@ kotlin-scripting-jvm-host 2.0.0
(camel-quarkus) 09/14: Quick fix of aws2-kinesis
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 commit 8900c4cd09013ff6de3bb92c31b8a49929fbbd41 Author: JiriOndrusek AuthorDate: Fri Jun 28 10:02:28 2024 +0200 Quick fix of aws2-kinesis --- .../kinesis/deployment/Aws2KinesisProcessor.java | 18 +++ extensions/aws2-kinesis/runtime/pom.xml| 5 + .../kinesis/graalvm/Aws2KinesisSubstitutions.java | 165 + .../src/main/resources/application.properties | 4 + .../aws2/kinesis/it/Aws2KinesisFirehoseIT.java | 24 --- .../aws2/kinesis/it/Aws2KinesisFirehoseTest.java | 127 6 files changed, 192 insertions(+), 151 deletions(-) diff --git a/extensions/aws2-kinesis/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/deployment/Aws2KinesisProcessor.java b/extensions/aws2-kinesis/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/deployment/Aws2KinesisProcessor.java index 7a55071918..1cadb5c61a 100644 --- a/extensions/aws2-kinesis/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/deployment/Aws2KinesisProcessor.java +++ b/extensions/aws2-kinesis/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/deployment/Aws2KinesisProcessor.java @@ -16,8 +16,13 @@ */ package org.apache.camel.quarkus.component.aws2.kinesis.deployment; +import java.util.stream.Stream; + +import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import org.jboss.logging.Logger; class Aws2KinesisProcessor { @@ -29,4 +34,17 @@ class Aws2KinesisProcessor { FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); } + +@BuildStep +void runtimeInitializedClasses(BuildProducer runtimeInitializedClass) { + Stream.of("software.amazon.awssdk.services.dynamodb.DynamoDbRetryPolicy", +"software.amazon.kinesis.lifecycle.ShutdownTask") +.map(RuntimeInitializedClassBuildItem::new) +.forEach(runtimeInitializedClass::produce); +} + +@BuildStep +void build(BuildProducer reflectiveClass) { + reflectiveClass.produce(ReflectiveClassBuildItem.builder("javax.xml.bind.DatatypeConverter").build()); +} } diff --git a/extensions/aws2-kinesis/runtime/pom.xml b/extensions/aws2-kinesis/runtime/pom.xml index dd3411b192..fc96d75e32 100644 --- a/extensions/aws2-kinesis/runtime/pom.xml +++ b/extensions/aws2-kinesis/runtime/pom.xml @@ -54,6 +54,11 @@ io.quarkus quarkus-netty + +org.graalvm.sdk +nativeimage +provided + diff --git a/extensions/aws2-kinesis/runtime/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/graalvm/Aws2KinesisSubstitutions.java b/extensions/aws2-kinesis/runtime/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/graalvm/Aws2KinesisSubstitutions.java new file mode 100644 index 00..4bfacfe4bb --- /dev/null +++ b/extensions/aws2-kinesis/runtime/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/graalvm/Aws2KinesisSubstitutions.java @@ -0,0 +1,165 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.aws2.kinesis.graalvm; + +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import com.google.protobuf.InvalidProtocolBufferException; +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import software.amazon.kinesis.retrieval.AggregatorUtil; +import software.amazon.kinesis.retrieval.KinesisClientRecord; +imp
(camel-quarkus) 07/14: Fixed twilio
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 commit 2e68dc5ea22e87a59ed2a85fb6f6dfc83137ac6e Author: JiriOndrusek AuthorDate: Thu Jun 27 15:05:51 2024 +0200 Fixed twilio --- .../org/apache/camel/quarkus/component/twilio/it/TwilioResource.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java index a585ea261a..c81d4054a8 100644 --- a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java +++ b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import com.twilio.constant.EnumConstants; import com.twilio.http.HttpClient; import com.twilio.http.NetworkHttpClient; import com.twilio.http.Request; @@ -85,6 +86,8 @@ public class TwilioResource { Request modified = new Request(originalRequest.getMethod(), url.replace("https://api.twilio.com;, wireMockUrl.get())); + modified.setContentType(EnumConstants.ContentType.FORM_URLENCODED); +modified.setBody(""); Map> headerParams = originalRequest.getHeaderParams(); for (String key : headerParams.keySet()) {
(camel-quarkus) 03/14: generated poms
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 commit 17b29dd625fbccdd2f660956150748581aa6b66f Author: JiriOndrusek AuthorDate: Wed Jun 26 10:34:32 2024 +0200 generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index c3bf52c8cd..b02793864f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7161,7 +7161,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e65de42a1a..23bace122a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7060,7 +7060,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index c8f2f22454..ef38cbef01 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7060,7 +7060,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner
(camel-quarkus) 06/14: generated files
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 commit c23fec87009d66ec99a8807e05d1cc297f211804 Author: JiriOndrusek AuthorDate: Thu Jun 27 08:49:44 2024 +0200 generated files --- .../modules/ROOT/pages/reference/extensions/crypto.adoc | 1 - poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 17 - .../main/generated/flattened-reduced-verbose-pom.xml| 17 - 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/crypto.adoc b/docs/modules/ROOT/pages/reference/extensions/crypto.adoc index 6e13f71b43..57e8dd857f 100644 --- a/docs/modules/ROOT/pages/reference/extensions/crypto.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/crypto.adoc @@ -24,7 +24,6 @@ Sign and verify exchanges using the Signature Service of the Java Cryptographic * xref:{cq-camel-components}:dataformats:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension) data format] * xref:{cq-camel-components}::crypto-component.adoc[Crypto (JCE) component], URI syntax: `crypto:cryptoOperation:name` -* xref:{cq-camel-components}:dataformats:pgp-dataformat.adoc[PGP data format] Please refer to the above links for usage and configuration details. diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 7278684326..4442f1fadc 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7166,7 +7166,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index cea3cc3833..825f18741a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7027,6 +7027,11 @@ kotlin-scripting-jvm-host 2.0.0 + +org.jetbrains.kotlinx +kotlinx-serialization-core-jvm +1.4.0 + org.kiwiproject consul-client @@ -7060,7 +7065,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner @@ -7866,6 +7871,11 @@ netty-nio-client 2.25.60 + +software.amazon.awssdk +url-connection-client +2.25.60 + software.amazon.awssdk utils @@ -7911,6 +7921,11 @@ firehose 2.25.60 + +software.amazon.awssdk +glue +2.25.60 + software.amazon.awssdk iam diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d00d5af137..76b0de5326 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7027,6 +7027,11 @@ kotlin-scripting-jvm-host 2.0.0 + +org.jetbrains.kotlinx +kotlinx-serialization-core-jvm +1.4.0 + org.kiwiproject consul-client @@ -7060,7 +7065,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner @@ -7866,6 +7871,11 @@ netty-nio-client 2.25.60 + +software.amazon.awssdk +url-connection-client +2.25.60 + software.amazon.awssdk utils @@ -7911,6 +7921,11 @@ firehose 2.25.60 + +software.amazon.awssdk +glue +2.25.60 + software.amazon.awssdk iam
(camel-quarkus) branch camel-main updated (0a09d982a7 -> a27ccbd923)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git omit 0a09d982a7 fixes in type convertors (because of CAMEL-19897)x omit 4fafc1a836 Handle special case ical zones during build time processing omit 9d703db3d8 Add dynamic discovery of ical zoneinfo omit a18f2bf1fc Miscellaneous tidy ups omit 1847b472e0 Quick fix of aws2-kinesis omit 16ad1ce616 More native mode fixes for ical omit cab0a50a5c Fixed twilio omit 7c2e58c2d4 generated files omit cca2c36330 Quick fix of crypto omit be698242fc Remove iCal UTC timezone format appendage or 'Z' to the timestamp omit 6da22c642d generated poms omit 49116eda1b Fiexd junit5 + generated poms omit 5652cc6189 Upgrade Camel to 4.7.0 add 34e2371c30 Bump me.escoffier.certs:certificate-generator-junit5 from 0.6.0 to 0.7.1 add cbdf110b1e Fix release procedure add d8a15e06b7 Document that ConsumerTemplate, ProducerTemplate & Registry can be injected into CDI beans add b763148b6a Set -Xmx4600m for Jenkins build jobs add dbeeea9e10 Upgrade to maven-enforcer-plugin 3.5.0 and cq-maven-plugin 4.9.0 and fix dependency convergence issues add b00a01c9d7 Ensure additional caffeine cache classes are registered for reflection if stats are enabled add f3423994d3 Bump quarkiverse-groovy.version from 3.11.0 to 3.12.0 (#6235) add bf0d926633 Bump net.revelc.code:impsort-maven-plugin from 1.10.0 to 1.11.0 (#6236) add 4292300be3 Bump quarkus-mybatis to 2.2.3 (#6237) add a890f30afd perf-regression: Upgrade hyperfoil-maven-plugin to version 0.26 add 1e0851c22f perf-regression: Fix warning linked to unused percentiles configuration add edcfd95440 perf-regression: Fix deprecated apis usage add f0e80dfbac Regen SBOM from commit edcfd954408c04dd805049a776ba6349830d9e44 (#6242) add e342e4e4c6 Fix Gradle dev mode execution for gRPC extension new dad5a12b8e Upgrade Camel to 4.7.0 new c07014ae42 Fiexd junit5 + generated poms new 17b29dd625 generated poms new a418f62936 Remove iCal UTC timezone format appendage or 'Z' to the timestamp new 839afdff9d Quick fix of crypto new c23fec8700 generated files new 2e68dc5ea2 Fixed twilio new 4f4893ae97 More native mode fixes for ical new 8900c4cd09 Quick fix of aws2-kinesis new 8ca8e12cdf Miscellaneous tidy ups new 54faab786a Add dynamic discovery of ical zoneinfo new f28d97b29b Handle special case ical zones during build time processing new 6394df757b fixes in type convertors (because of CAMEL-19897)x new a27ccbd923 generated files 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 (0a09d982a7) \ N -- N -- N refs/heads/camel-main (a27ccbd923) 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 14 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: Jenkinsfile| 5 +- Jenkinsfile.sonarcloud | 6 + camel-quarkus-sbom/camel-quarkus-sbom.json | 626 - camel-quarkus-sbom/camel-quarkus-sbom.xml | 448 --- docs/modules/ROOT/examples/others/kotlin-dsl.yml | 4 +- .../pages/contributor-guide/release-guide.adoc | 2 +- .../pages/reference/extensions/kotlin-dsl.adoc | 6 +- docs/modules/ROOT/pages/user-guide/cdi.adoc| 58 ++ .../caffeine/deployment/CaffeineProcessor.java | 21 +- extensions/grpc/deployment/pom.xml | 10 - extensions/grpc/runtime/pom.xml| 4 - .../src/main/resources/application.properties | 2 +- pom.xml| 16 +- poms/bom/pom.xml | 20 + poms/bom/src/main/generated/flattened-full-pom.xml | 30 +- .../src/main/generated/flattened-reduced-pom.xml | 30 +- .../generated/flattened-reduced-verbose-pom.xml| 30 +- .../cq-perf-regression-sample-base/pom.xml | 3 +- .../performance/regression/MvnwCmdHelper.java | 3 +- 19 files changed, 791 insertions(+), 533 deletions(-
(camel-quarkus) 04/14: Remove iCal UTC timezone format appendage or 'Z' to the timestamp
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 commit a418f62936642676a77d31f2bbc108b17a84979a Author: James Netherton AuthorDate: Wed Jun 26 12:49:06 2024 +0100 Remove iCal UTC timezone format appendage or 'Z' to the timestamp --- .../camel/quarkus/component/dataformat/it/DataformatTest.java | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java index f2cf856cba..62efa5035c 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java @@ -98,11 +98,7 @@ class DataformatTest { } static String toFormatedLocalDateTime(ZonedDateTime zonedDateTime) { -String result = zonedDateTime.format(DateTimeFormatter.ofPattern("MMdd'T'hhmmss")); -if (zonedDateTime.getZone().getId().equals("Etc/UTC")) { -result += "Z"; -} -return result; +return zonedDateTime.format(DateTimeFormatter.ofPattern("MMdd'T'hhmmss")); } }
(camel-quarkus) branch camel-main updated: fixes in type convertors (because of CAMEL-19897)x
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 0a09d982a7 fixes in type convertors (because of CAMEL-19897)x 0a09d982a7 is described below commit 0a09d982a76dc39f69fd42cd0985713c18ebe605 Author: JiriOndrusek AuthorDate: Mon Jul 1 10:16:23 2024 +0200 fixes in type convertors (because of CAMEL-19897)x --- .../ROOT/pages/reference/extensions/core.adoc | 6 ++ .../quarkus/core/deployment/CamelProcessor.java| 4 +- .../org/apache/camel/quarkus/core/CamelConfig.java | 16 ++ .../apache/camel/quarkus/core/CamelRecorder.java | 4 +- .../camel/quarkus/core/FastTypeConverter.java | 4 +- .../core/converter/it/ConverterResource.java | 11 ++-- .../quarkus/core/converter/it/ConverterTest.java | 35 --- .../core/converter/it/ConverterTestBase.java | 6 +- .../converter/it/ConverterWithStatisticsIT.java| 23 ...rTest.java => ConverterWithStatisticsTest.java} | 67 -- pom.xml| 2 +- .../quarkus/k/tooling/maven/GenerateRestXML.java | 24 ++-- 12 files changed, 88 insertions(+), 114 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc b/docs/modules/ROOT/pages/reference/extensions/core.adoc index f3a3328c80..672ec106df 100644 --- a/docs/modules/ROOT/pages/reference/extensions/core.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc @@ -395,6 +395,12 @@ Filter for tracing messages. | `string` | +|icon:lock[title=Fixed at build time] [[quarkus.camel.type-converter.statistics-enabled]]`link:#quarkus.camel.type-converter.statistics-enabled[quarkus.camel.type-converter.statistics-enabled]` + +Build time configuration options for enable/disable type converter statistics. +| `boolean` +| `true` + |icon:lock[title=Fixed at build time] [[quarkus.camel.main.shutdown.timeout]]`link:#quarkus.camel.main.shutdown.timeout[quarkus.camel.main.shutdown.timeout]` A timeout (with millisecond precision) to wait for `CamelMain++#++stop()` to finish diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java index cec76d1c94..e8184cf160 100644 --- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java @@ -249,6 +249,7 @@ class CamelProcessor { @BuildStep CamelTypeConverterRegistryBuildItem typeConverterRegistry( CamelRecorder recorder, +CamelConfig camelConfig, ApplicationArchivesBuildItem applicationArchives, List additionalLoaders, CombinedIndexBuildItem combinedIndex, @@ -256,7 +257,8 @@ class CamelProcessor { IndexView index = combinedIndex.getIndex(); -RuntimeValue typeConverterRegistry = recorder.createTypeConverterRegistry(); +RuntimeValue typeConverterRegistry = recorder + .createTypeConverterRegistry(camelConfig.typeConverter.statisticsEnabled); // // This should be simplified by searching for classes implementing TypeConverterLoader but that diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java index fb1b2a8f30..796283117a 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java @@ -91,6 +91,12 @@ public class CamelConfig { @ConfigItem public TraceConfig trace; +/** + * Build time configuration options for the Camel type converter. + */ +@ConfigItem +public TypeConverterConfig typeConverter; + @ConfigGroup public static class BootstrapConfig { /** @@ -504,4 +510,14 @@ public class CamelConfig { @ConfigItem public Optional traceFilter; } + +@ConfigGroup +public static class TypeConverterConfig { + +/** + * Build time configuration options for enable/disable type converter statistics. + */ +@ConfigItem(defaultValue = "true") +public boolean statisticsEnabled; +} } diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java index 95b77d2c6a..3dc39f6953 100644 --- a/extensions-core/core/run
(camel-quarkus) branch camel-main updated: Quick fix of aws2-kinesis
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 1847b472e0 Quick fix of aws2-kinesis 1847b472e0 is described below commit 1847b472e0d8ef680c79776425530841da1ce4c9 Author: JiriOndrusek AuthorDate: Fri Jun 28 10:02:28 2024 +0200 Quick fix of aws2-kinesis --- .../kinesis/deployment/Aws2KinesisProcessor.java | 18 +++ extensions/aws2-kinesis/runtime/pom.xml| 5 + .../kinesis/graalvm/Aws2KinesisSubstitutions.java | 165 + .../src/main/resources/application.properties | 4 + .../aws2/kinesis/it/Aws2KinesisFirehoseIT.java | 24 --- .../aws2/kinesis/it/Aws2KinesisFirehoseTest.java | 127 6 files changed, 192 insertions(+), 151 deletions(-) diff --git a/extensions/aws2-kinesis/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/deployment/Aws2KinesisProcessor.java b/extensions/aws2-kinesis/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/deployment/Aws2KinesisProcessor.java index 7a55071918..1cadb5c61a 100644 --- a/extensions/aws2-kinesis/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/deployment/Aws2KinesisProcessor.java +++ b/extensions/aws2-kinesis/deployment/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/deployment/Aws2KinesisProcessor.java @@ -16,8 +16,13 @@ */ package org.apache.camel.quarkus.component.aws2.kinesis.deployment; +import java.util.stream.Stream; + +import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import org.jboss.logging.Logger; class Aws2KinesisProcessor { @@ -29,4 +34,17 @@ class Aws2KinesisProcessor { FeatureBuildItem feature() { return new FeatureBuildItem(FEATURE); } + +@BuildStep +void runtimeInitializedClasses(BuildProducer runtimeInitializedClass) { + Stream.of("software.amazon.awssdk.services.dynamodb.DynamoDbRetryPolicy", +"software.amazon.kinesis.lifecycle.ShutdownTask") +.map(RuntimeInitializedClassBuildItem::new) +.forEach(runtimeInitializedClass::produce); +} + +@BuildStep +void build(BuildProducer reflectiveClass) { + reflectiveClass.produce(ReflectiveClassBuildItem.builder("javax.xml.bind.DatatypeConverter").build()); +} } diff --git a/extensions/aws2-kinesis/runtime/pom.xml b/extensions/aws2-kinesis/runtime/pom.xml index dd3411b192..fc96d75e32 100644 --- a/extensions/aws2-kinesis/runtime/pom.xml +++ b/extensions/aws2-kinesis/runtime/pom.xml @@ -54,6 +54,11 @@ io.quarkus quarkus-netty + +org.graalvm.sdk +nativeimage +provided + diff --git a/extensions/aws2-kinesis/runtime/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/graalvm/Aws2KinesisSubstitutions.java b/extensions/aws2-kinesis/runtime/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/graalvm/Aws2KinesisSubstitutions.java new file mode 100644 index 00..4bfacfe4bb --- /dev/null +++ b/extensions/aws2-kinesis/runtime/src/main/java/org/apache/camel/quarkus/component/aws2/kinesis/graalvm/Aws2KinesisSubstitutions.java @@ -0,0 +1,165 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.aws2.kinesis.graalvm; + +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import com.google.protobuf.InvalidProtocolBufferException; +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.Substitute; +import
(camel-quarkus) branch camel-main updated: Fixed twilio
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 cab0a50a5c Fixed twilio cab0a50a5c is described below commit cab0a50a5c79667e48988e815da805f68a24ff8a Author: JiriOndrusek AuthorDate: Thu Jun 27 15:05:51 2024 +0200 Fixed twilio --- .../org/apache/camel/quarkus/component/twilio/it/TwilioResource.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java index a585ea261a..c81d4054a8 100644 --- a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java +++ b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import com.twilio.constant.EnumConstants; import com.twilio.http.HttpClient; import com.twilio.http.NetworkHttpClient; import com.twilio.http.Request; @@ -85,6 +86,8 @@ public class TwilioResource { Request modified = new Request(originalRequest.getMethod(), url.replace("https://api.twilio.com;, wireMockUrl.get())); + modified.setContentType(EnumConstants.ContentType.FORM_URLENCODED); +modified.setBody(""); Map> headerParams = originalRequest.getHeaderParams(); for (String key : headerParams.keySet()) {
(camel-quarkus) branch camel-main updated: generated files
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 7c2e58c2d4 generated files 7c2e58c2d4 is described below commit 7c2e58c2d4cf4bdc8932e9c13921e246e3979fb8 Author: JiriOndrusek AuthorDate: Thu Jun 27 08:49:44 2024 +0200 generated files --- .../modules/ROOT/pages/reference/extensions/crypto.adoc | 1 - poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 17 - .../main/generated/flattened-reduced-verbose-pom.xml| 17 - 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/crypto.adoc b/docs/modules/ROOT/pages/reference/extensions/crypto.adoc index 6e13f71b43..57e8dd857f 100644 --- a/docs/modules/ROOT/pages/reference/extensions/crypto.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/crypto.adoc @@ -24,7 +24,6 @@ Sign and verify exchanges using the Signature Service of the Java Cryptographic * xref:{cq-camel-components}:dataformats:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension) data format] * xref:{cq-camel-components}::crypto-component.adoc[Crypto (JCE) component], URI syntax: `crypto:cryptoOperation:name` -* xref:{cq-camel-components}:dataformats:pgp-dataformat.adoc[PGP data format] Please refer to the above links for usage and configuration details. diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9613a8f14c..b62a8baf0e 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7146,7 +7146,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index cea3cc3833..825f18741a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7027,6 +7027,11 @@ kotlin-scripting-jvm-host 2.0.0 + +org.jetbrains.kotlinx +kotlinx-serialization-core-jvm +1.4.0 + org.kiwiproject consul-client @@ -7060,7 +7065,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner @@ -7866,6 +7871,11 @@ netty-nio-client 2.25.60 + +software.amazon.awssdk +url-connection-client +2.25.60 + software.amazon.awssdk utils @@ -7911,6 +7921,11 @@ firehose 2.25.60 + +software.amazon.awssdk +glue +2.25.60 + software.amazon.awssdk iam diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d00d5af137..76b0de5326 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7027,6 +7027,11 @@ kotlin-scripting-jvm-host 2.0.0 + +org.jetbrains.kotlinx +kotlinx-serialization-core-jvm +1.4.0 + org.kiwiproject consul-client @@ -7060,7 +7065,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner @@ -7866,6 +7871,11 @@ netty-nio-client 2.25.60 + +software.amazon.awssdk +url-connection-client +2.25.60 + software.amazon.awssdk utils @@ -7911,6 +7921,11 @@ firehose 2.25.60 + +software.amazon.awssdk +glue +2.25.60 + software.amazon.awssdk iam
(camel-quarkus) branch camel-main updated (ff57131fdd -> cca2c36330)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard ff57131fdd Quick fix of crypto new cca2c36330 Quick fix of crypto 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 (ff57131fdd) \ N -- N -- N refs/heads/camel-main (cca2c36330) 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: docs/modules/ROOT/examples/dataformats/pgp.yml | 13 - docs/modules/ROOT/pages/reference/extensions/crypto.adoc | 1 + 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 docs/modules/ROOT/examples/dataformats/pgp.yml
(camel-quarkus) 01/01: Quick fix of crypto
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 commit cca2c36330babbd5f9b0f4b68fe3bcab6a952224 Author: JiriOndrusek AuthorDate: Wed Jun 26 15:26:29 2024 +0200 Quick fix of crypto --- docs/modules/ROOT/examples/dataformats/pgp.yml | 13 - extensions/crypto/runtime/pom.xml | 4 poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml | 7 ++- .../src/main/generated/flattened-reduced-pom.xml | 22 ++ .../generated/flattened-reduced-verbose-pom.xml| 22 ++ 6 files changed, 27 insertions(+), 46 deletions(-) diff --git a/docs/modules/ROOT/examples/dataformats/pgp.yml b/docs/modules/ROOT/examples/dataformats/pgp.yml deleted file mode 100644 index d9e37bc125..00 --- a/docs/modules/ROOT/examples/dataformats/pgp.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Do not edit directly! -# This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -cqArtifactId: camel-quarkus-crypto -cqArtifactIdBase: crypto -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: false -cqJvmSince: 1.1.0 -cqNativeSince: 1.2.0 -cqCamelPartName: pgp -cqCamelPartTitle: PGP -cqCamelPartDescription: Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP. -cqExtensionPageTitle: Crypto (JCE) diff --git a/extensions/crypto/runtime/pom.xml b/extensions/crypto/runtime/pom.xml index 73f4ef8ad1..dd5c7cf2a0 100644 --- a/extensions/crypto/runtime/pom.xml +++ b/extensions/crypto/runtime/pom.xml @@ -48,6 +48,10 @@ org.apache.camel camel-crypto + +org.apache.camel +camel-crypto-pgp + org.bouncycastle bcpg-jdk18on diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index e0ca6e015f..607ac90dcd 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -760,6 +760,11 @@ camel-crypto ${camel.version} + +org.apache.camel +camel-crypto-pgp +${camel.version} + org.apache.camel camel-csv diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 75887570c2..9613a8f14c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel +camel-crypto-pgp +4.7.0-SNAPSHOT + org.apache.camel camel-csv @@ -7141,7 +7146,7 @@ org.opensearch.client opensearch-rest-client -2.15.0 +2.14.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 23bace122a..cea3cc3833 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel +camel-crypto-pgp +4.7.0-SNAPSHOT + org.apache.camel camel-csv @@ -7022,11 +7027,6 @@ kotlin-scripting-jvm-host 2.0.0 - -org.jetbrains.kotlinx -kotlinx-serialization-core-jvm -1.4.0 - org.kiwiproject consul-client @@ -7060,7 +7060,7 @@ org.opensearch.client opensearch-rest-client -2.15.0 +2.14.0 org.optaplanner @@ -7866,11 +7866,6 @@ netty-nio-client 2.25.60 - -software.amazon.awssdk -url-connection-client -2.25.60 - software.amazon.awssdk utils @@ -7916,11 +7911,6 @@ firehose 2.25.60 - -software.amazon.awssdk -glue -2.25.60 - software.amazon.awssdk iam diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index ef38cbef01..d00d5af137 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel +camel-crypto-pgp +4.7.0-SNAPSHOT + org.apache.camel camel-csv @@ -7022,11 +7027,6 @@ kotlin-scripting-jvm-host 2.0.0
(camel-quarkus) branch camel-main updated: Quick fix of crypto
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 ff57131fdd Quick fix of crypto ff57131fdd is described below commit ff57131fdd39987a7c43f5b65d3436653a89e116 Author: JiriOndrusek AuthorDate: Wed Jun 26 15:26:29 2024 +0200 Quick fix of crypto --- .../ROOT/pages/reference/extensions/crypto.adoc| 1 - extensions/crypto/runtime/pom.xml | 4 poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml | 7 ++- .../src/main/generated/flattened-reduced-pom.xml | 22 ++ .../generated/flattened-reduced-verbose-pom.xml| 22 ++ 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/crypto.adoc b/docs/modules/ROOT/pages/reference/extensions/crypto.adoc index 6e13f71b43..57e8dd857f 100644 --- a/docs/modules/ROOT/pages/reference/extensions/crypto.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/crypto.adoc @@ -24,7 +24,6 @@ Sign and verify exchanges using the Signature Service of the Java Cryptographic * xref:{cq-camel-components}:dataformats:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension) data format] * xref:{cq-camel-components}::crypto-component.adoc[Crypto (JCE) component], URI syntax: `crypto:cryptoOperation:name` -* xref:{cq-camel-components}:dataformats:pgp-dataformat.adoc[PGP data format] Please refer to the above links for usage and configuration details. diff --git a/extensions/crypto/runtime/pom.xml b/extensions/crypto/runtime/pom.xml index 73f4ef8ad1..dd5c7cf2a0 100644 --- a/extensions/crypto/runtime/pom.xml +++ b/extensions/crypto/runtime/pom.xml @@ -48,6 +48,10 @@ org.apache.camel camel-crypto + +org.apache.camel +camel-crypto-pgp + org.bouncycastle bcpg-jdk18on diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index e0ca6e015f..607ac90dcd 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -760,6 +760,11 @@ camel-crypto ${camel.version} + +org.apache.camel +camel-crypto-pgp +${camel.version} + org.apache.camel camel-csv diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 75887570c2..9613a8f14c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel +camel-crypto-pgp +4.7.0-SNAPSHOT + org.apache.camel camel-csv @@ -7141,7 +7146,7 @@ org.opensearch.client opensearch-rest-client -2.15.0 +2.14.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 23bace122a..cea3cc3833 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel +camel-crypto-pgp +4.7.0-SNAPSHOT + org.apache.camel camel-csv @@ -7022,11 +7027,6 @@ kotlin-scripting-jvm-host 2.0.0 - -org.jetbrains.kotlinx -kotlinx-serialization-core-jvm -1.4.0 - org.kiwiproject consul-client @@ -7060,7 +7060,7 @@ org.opensearch.client opensearch-rest-client -2.15.0 +2.14.0 org.optaplanner @@ -7866,11 +7866,6 @@ netty-nio-client 2.25.60 - -software.amazon.awssdk -url-connection-client -2.25.60 - software.amazon.awssdk utils @@ -7916,11 +7911,6 @@ firehose 2.25.60 - -software.amazon.awssdk -glue -2.25.60 - software.amazon.awssdk iam diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index ef38cbef01..d00d5af137 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -698,6 +698,11 @@ camel-crypto 4.7.0-SNAPSHOT + +org.apache.camel
(camel-quarkus) branch camel-main updated: generated poms
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 6da22c642d generated poms 6da22c642d is described below commit 6da22c642df0cf5244d38f9490e7a0d817a0b3c5 Author: JiriOndrusek AuthorDate: Wed Jun 26 10:34:32 2024 +0200 generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 7ca96a144c..75887570c2 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7141,7 +7141,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e65de42a1a..23bace122a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7060,7 +7060,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index c8f2f22454..ef38cbef01 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7060,7 +7060,7 @@ org.opensearch.client opensearch-rest-client -2.14.0 +2.15.0 org.optaplanner
(camel-quarkus) branch camel-main updated (83c367726c -> 49116eda1b)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 83c367726c Fixed awt version conflict + generated poms discard 0a46a57a2f Fix couchdb in native mode discard 83a01bb6b9 Fix ical dataformat in native mode discard 3452843acb Generated poms discard a2668e885c Disabled native dataformat test discard 871fc703d1 fix of dataformat for Etc/UTC discard f2136205ab Better fix of dataformat discard a55ed3ca31 Fixed datetime + generated poms discard a089879d2a Generated poms discard f20bafb897 Generated files discard 0f2b8b7b3b Fixed servlet discard 34f4bb8821 Fixed pubnub discard 098d9d8fa4 Fixed couchdb issue + generated files discard 5b2bcf4463 Fixed pubNub + generated files discard 39fa39c330 Fixed azure-queue discard 832832271f Added coap doc change discard 0aafb478a5 Fixed junit5-extension-tests discard 587ae2529f Fixed langchain4j (requires CAMEL-20863) discard 9515b83dfc Reverted langchain4j dependency exclusions, as the camel Quarkus has now the same version as Camel discard bed6ab1972 Fixed smb discard b8e6a87953 Solved conflict + rebased discard 3a59f3492c Removed unnecessary change made for xchange discard ecd7e9ed34 fixed azure and xchange discard 99b4487454 Rebased + format fix discard 00be55a027 Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport discard c18675e9fd Fixed style discard 5afe67f5e4 Proper fix of longchain4j version conflict discard c01ffef2e2 TestSupport fixes (CAMEL-20785) and langchain4j version conflict discard e38a1b25ae Conflict + generated POMs discard 0e65c81a0f Generated poms discard 9a6ce42c09 Fixed alphjabetical order of bom dependencies (langchain4j) discard 1aaf971889 Added camel-langchain4j-core to pom discard cb365e4f9a Fixed forrmatting discard ddf0dc24fd fixed test-framework/junit5 + generated changes discard 1207ebb940 Fix of compilation error in test-framework discard 64674584ee Generated poms discard 43ab9208dc Generated files discard 0b95f0e910 Handle DebuggerJmxConnectorService being present in the camel core discard a90eea51be Generated poms discard 6cd39baf09 Generated files discard 28a1a21803 Fixed knative + generated files discard 4a6f84eee5 generated poms discard ec0b9e6957 Fixed debug + generated poms discard ad577d0159 Upgrade Camel to 4.7.0 add 4bc44cb448 Update changelog for 3.12.0 release add d4b38e9bd2 Clean release procedure add 67758a7b31 Improve the testing guide add e6e6cc155e Miscellaneous test framework tidy ups new 5652cc6189 Upgrade Camel to 4.7.0 new 49116eda1b Fiexd junit5 + generated poms 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 (83c367726c) \ N -- N -- N refs/heads/camel-main (49116eda1b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 58 +++- .../pages/contributor-guide/release-guide.adoc | 78 ++--- docs/modules/ROOT/pages/user-guide/testing.adoc| 342 + poms/bom/pom.xml | 8 + poms/bom/src/main/generated/flattened-full-pom.xml | 8 + .../src/main/generated/flattened-reduced-pom.xml | 8 + .../generated/flattened-reduced-verbose-pom.xml| 8 + ...RouteBuilderWarningWithProducedBuilderTest.java | 2 +- ...teBuilderWarningWithoutProducedBuilderTest.java | 2 +- .../apache/camel/quarkus/test/CallbackUtil.java| 9 +- .../quarkus/test/CamelQuarkusTestSupport.java | 86 -- 11 files changed, 455 insertions(+), 154 deletions(-)
(camel-quarkus) 02/02: Fiexd junit5 + generated poms
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 commit 49116eda1bcd62aa1b4c8f5658ce033ea6723a57 Author: JiriOndrusek AuthorDate: Wed Jun 26 09:01:34 2024 +0200 Fiexd junit5 + generated poms --- poms/bom/pom.xml | 8 poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 .../org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java| 2 +- 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 4707ce921d..e0ca6e015f 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -889,6 +889,14 @@ camel-drill ${camel.version} + +ch.qos.logback +logback-classic + + +ch.qos.logback +logback-core + com.google.guava listenablefuture diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a9f274a000..7ca96a144c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -827,6 +827,14 @@ camel-drill 4.7.0-SNAPSHOT + +ch.qos.logback +logback-classic + + +ch.qos.logback +logback-core + com.google.guava listenablefuture diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 1e75e8b57d..e65de42a1a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -827,6 +827,14 @@ camel-drill 4.7.0-SNAPSHOT + +ch.qos.logback +logback-classic + + +ch.qos.logback +logback-core + com.google.guava listenablefuture diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 2fc626a507..c8f2f22454 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -827,6 +827,14 @@ camel-drill 4.7.0-SNAPSHOT + +ch.qos.logback +logback-classic + + +ch.qos.logback +logback-core + com.google.guava listenablefuture diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 41b6ac8317..a69f45f17f 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -195,7 +195,6 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport */ protected void bindToRegistry(Registry registry) throws Exception { assertTestClassCamelContextMatchesAppCamelContext(); -super.bindToRegistry(registry); } /** @@ -495,6 +494,7 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport Exchange exchange, Processor processor, ProcessorDefinition definition, String id, String label, long timeTaken) { } + Set getCreatedRoutes() { return createdRoutes; }
(camel-quarkus) branch camel-main updated: Fixed awt version conflict + generated poms
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 83c367726c Fixed awt version conflict + generated poms 83c367726c is described below commit 83c367726c397b60a8d60ae31471dfa777ab6b32 Author: JiriOndrusek AuthorDate: Tue Jun 25 10:26:59 2024 +0200 Fixed awt version conflict + generated poms --- pom.xml| 1 + poms/bom/pom.xml | 28 poms/bom/src/main/generated/flattened-full-pom.xml | 28 .../src/main/generated/flattened-reduced-pom.xml | 38 ++ .../generated/flattened-reduced-verbose-pom.xml| 38 ++ 5 files changed, 133 insertions(+) diff --git a/pom.xml b/pom.xml index ed65349f20..c1d83a3999 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,7 @@ 3.7.0 ${kudu-version} 2.0.0 +1.4.0 2.24.0 0.31.0 ${mapstruct-version} diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index c1ce0f9364..4707ce921d 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -319,6 +319,14 @@ commons-logging commons-logging + +javax.validation +validation-api + + +org.checkerframework +checker-qual + @@ -6613,6 +6621,11 @@ okio ${okio.version} + +com.squareup.okio +okio-jvm +${okio.version} + com.squareup.retrofit2 converter-jackson @@ -7125,6 +7138,16 @@ kotlin-script-util ${kotlin.version} + +org.jetbrains.kotlin +kotlin-scripting-compiler-embeddable +${kotlin.version} + + +org.jetbrains.kotlin + kotlin-scripting-compiler-impl-embeddable +${kotlin.version} + org.jetbrains.kotlin kotlin-scripting-jvm @@ -7135,6 +7158,11 @@ kotlin-scripting-jvm-host ${kotlin.version} + +org.jetbrains.kotlinx +kotlinx-serialization-core-jvm +${kotlinx.version} + org.jolokia jolokia-agent-jvm diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 094c25c097..a9f274a000 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -257,6 +257,14 @@ commons-logging commons-logging + +javax.validation +validation-api + + +org.checkerframework +checker-qual + @@ -6535,6 +6543,11 @@ okio 3.6.0 + +com.squareup.okio +okio-jvm +3.6.0 + com.squareup.retrofit2 converter-jackson @@ -7046,6 +7059,16 @@ kotlin-script-util 2.0.0 + +org.jetbrains.kotlin +kotlin-scripting-compiler-embeddable +2.0.0 + + +org.jetbrains.kotlin +kotlin-scripting-compiler-impl-embeddable +2.0.0 + org.jetbrains.kotlin kotlin-scripting-jvm @@ -7056,6 +7079,11 @@ kotlin-scripting-jvm-host 2.0.0 + +org.jetbrains.kotlinx +kotlinx-serialization-core-jvm +1.4.0 + org.jolokia jolokia-agent-jvm diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 39bf377d96..1e75e8b57d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -257,6 +257,14 @@ commons-logging commons-logging + +javax.validation +validation-api + + +org.checkerframework +checker-qual + @@ -6520,6 +6528,11 @@ okio 3.6.0 + +com.squareup.okio +okio-jvm +3.6.0 + com.squareup.retrofit2
(camel-quarkus) 29/41: Added coap doc change
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 commit 832832271fbad523c54af967ffad155c82ce289e Author: JiriOndrusek AuthorDate: Wed Jun 12 10:58:20 2024 +0200 Added coap doc change --- docs/modules/ROOT/examples/components/coap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/examples/components/coap.yml b/docs/modules/ROOT/examples/components/coap.yml index b7c93da8aa..476683941f 100644 --- a/docs/modules/ROOT/examples/components/coap.yml +++ b/docs/modules/ROOT/examples/components/coap.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.1.0 cqNativeSince: n/a cqCamelPartName: coap cqCamelPartTitle: CoAP -cqCamelPartDescription: Send and receive messages to/from COAP capable devices. +cqCamelPartDescription: Send and receive messages to/from CoAP (Constrained Application Protocol) capable devices. cqExtensionPageTitle: CoAP
(camel-quarkus) 39/41: fix of dataformat for Etc/UTC
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 commit 871fc703d1306f224fdcf5f93bb84aff964be086 Author: JiriOndrusek AuthorDate: Fri Jun 21 13:50:54 2024 +0200 fix of dataformat for Etc/UTC --- .../apache/camel/quarkus/component/dataformat/it/DataformatTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java index f2cf856cba..c249c5fb9b 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java @@ -99,9 +99,6 @@ class DataformatTest { static String toFormatedLocalDateTime(ZonedDateTime zonedDateTime) { String result = zonedDateTime.format(DateTimeFormatter.ofPattern("MMdd'T'hhmmss")); -if (zonedDateTime.getZone().getId().equals("Etc/UTC")) { -result += "Z"; -} return result; }
(camel-quarkus) 12/41: Fixed forrmatting
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 commit cb365e4f9af39e2f441cc4ac22675672456794a4 Author: JiriOndrusek AuthorDate: Tue May 28 09:41:09 2024 +0200 Fixed forrmatting --- .../test/junit5/patterns/TestDebugBreakpoint.java| 16 1 file changed, 16 insertions(+) diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java index 6c49499351..35289e1210 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/TestDebugBreakpoint.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.apache.camel.quarkus.test.junit5.patterns; import org.apache.camel.Exchange;
(camel-quarkus) 38/41: Better fix of dataformat
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 commit f2136205ab41465451d2ee67ce883bbfe2fb4d6f Author: JiriOndrusek AuthorDate: Fri Jun 21 12:02:55 2024 +0200 Better fix of dataformat --- .../camel/quarkus/component/dataformat/it/ICalUtils.java | 10 ++ .../camel/quarkus/component/dataformat/it/DataformatTest.java | 2 ++ integration-tests/dataformat/src/test/resources/test.ics | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java index 30ead3641b..b5d04fd036 100644 --- a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java +++ b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java @@ -17,12 +17,10 @@ package org.apache.camel.quarkus.component.dataformat.it; import java.net.URI; -import java.time.DateTimeException; import java.time.Instant; import java.time.ZonedDateTime; import net.fortuna.ical4j.model.Calendar; -import net.fortuna.ical4j.model.DateTime; import net.fortuna.ical4j.model.TimeZoneRegistry; import net.fortuna.ical4j.model.TimeZoneRegistryFactory; import net.fortuna.ical4j.model.component.VEvent; @@ -49,8 +47,8 @@ public class ICalUtils { // Create the event VEvent meeting = new VEvent(); meeting.replace(new DtStamp(Instant.ofEpochMilli(0))); -meeting.add(new DtStart(toDateTime(start, registry).toInstant())); -meeting.add(new DtEnd(toDateTime(end, registry).toInstant())); +meeting.add(new DtStart(start)); +meeting.add(new DtEnd(end)); meeting.add(new Summary(summary)); // add timezone info.. @@ -76,8 +74,4 @@ public class ICalUtils { return icsCalendar; } -static DateTime toDateTime(ZonedDateTime zonedDateTime, TimeZoneRegistry registry) { -return new DateTime(zonedDateTime.toInstant().toEpochMilli()); -} - } diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java index 5556571bfa..f2cf856cba 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java @@ -68,7 +68,9 @@ class DataformatTest { final String icsTemplate = IOUtils.toString(getClass().getResourceAsStream("/test.ics"), StandardCharsets.UTF_8); final String icalString = String.format( icsTemplate, +ZoneId.systemDefault().getId(), toFormatedLocalDateTime(START), +ZoneId.systemDefault().getId(), toFormatedLocalDateTime(END), START.getZone().getId()); diff --git a/integration-tests/dataformat/src/test/resources/test.ics b/integration-tests/dataformat/src/test/resources/test.ics index c730b9af11..8da810106e 100644 --- a/integration-tests/dataformat/src/test/resources/test.ics +++ b/integration-tests/dataformat/src/test/resources/test.ics @@ -4,8 +4,8 @@ PRODID:-//Events Calendar//iCal4j 1.0//EN CALSCALE:GREGORIAN BEGIN:VEVENT DTSTAMP:19700101T00Z -DTSTART:%s -DTEND:%s +DTSTART;TZID=%s:%s +DTEND;TZID=%s:%s SUMMARY:Progress Meeting TZID:%s UID:
(camel-quarkus) 21/41: Rebased + format fix
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 commit 99b44874542a4d5777ec84c14a932f4b6ac55d30 Author: JiriOndrusek AuthorDate: Mon Jun 10 09:25:28 2024 +0200 Rebased + format fix --- .../camel/quarkus/test/CamelQuarkusTestSupport.java | 21 ++--- .../test/CustomCamelContextConfiguration.java | 4 ++-- .../test/CustomTestExecutionConfiguration.java | 2 +- .../TransientCamelContextNotStoppingManager.java| 2 +- .../patterns/DebugNoLazyTypeConverterTest.java | 1 + 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 626391d0ad..94cd0f63b2 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -92,8 +92,8 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport private static final Logger LOG = LoggerFactory.getLogger(CamelQuarkusTestSupport.class); -//@RegisterExtension -//protected CamelTestSupport camelTestSupportExtension = this; +//@RegisterExtension +//protected CamelTestSupport camelTestSupportExtension = this; private final StopWatch watch = new StopWatch(); private String currentTestName; @@ -119,7 +119,7 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport .withJMX(useJmx()) .withUseRouteBuilder(isUseRouteBuilder()) .withDumpRouteCoverage(isDumpRouteCoverage()) -.withAutoStartContext(false); +.withAutoStartContext(false); contextConfiguration() .withCustomCamelContextSupplier(this::camelContextSupplier) @@ -137,11 +137,11 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport } CustomCamelContextConfiguration contextConfiguration() { -return (CustomCamelContextConfiguration)camelContextConfiguration; +return (CustomCamelContextConfiguration) camelContextConfiguration; } CustomTestExecutionConfiguration testConfigurationBuilder() { -return (CustomTestExecutionConfiguration)testConfigurationBuilder; +return (CustomTestExecutionConfiguration) testConfigurationBuilder; } // quarkus callbacks --- @@ -211,7 +211,7 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport */ @Override public CamelContext context() { - return this.context; +return this.context; } @Deprecated(since = "4.7.0") @@ -260,7 +260,8 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport long time = watch.taken(); if (isRouteCoverageEnabled()) { -ExtensionHelper.testEndFooter(getClass(), currentTestName, time, new RouteCoverageDumperExtension((ModelCamelContext) context)); +ExtensionHelper.testEndFooter(getClass(), currentTestName, time, +new RouteCoverageDumperExtension((ModelCamelContext) context)); } else { ExtensionHelper.testEndFooter(getClass(), currentTestName, time); } @@ -290,7 +291,6 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport // noop } - /** * Factory method which derived classes can use to create a {@link RouteBuilder} to define the routes for testing */ @@ -315,7 +315,6 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport return new RoutesBuilder[] { createRouteBuilder() }; } - void internalAfterAll(QuarkusTestContext context, ExtensionContext extensionContext) { try { if (!testConfiguration().isCreateCamelContextPerClass()) { @@ -329,8 +328,8 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport } void internalBeforeAll(ExtensionContext context) { -final boolean perClassPresent -= context.getTestInstanceLifecycle().filter(lc -> lc.equals(TestInstance.Lifecycle.PER_CLASS)).isPresent(); +final boolean perClassPresent = context.getTestInstanceLifecycle() +.filter(lc -> lc.equals(TestInstance.Lifecycle.PER_CLASS)).isPresent(); if (perClassPresent) { LOG.trace("Creating a legacy context manager for {}", context.getDisplayName()); testConfigurationBuilder().withCustomCreateCamelContextPerClass(perClassPresent); diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CustomCamelContextConfiguration.java b/test-framework/junit
(camel-quarkus) 40/41: Disabled native dataformat test
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 commit a2668e885cad9bd796e779ffa642068902c5ac8e Author: JiriOndrusek AuthorDate: Fri Jun 21 16:43:48 2024 +0200 Disabled native dataformat test --- integration-tests/dataformat/pom.xml | 5 +++-- .../apache/camel/quarkus/component/dataformat/it/DataformatIT.java | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/integration-tests/dataformat/pom.xml b/integration-tests/dataformat/pom.xml index 7eed5cf0ef..0914a75bb8 100644 --- a/integration-tests/dataformat/pom.xml +++ b/integration-tests/dataformat/pom.xml @@ -67,7 +67,8 @@ - + virtualDependencies diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java index 8676954dce..441d53bb66 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java @@ -17,7 +17,9 @@ package org.apache.camel.quarkus.component.dataformat.it; import io.quarkus.test.junit.QuarkusIntegrationTest; +import org.junit.jupiter.api.Disabled; +@Disabled //https://github.com/apache/camel-quarkus/issues/6218 @QuarkusIntegrationTest class DataformatIT extends DataformatTest {
(camel-quarkus) 24/41: Solved conflict + rebased
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 commit b8e6a87953c43f124b8583dca49dcd6c388091d3 Author: JiriOndrusek AuthorDate: Tue Jun 11 08:54:50 2024 +0200 Solved conflict + rebased --- poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8cc7fc..83c553ff46 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6581,12 +6581,12 @@ io.dropwizard.metrics dropwizard-core -4.2.25 +4.2.26 io.dropwizard.metrics metrics-jmx -4.2.25 +4.2.26 io.minio @@ -6688,12 +6688,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 53ab707188..010e9e5e0e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6658,12 +6658,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 946dff4d48..5ca10b95ce 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6658,12 +6658,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub
(camel-quarkus) 32/41: Fixed couchdb issue + generated files
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 commit 098d9d8fa454ef52013384f5e465f46e6fa4fef8 Author: JiriOndrusek AuthorDate: Mon Jun 17 14:41:45 2024 +0200 Fixed couchdb issue + generated files --- .../component/couchdb/it/CouchdbResource.java| 6 +++--- .../component/couchdb/it/CouchdbTestDocument.java| 17 + .../camel/quarkus/component/couchdb/it/CouchbIT.java | 2 +- .../quarkus/component/couchdb/it/CouchdbTest.java| 20 +++- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- .../bom/src/main/generated/flattened-reduced-pom.xml | 2 +- .../main/generated/flattened-reduced-verbose-pom.xml | 2 +- 8 files changed, 32 insertions(+), 21 deletions(-) diff --git a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java index fcb7aa4725..03b2f09756 100644 --- a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java +++ b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java @@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.couchdb.it; import java.util.Collection; import java.util.concurrent.ConcurrentLinkedQueue; +import com.ibm.cloud.sdk.core.service.exception.NotFoundException; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; @@ -33,7 +34,6 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.couchdb.CouchDbConstants; import org.apache.camel.component.couchdb.CouchDbOperations; import org.jboss.logging.Logger; -import org.lightcouch.NoDocumentException; import static org.apache.camel.quarkus.component.couchdb.it.CouchDbRoute.COUCHDB_ENDPOINT_URI; @@ -52,7 +52,7 @@ public class CouchdbResource { @PUT @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) -public CouchdbTestDocument create(CouchdbTestDocument document) { +public CouchdbTestDocument create(CouchdbTestDocument document) throws InterruptedException { LOG.info("Invoking create"); Exchange createExchange = producerTemplate.request(COUCHDB_ENDPOINT_URI, e -> e.getMessage().setBody(document.toJsonObject())); @@ -72,7 +72,7 @@ public class CouchdbResource { e.getMessage().setHeader(CouchDbConstants.HEADER_METHOD, CouchDbOperations.GET); e.getMessage().setHeader(CouchDbConstants.HEADER_DOC_ID, document.getId()); }); -if (getExchange.getException(NoDocumentException.class) != null) { +if (getExchange.getException(NotFoundException.class) != null) { return null; } else { return getExchange.getMessage().getBody(String.class); diff --git a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java index f384ba8213..9e55787379 100644 --- a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java +++ b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java @@ -16,7 +16,11 @@ */ package org.apache.camel.quarkus.component.couchdb.it; +import java.util.Optional; +import java.util.stream.StreamSupport; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.JsonArray; import com.google.gson.JsonObject; public class CouchdbTestDocument { @@ -67,11 +71,16 @@ public class CouchdbTestDocument { public static CouchdbTestDocument fromJsonObject(JsonObject jsonObject) { CouchdbTestDocument doc = new CouchdbTestDocument(); -if (jsonObject.has("_id")) { -doc.setId(jsonObject.get("_id").getAsString()); +if (jsonObject.has("id")) { +doc.setId(jsonObject.get("id").getAsString()); } -if (jsonObject.has("_rev")) { -doc.setRevision(jsonObject.get("_rev").getAsString()); +if (jsonObject.has("changes") && jsonObject.get("changes").isJsonArray()) { +JsonArray ja = jsonObject.get("changes").getAsJsonArray(); +Optional rev = StreamSupport.stream(ja.spliterator(), true) +.filter(jo -> ((JsonObject) jo).has("rev")) +.map(jo2 -> ((JsonObject) jo2).get("rev").getA
(camel-quarkus) 30/41: Fixed azure-queue
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 commit 39fa39c330bdad59916242d6495635a1924a6428 Author: JiriOndrusek AuthorDate: Wed Jun 12 13:44:35 2024 +0200 Fixed azure-queue --- .../storage/queue/deployment/AzureStorageQueueProcessor.java | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java index 8d0df10777..9f73e984fa 100644 --- a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java +++ b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java @@ -16,6 +16,7 @@ */ package org.apache.camel.quarkus.component.azure.storage.queue.deployment; +import com.azure.xml.XmlSerializable; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; @@ -31,6 +32,7 @@ class AzureStorageQueueProcessor { private static final Logger LOG = Logger.getLogger(AzureStorageQueueProcessor.class); private static final String FEATURE = "camel-azure-storage-queue"; +private static final DotName XML_SERIALIZABLE_NAME = DotName.createSimple(XmlSerializable.class.getName()); @BuildStep FeatureBuildItem feature() { @@ -55,8 +57,16 @@ class AzureStorageQueueProcessor { || n.startsWith("com.azure.storage.queue.models.")) .sorted() .toArray(String[]::new); - reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().build()); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().serialization().build()); +final String[] knownSerializableImpls = combinedIndex.getIndex() +.getAllKnownImplementors(XML_SERIALIZABLE_NAME) +.stream() +.map(ClassInfo::name) +.map(DotName::toString) +.sorted() +.toArray(String[]::new); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(knownSerializableImpls).methods().build()); } @BuildStep
(camel-quarkus) 34/41: Fixed servlet
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 commit 0f2b8b7b3b5032a17802ef89262d38c4478d625b Author: JiriOndrusek AuthorDate: Tue Jun 18 11:33:30 2024 +0200 Fixed servlet --- .../org/apache/camel/quarkus/component/servlet/ServletProducers.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java index 292be43a1e..c0172831a1 100644 --- a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java +++ b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java @@ -33,6 +33,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; +import org.apache.camel.http.common.HttpMessage; import org.apache.camel.spi.MimeType; import static org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig.DEFAULT_SERVLET_NAME; @@ -51,7 +52,8 @@ public class ServletProducers { return exchange -> { JsonObject json = new JsonObject(); Message message = exchange.getMessage(); -HttpServletRequest request = message.getHeader(Exchange.HTTP_SERVLET_REQUEST, HttpServletRequest.class); +HttpMessage httpMessage = exchange.getIn(HttpMessage.class); +HttpServletRequest request = httpMessage.getRequest(); String servletName = message.getHeader("servletName", DEFAULT_SERVLET_NAME, String.class); ServletContext servletContext = request.getServletContext(); Deployment deployment = ((ServletContextImpl) servletContext).getDeployment();
(camel-quarkus) 22/41: fixed azure and xchange
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 commit ecd7e9ed34dc03cbdee3a8cfa99cc375c638fc41 Author: JiriOndrusek AuthorDate: Mon Jun 10 16:37:02 2024 +0200 fixed azure and xchange --- extensions/xchange/deployment/pom.xml | 5 +++ .../xchange/deployment/XchangeProcessor.java | 7 .../deployment/graal/XchangeSubstitutions.java | 44 ++ pom.xml| 2 +- 4 files changed, 57 insertions(+), 1 deletion(-) diff --git a/extensions/xchange/deployment/pom.xml b/extensions/xchange/deployment/pom.xml index c7eebda0d1..d591231eed 100644 --- a/extensions/xchange/deployment/pom.xml +++ b/extensions/xchange/deployment/pom.xml @@ -42,6 +42,11 @@ org.apache.camel.quarkus camel-quarkus-xchange + +org.graalvm.sdk +nativeimage +provided + diff --git a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java index 158f3f6198..6328d03b00 100644 --- a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java +++ b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java @@ -109,6 +109,13 @@ class XchangeProcessor { .filter(className -> className.startsWith("jakarta.ws.rs")) .toArray(String[]::new); reflectiveClass.produce(ReflectiveClassBuildItem.builder(jaxrsAnnotations).methods().build()); + +//constructors for converters +String[] converterClasses = index.getAllKnownSubclasses("com.fasterxml.jackson.databind.util.StdConverter") +.stream() +.map(classInfo -> classInfo.name().toString()) +.toArray(String[]::new); + reflectiveClass.produce(ReflectiveClassBuildItem.builder(converterClasses).methods().fields().build()); } @BuildStep diff --git a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java new file mode 100644 index 00..7eeac51c19 --- /dev/null +++ b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.component.xchange.deployment.graal; + +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; +import com.oracle.svm.core.annotate.TargetElement; +import org.knowm.xchange.binance.config.converter.StringToCurrencyConverter; +import org.knowm.xchange.binance.config.converter.StringToCurrencyPairConverter; + +public class XchangeSubstitutions { + +@TargetClass(StringToCurrencyPairConverter.class) +class StringToCurrencyPairConverterSubstitutions { + +@Substitute +@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) +public StringToCurrencyPairConverterSubstitutions() { +} +} + +@TargetClass(StringToCurrencyConverter.class) +class StringToCurrencyConverterSubstitutions { + +@Substitute +@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) +public StringToCurrencyConverterSubstitutions() { +} +} +} diff --git a/pom.xml b/pom.xml index 0fe1cbcb0d..709b894613 100644 --- a/pom.xml +++ b/pom.xml @@ -216,7 +216,7 @@ docker.io/rmohr/activemq:5.15.9-alpine quay.io/artemiscloud/activemq-artemis-broker:1.0.20 docker.io/arangodb:3.12.0 - mcr.microsoft.com/azure-storage/azurite:3.29.0 +
(camel-quarkus) 15/41: Generated poms
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 commit 0e65c81a0f4f54f1ddc89cdc2558758c705a52c2 Author: JiriOndrusek AuthorDate: Wed May 29 10:39:09 2024 +0200 Generated poms --- poms/bom/pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index e50c3fc6d7..ee714262d9 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1779,7 +1779,7 @@ org.apache.camel -camel-langchain4-chat +camel-langchain4j-chat ${camel.version} diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a0cdf972dd..26f37fe019 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1716,12 +1716,12 @@ org.apache.camel -camel-langchain4j-core +camel-langchain4j-chat 4.7.0-SNAPSHOT org.apache.camel -camel-langchain4j-chat +camel-langchain4j-core 4.7.0-SNAPSHOT diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7aac99bf12..194967448a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1716,12 +1716,12 @@ org.apache.camel -camel-langchain4j-core +camel-langchain4j-chat 4.7.0-SNAPSHOT org.apache.camel -camel-langchain4j-chat +camel-langchain4j-core 4.7.0-SNAPSHOT diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 65e11c9b80..8904414670 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1716,12 +1716,12 @@ org.apache.camel -camel-langchain4j-core +camel-langchain4j-chat 4.7.0-SNAPSHOT org.apache.camel -camel-langchain4j-chat +camel-langchain4j-core 4.7.0-SNAPSHOT
(camel-quarkus) 06/41: Generated poms
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 commit a90eea51be846306133d6df5141e49cf3f4f7dd0 Author: JiriOndrusek AuthorDate: Tue May 21 09:25:54 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 20 ++-- .../bom/src/main/generated/flattened-reduced-pom.xml | 20 ++-- .../main/generated/flattened-reduced-verbose-pom.xml | 20 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 4e7fc2daf8..1d1040593c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6269,7 +6269,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6288,12 +6288,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6308,22 +6308,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0 ca.uhn.hapi.fhir @@ -6768,17 +6768,17 @@ io.swagger.core.v3 swagger-annotations-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-core-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-models-jakarta -2.2.21 +2.2.22 io.swagger.parser.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index b17731fb1d..ceb6c97395 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6269,7 +6269,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6288,12 +6288,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6308,22 +6308,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0 ca.uhn.hapi.fhir @@ -6728,17 +6728,17 @@ io.swagger.core.v3 swagger-annotations-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-core-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-models-jakarta -2.2.21 +2.2.22 io.swagger.parser.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 329fef4eb0..75a26dfb52 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6269,7 +6269,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6288,12 +6288,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6308,22 +6308,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0
(camel-quarkus) 10/41: Fix of compilation error in test-framework
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 commit 1207ebb94027564dcd593705fcf3caad6d283408 Author: JiriOndrusek AuthorDate: Mon May 27 16:05:44 2024 +0200 Fix of compilation error in test-framework --- .../camel/quarkus/test/CamelQuarkusTestSupport.java | 2 +- .../quarkus/test/common/AbstractCallbacksTest.java | 17 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 70910d51d8..62c1a21af7 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -267,7 +267,7 @@ public class CamelQuarkusTestSupport extends CamelTestSupport * Method is not intended to be overridden. */ @Override -protected final void doQuarkusCheck() { +protected final void unsupportedCheck() { //can run on Quarkus //log warning in case that at least one RouteBuilder in the registry, it might mean, that unintentionally diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java index 4d9d7b5501..77c6b64c7f 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java @@ -36,15 +36,15 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; -import org.apache.camel.quarkus.test.junit5.patterns.DebugJUnit5Test; import org.apache.camel.util.StopWatch; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { -private static final Logger LOG = Logger.getLogger(DebugJUnit5Test.class); +private static final Logger LOG = Logger.getLogger(AbstractCallbacksTest.class); public enum Callback { postTearDown, @@ -69,6 +69,12 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { this.afterClassTestName = afterClassTestName; } +@BeforeEach +protected void createTmpFiles() throws Exception { +createTmpFile(testName, Callback.doSetup); +createTmpFile(afterClassTestName, Callback.doSetup); +} + @Override protected CamelContext createCamelContext() throws Exception { createTmpFile(testName, Callback.contextCreation); @@ -83,13 +89,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { super.doPostSetup(); } -@Override -protected void doSetUp() throws Exception { -createTmpFile(testName, Callback.doSetup); -createTmpFile(afterClassTestName, Callback.doSetup); -super.doSetUp(); -} - @Override protected void doPostSetup() throws Exception { createTmpFile(testName, Callback.postSetup);
(camel-quarkus) 25/41: Fixed smb
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 commit bed6ab19729f4e14457506026088cc79756b39af Author: JiriOndrusek AuthorDate: Tue Jun 11 11:01:59 2024 +0200 Fixed smb --- .../main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java index b2ec2c0dce..e72b0df28a 100644 --- a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbRoute.java @@ -22,7 +22,7 @@ public class SmbRoute extends RouteBuilder { @Override public void configure() throws Exception { - from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}={{smb.password}}") + from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}={{smb.password}}=true") .to("mock:result"); } }
(camel-quarkus) 27/41: Fixed langchain4j (requires CAMEL-20863)
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 commit 587ae2529f9c7529be342130a1599b1346b847e5 Author: JiriOndrusek AuthorDate: Tue Jun 11 14:05:27 2024 +0200 Fixed langchain4j (requires CAMEL-20863) --- .../component/langchain/chat/it/OllamaRoute.java | 22 ++ 1 file changed, 22 insertions(+) diff --git a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java index c87d2cffe8..47d9c68c40 100644 --- a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java +++ b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java @@ -16,11 +16,22 @@ */ package org.apache.camel.quarkus.component.langchain.chat.it; +import dev.langchain4j.model.chat.ChatLanguageModel; +import io.quarkiverse.langchain4j.ollama.OllamaChatLanguageModel; +import io.quarkiverse.langchain4j.ollama.Options; import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.apache.camel.builder.RouteBuilder; +import org.eclipse.microprofile.config.inject.ConfigProperty; + +import static java.time.Duration.ofSeconds; @ApplicationScoped public class OllamaRoute extends RouteBuilder { + +@ConfigProperty(name = "quarkus.langchain4j.ollama.base-url") +private String ollamaUrl; + @Override public void configure() throws Exception { from("direct:send-simple-message?timeout=3") @@ -35,4 +46,15 @@ public class OllamaRoute extends RouteBuilder { .to("langchain4j-chat:test3?chatOperation=CHAT_MULTIPLE_MESSAGES") .to("mock:multipleMessageResponse"); } + +//model reflects the values in wire-mocked response +@Produces +public ChatLanguageModel produceModel() { +return OllamaChatLanguageModel.builder() + .options(Options.builder().temperature(0.3).topK(40).topP(0.9).build()) +.model("orca-mini") +.baseUrl(ollamaUrl) +.timeout(ofSeconds(3000)) +.build(); +} }
(camel-quarkus) 11/41: fixed test-framework/junit5 + generated changes
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 commit ddf0dc24fdd4b246b8cda7b7cc9e5612c5a4b103 Author: JiriOndrusek AuthorDate: Mon May 27 17:17:01 2024 +0200 fixed test-framework/junit5 + generated changes --- .../main/resources/META-INF/quarkus-extension.yaml | 2 +- .../main/resources/META-INF/quarkus-extension.yaml | 1 + .../quarkus/test/common/AbstractCallbacksTest.java | 8 -- .../test/common/CallbacksPerTestFalse01Test.java | 3 --- .../test/common/CallbacksPerTestTrue01Test.java| 3 --- .../test/junit5/patterns/DebugJUnit5Test.java | 6 + .../patterns/DebugNoLazyTypeConverterTest.java | 6 + .../quarkus/test/junit5/patterns/DebugTest.java| 6 + .../test/junit5/patterns/TestDebugBreakpoint.java | 29 ++ 9 files changed, 49 insertions(+), 15 deletions(-) diff --git a/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 253ef63aa4..96dbe3295d 100644 --- a/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -22,7 +22,7 @@ # --- name: "Camel ActiveMQ" -description: "Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component" +description: "Send messages to (or consume from) Apache ActiveMQ 5.x. This component extends the Camel JMS component" metadata: icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg; guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/activemq.html; diff --git a/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 6ecbc7bde8..4b4f84c9ba 100644 --- a/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/nitrite/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -30,3 +30,4 @@ metadata: - "integration" status: - "stable" + - "deprecated" \ No newline at end of file diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java index 77c6b64c7f..597ccc7df7 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java @@ -39,7 +39,6 @@ import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; import org.apache.camel.util.StopWatch; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { @@ -48,7 +47,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { public enum Callback { postTearDown, -doSetup, preSetup, postSetup, contextCreation, @@ -69,12 +67,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { this.afterClassTestName = afterClassTestName; } -@BeforeEach -protected void createTmpFiles() throws Exception { -createTmpFile(testName, Callback.doSetup); -createTmpFile(afterClassTestName, Callback.doSetup); -} - @Override protected CamelContext createCamelContext() throws Exception { createTmpFile(testName, Callback.contextCreation); diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java index e10d0ce525..591a40eb5c 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/CallbacksPerTestFalse01Test.java @@ -39,9 +39,6 @@ public class CallbacksPerTestFalse01Test extends AbstractCallbacksTest { protected static BiConsumer createAssertionConsumer() { return (callback, count) -> { switch (callback) { -case doSetup: -assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpleName()); -break; case contextCreation: assertCount(3, count, callback, CallbacksPerTestFalse01Test.class.getSimpl
(camel-quarkus) 20/41: Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport
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 commit 00be55a027b260de98695e94029ac66ca5ba5cc3 Author: JiriOndrusek AuthorDate: Fri Jun 7 09:24:53 2024 +0200 Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport --- .../quarkus/test/CamelQuarkusTestSupport.java | 320 + .../test/CustomCamelContextConfiguration.java | 34 +++ .../test/CustomTestExecutionConfiguration.java | 30 ++ 3 files changed, 263 insertions(+), 121 deletions(-) diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index e91435d977..626391d0ad 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -26,14 +26,29 @@ import io.quarkus.test.junit.callback.QuarkusTestContext; import io.quarkus.test.junit.callback.QuarkusTestMethodContext; import jakarta.inject.Inject; import org.apache.camel.CamelContext; +import org.apache.camel.Exchange; +import org.apache.camel.NoSuchEndpointException; +import org.apache.camel.Processor; import org.apache.camel.Route; +import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.ModelCamelContext; +import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.model.RouteDefinition; import org.apache.camel.quarkus.core.FastCamelContext; import org.apache.camel.spi.Registry; +import org.apache.camel.test.junit5.AbstractTestSupport; +import org.apache.camel.test.junit5.CamelContextManager; import org.apache.camel.test.junit5.CamelTestSupport; +import org.apache.camel.test.junit5.ContextManagerFactory; +import org.apache.camel.test.junit5.TestSupport; +import org.apache.camel.test.junit5.util.ExtensionHelper; +import org.apache.camel.test.junit5.util.RouteCoverageDumperExtension; +import org.apache.camel.util.StopWatch; +import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.TestInstance; import org.junit.jupiter.api.extension.ExtensionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,11 +87,20 @@ import org.slf4j.LoggerFactory; * them. * */ -public class CamelQuarkusTestSupport extends CamelTestSupport +public class CamelQuarkusTestSupport extends AbstractTestSupport implements QuarkusTestProfile { private static final Logger LOG = LoggerFactory.getLogger(CamelQuarkusTestSupport.class); +//@RegisterExtension +//protected CamelTestSupport camelTestSupportExtension = this; + +private final StopWatch watch = new StopWatch(); +private String currentTestName; + +private CamelContextManager contextManager; +private final ContextManagerFactory contextManagerFactory; + @Inject protected CamelContext context; @@ -86,12 +110,40 @@ public class CamelQuarkusTestSupport extends CamelTestSupport Set createdRoutes; public CamelQuarkusTestSupport() { -super(new ContextNotStoppingManagerFactory()); +super(new CustomTestExecutionConfiguration(), new CustomCamelContextConfiguration()); + +this.contextManagerFactory = new ContextNotStoppingManagerFactory(); + +testConfigurationBuilder() +.withCustomUseAdviceWith(isUseAdviceWith()) +.withJMX(useJmx()) +.withUseRouteBuilder(isUseRouteBuilder()) +.withDumpRouteCoverage(isDumpRouteCoverage()) +.withAutoStartContext(false); + +contextConfiguration() +.withCustomCamelContextSupplier(this::camelContextSupplier) +.withCustomPostProcessor(this::postProcessTest) +.withCustomRoutesSupplier(this::createRouteBuilders) +.withRegistryBinder(this::bindToRegistry) + .withUseOverridePropertiesWithPropertiesComponent(useOverridePropertiesWithPropertiesComponent()) +.withRouteFilterExcludePattern(getRouteFilterExcludePattern()) +.withRouteFilterIncludePattern(getRouteFilterIncludePattern()) +.withMockEndpoints(isMockEndpoints()) +.withMockEndpointsAndSkip(isMockEndpointsAndSkip()); //CQ starts and stops context with the application start/stop testConfiguration().withAutoStartContext(false); } +CustomCamelContextConfiguration contextConfiguration() { +return (CustomCamelContextConfiguration)camelContextConfiguration; +} + +CustomTestExecutionConfiguration testConfigurationBuilder() { +return
(camel-quarkus) 13/41: Added camel-langchain4j-core to pom
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 commit 1aaf9718897b4fbb3386906cc7c8e9c4eebe7f91 Author: JiriOndrusek AuthorDate: Wed May 29 08:54:35 2024 +0200 Added camel-langchain4j-core to pom --- poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml| 5 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 + poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 + 4 files changed, 20 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 9cb3038d76..e73a0786dd 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1777,6 +1777,11 @@ camel-kudu ${camel.version} + +org.apache.camel +camel-langchain4j-core +${camel.version} + org.apache.camel camel-langchain4j-chat diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index d86c08ae49..a0cdf972dd 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index e6578fc7a7..7aac99bf12 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 2cea333a33..65e11c9b80 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat
(camel-quarkus) 23/41: Removed unnecessary change made for xchange
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 commit 3a59f3492c816c5b2fb2e5019b8fa63203eecaa7 Author: JiriOndrusek AuthorDate: Mon Jun 10 16:46:53 2024 +0200 Removed unnecessary change made for xchange --- extensions/xchange/deployment/pom.xml | 5 --- .../deployment/graal/XchangeSubstitutions.java | 44 -- 2 files changed, 49 deletions(-) diff --git a/extensions/xchange/deployment/pom.xml b/extensions/xchange/deployment/pom.xml index d591231eed..c7eebda0d1 100644 --- a/extensions/xchange/deployment/pom.xml +++ b/extensions/xchange/deployment/pom.xml @@ -42,11 +42,6 @@ org.apache.camel.quarkus camel-quarkus-xchange - -org.graalvm.sdk -nativeimage -provided - diff --git a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java deleted file mode 100644 index 7eeac51c19..00 --- a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/graal/XchangeSubstitutions.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.xchange.deployment.graal; - -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; -import com.oracle.svm.core.annotate.TargetElement; -import org.knowm.xchange.binance.config.converter.StringToCurrencyConverter; -import org.knowm.xchange.binance.config.converter.StringToCurrencyPairConverter; - -public class XchangeSubstitutions { - -@TargetClass(StringToCurrencyPairConverter.class) -class StringToCurrencyPairConverterSubstitutions { - -@Substitute -@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) -public StringToCurrencyPairConverterSubstitutions() { -} -} - -@TargetClass(StringToCurrencyConverter.class) -class StringToCurrencyConverterSubstitutions { - -@Substitute -@TargetElement(name = TargetElement.CONSTRUCTOR_NAME) -public StringToCurrencyConverterSubstitutions() { -} -} -}
(camel-quarkus) 36/41: Generated poms
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 commit a089879d2ab91ac551459a6cb6580c240beda93e Author: JiriOndrusek AuthorDate: Thu Jun 20 09:22:06 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9bd44478d3..de4dc9fe01 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7236,7 +7236,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 14d4e353cf..95f5e31c84 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7140,7 +7140,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index aa1c2193cc..b31667c0bb 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7140,7 +7140,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 org.springframework
(camel-quarkus) 14/41: Fixed alphjabetical order of bom dependencies (langchain4j)
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 commit 9a6ce42c0909990de1509bba74feceed5d6c2599 Author: JiriOndrusek AuthorDate: Wed May 29 10:26:55 2024 +0200 Fixed alphjabetical order of bom dependencies (langchain4j) --- poms/bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index e73a0786dd..e50c3fc6d7 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1779,12 +1779,12 @@ org.apache.camel -camel-langchain4j-core +camel-langchain4-chat ${camel.version} org.apache.camel -camel-langchain4j-chat +camel-langchain4j-core ${camel.version}
(camel-quarkus) 05/41: Generated files
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 commit 6cd39baf09fe5bb75cf9099ddf068861f7236820 Author: JiriOndrusek AuthorDate: Mon May 20 09:24:06 2024 +0200 Generated files --- docs/modules/ROOT/examples/components/activemq.yml | 4 ++-- docs/modules/ROOT/examples/components/nitrite.yml | 2 +- docs/modules/ROOT/pages/reference/extensions/activemq.adoc | 6 +++--- docs/modules/ROOT/pages/reference/extensions/nitrite.adoc | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 14 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 ++-- .../src/main/generated/flattened-reduced-verbose-pom.xml | 12 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docs/modules/ROOT/examples/components/activemq.yml b/docs/modules/ROOT/examples/components/activemq.yml index e1fbbf302b..252dbc3067 100644 --- a/docs/modules/ROOT/examples/components/activemq.yml +++ b/docs/modules/ROOT/examples/components/activemq.yml @@ -8,6 +8,6 @@ cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 cqCamelPartName: activemq -cqCamelPartTitle: ActiveMQ -cqCamelPartDescription: Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component. +cqCamelPartTitle: ActiveMQ 5.x +cqCamelPartDescription: Send messages to (or consume from) Apache ActiveMQ 5.x. This component extends the Camel JMS component. cqExtensionPageTitle: ActiveMQ diff --git a/docs/modules/ROOT/examples/components/nitrite.yml b/docs/modules/ROOT/examples/components/nitrite.yml index 012e488442..9e0d9d023b 100644 --- a/docs/modules/ROOT/examples/components/nitrite.yml +++ b/docs/modules/ROOT/examples/components/nitrite.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-nitrite cqArtifactIdBase: nitrite cqNativeSupported: true cqStatus: Stable -cqDeprecated: false +cqDeprecated: true cqJvmSince: 1.0.0 cqNativeSince: 1.8.0 cqCamelPartName: nitrite diff --git a/docs/modules/ROOT/pages/reference/extensions/activemq.adoc b/docs/modules/ROOT/pages/reference/extensions/activemq.adoc index 430c0383fd..c044c78689 100644 --- a/docs/modules/ROOT/pages/reference/extensions/activemq.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/activemq.adoc @@ -8,7 +8,7 @@ :cq-native-supported: true :cq-status: Stable :cq-status-deprecation: Stable -:cq-description: Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component. +:cq-description: Send messages to (or consume from) Apache ActiveMQ 5.x. This component extends the Camel JMS component. :cq-deprecated: false :cq-jvm-since: 1.0.0 :cq-native-since: 1.0.0 @@ -18,12 +18,12 @@ ifeval::[{doc-show-badges} == true] [.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## endif::[] -Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component. +Send messages to (or consume from) Apache ActiveMQ 5.x. This component extends the Camel JMS component. [id="extensions-activemq-whats-inside"] == What's inside -* xref:{cq-camel-components}::activemq-component.adoc[ActiveMQ component], URI syntax: `activemq:destinationType:destinationName` +* xref:{cq-camel-components}::activemq-component.adoc[ActiveMQ 5.x component], URI syntax: `activemq:destinationType:destinationName` Please refer to the above link for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc b/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc index d94defb0da..bd7eda15d6 100644 --- a/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/nitrite.adoc @@ -7,15 +7,15 @@ :cq-artifact-id: camel-quarkus-nitrite :cq-native-supported: true :cq-status: Stable -:cq-status-deprecation: Stable +:cq-status-deprecation: Stable Deprecated :cq-description: Access Nitrite databases. -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 1.0.0 :cq-native-since: 1.8.0 ifeval::[{doc-show-badges} == true] [.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.8.0## +[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.8.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## endif::[] Access Nitrite databases. diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 3cb5a666c2..4e7fc2daf8 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7120,7 +7120,7 @@ org.springframework spring-aop -6.1.6 +
(camel-quarkus) 41/41: Generated poms
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 commit 3452843acbd6485efdc49439fc3c951b94b673db Author: JiriOndrusek AuthorDate: Mon Jun 24 09:32:59 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 92bb7596c1..094c25c097 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2103,7 +2103,7 @@ org.apache.camel camel-pinecone -4.6.0 +4.7.0-SNAPSHOT com.google.android diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 1c2205e489..39bf377d96 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -2103,7 +2103,7 @@ org.apache.camel camel-pinecone -4.6.0 +4.7.0-SNAPSHOT com.google.android diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index ee22427fd9..3c34e6e500 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -2103,7 +2103,7 @@ org.apache.camel camel-pinecone -4.6.0 +4.7.0-SNAPSHOT com.google.android
(camel-quarkus) 35/41: Generated files
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 commit f20bafb897bed7271ab889912e67d030c1b170a5 Author: JiriOndrusek AuthorDate: Wed Jun 19 09:32:22 2024 +0200 Generated files --- docs/modules/ROOT/examples/others/kotlin-dsl.yml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/modules/ROOT/examples/others/kotlin-dsl.yml b/docs/modules/ROOT/examples/others/kotlin-dsl.yml index 032388d0ab..66f23c3ded 100644 --- a/docs/modules/ROOT/examples/others/kotlin-dsl.yml +++ b/docs/modules/ROOT/examples/others/kotlin-dsl.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.8.0 cqNativeSince: 2.16.0 cqCamelPartName: kotlin-dsl cqCamelPartTitle: Kotlin DSL -cqCamelPartDescription: Camel DSL with Kotlin +cqCamelPartDescription: Camel DSL with Kotlin (Deprecated) cqExtensionPageTitle: Kotlin DSL diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8f2110c5a1..9bd44478d3 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6492,7 +6492,7 @@ com.orbitz.consul consul-client -1.3.2 +1.3.3 com.google.code.findbugs @@ -7075,7 +7075,7 @@ org.kiwiproject consul-client -1.3.2 +1.3.3 com.google.code.findbugs diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 8a00822cc3..14d4e353cf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6994,7 +6994,7 @@ org.kiwiproject consul-client -1.3.2 +1.3.3 com.google.code.findbugs diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index af6519e3a1..aa1c2193cc 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6994,7 +6994,7 @@ org.kiwiproject consul-client -1.3.2 +1.3.3 com.google.code.findbugs
(camel-quarkus) 37/41: Fixed datetime + generated poms
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 commit a55ed3ca315d34a781813ca291ce82ff93c78289 Author: JiriOndrusek AuthorDate: Fri Jun 21 11:51:59 2024 +0200 Fixed datetime + generated poms --- .../quarkus/component/dataformat/it/ICalUtils.java | 38 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 14 .../src/main/generated/flattened-reduced-pom.xml | 12 +++ .../generated/flattened-reduced-verbose-pom.xml| 12 +++ 4 files changed, 37 insertions(+), 39 deletions(-) diff --git a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java index b13ec412f8..30ead3641b 100644 --- a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java +++ b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java @@ -17,18 +17,18 @@ package org.apache.camel.quarkus.component.dataformat.it; import java.net.URI; +import java.time.DateTimeException; +import java.time.Instant; import java.time.ZonedDateTime; import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.model.DateTime; -import net.fortuna.ical4j.model.PropertyList; import net.fortuna.ical4j.model.TimeZoneRegistry; import net.fortuna.ical4j.model.TimeZoneRegistryFactory; import net.fortuna.ical4j.model.component.VEvent; import net.fortuna.ical4j.model.parameter.Cn; import net.fortuna.ical4j.model.parameter.Role; import net.fortuna.ical4j.model.property.Attendee; -import net.fortuna.ical4j.model.property.CalScale; import net.fortuna.ical4j.model.property.DtEnd; import net.fortuna.ical4j.model.property.DtStamp; import net.fortuna.ical4j.model.property.DtStart; @@ -36,7 +36,8 @@ import net.fortuna.ical4j.model.property.ProdId; import net.fortuna.ical4j.model.property.Summary; import net.fortuna.ical4j.model.property.TzId; import net.fortuna.ical4j.model.property.Uid; -import net.fortuna.ical4j.model.property.Version; +import net.fortuna.ical4j.model.property.immutable.ImmutableCalScale; +import net.fortuna.ical4j.model.property.immutable.ImmutableVersion; public class ICalUtils { @@ -46,35 +47,32 @@ public class ICalUtils { String tzId = start.getZone().getId(); // Create the event -PropertyList propertyList = new PropertyList(); -DateTime ts = new DateTime(true); -ts.setTime(0); -propertyList.add(new DtStamp(ts)); -propertyList.add(new DtStart(toDateTime(start, registry))); -propertyList.add(new DtEnd(toDateTime(end, registry))); -propertyList.add(new Summary(summary)); -VEvent meeting = new VEvent(propertyList); +VEvent meeting = new VEvent(); +meeting.replace(new DtStamp(Instant.ofEpochMilli(0))); +meeting.add(new DtStart(toDateTime(start, registry).toInstant())); +meeting.add(new DtEnd(toDateTime(end, registry).toInstant())); +meeting.add(new Summary(summary)); // add timezone info.. -meeting.getProperties().add(new TzId(tzId)); +meeting.add(new TzId(tzId)); // generate unique identifier.. -meeting.getProperties().add(new Uid("")); +meeting.add(new Uid("")); // add attendees.. Attendee dev1 = new Attendee(URI.create("mailto:; + attendee)); -dev1.getParameters().add(Role.REQ_PARTICIPANT); -dev1.getParameters().add(new Cn(attendee)); -meeting.getProperties().add(dev1); +dev1.add(Role.REQ_PARTICIPANT); +dev1.add(new Cn(attendee)); +meeting.add(dev1); // Create a calendar net.fortuna.ical4j.model.Calendar icsCalendar = new net.fortuna.ical4j.model.Calendar(); -icsCalendar.getProperties().add(Version.VERSION_2_0); -icsCalendar.getProperties().add(new ProdId("-//Events Calendar//iCal4j 1.0//EN")); -icsCalendar.getProperties().add(CalScale.GREGORIAN); +icsCalendar.add(ImmutableVersion.VERSION_2_0); +icsCalendar.add(new ProdId("-//Events Calendar//iCal4j 1.0//EN")); +icsCalendar.add(ImmutableCalScale.GREGORIAN); // Add the event and print -icsCalendar.getComponents().add(meeting); +icsCalendar.add(meeting); return icsCalendar; } diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index de4dc9fe01..92bb7596c1 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7135,7 +7135,7 @@ org.springframework
(camel-quarkus) 31/41: Fixed pubNub + generated files
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 commit 5b2bcf4463b632234fbf8823cf8ad9d06e558da5 Author: JiriOndrusek AuthorDate: Fri Jun 14 09:51:05 2024 +0200 Fixed pubNub + generated files --- .../component/pubnub/it/PubnubResource.java| 2 +- pom.xml| 6 +- poms/bom/src/main/generated/flattened-full-pom.xml | 354 ++--- .../src/main/generated/flattened-reduced-pom.xml | 44 +-- .../generated/flattened-reduced-verbose-pom.xml| 100 +++--- 5 files changed, 253 insertions(+), 253 deletions(-) diff --git a/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java b/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java index 0d5a5a6c94..26cba623e0 100644 --- a/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java +++ b/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java @@ -172,6 +172,6 @@ public class PubnubResource { configuration.setReconnectionPolicy(PNReconnectionPolicy.LINEAR); } -return new PubNub(configuration); +return PubNub.create(configuration); } } diff --git a/pom.xml b/pom.xml index 709b894613..c5fe7e8920 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ 1.313 1.23.0 ${google-oauth-client-version} -0.221.0 - 1.129.6 -1.129.6 +0.222.0 + 1.130.0 +1.130.0 23.1.2 jdk21 4.0.21 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 2e4de36549..0e133b537d 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6415,7 +6415,7 @@ com.google.cloud google-cloud-pubsub -1.129.6 +1.130.0 com.google.android @@ -6616,7 +6616,7 @@ io.projectreactor.netty reactor-netty -1.1.19 +1.1.20 io.quarkiverse.freemarker @@ -7135,7 +7135,7 @@ org.springframework spring-aop -6.1.8 +6.1.9 org.springframework @@ -7150,7 +7150,7 @@ org.springframework spring-expression -6.1.8 +6.1.9 org.springframework @@ -7161,7 +7161,7 @@ org.springframework spring-jdbc -6.1.8 +6.1.9 org.springframework @@ -7176,7 +7176,7 @@ org.springframework spring-jms -6.1.8 +6.1.9 org.springframework @@ -7191,7 +7191,7 @@ org.springframework spring-messaging -6.1.8 +6.1.9 org.springframework @@ -7206,7 +7206,7 @@ org.springframework spring-orm -6.1.8 +6.1.9 org.springframework @@ -7221,7 +7221,7 @@ org.springframework spring-tx -6.1.8 +6.1.9 org.springframework @@ -22240,284 +22240,284 @@ 2.2 -org.eclipse.jetty -jetty-alpn-client -12.0.8 +org.eclipse.jetty +jetty-alpn-client +12.0.10 -org.eclipse.jetty -jetty-alpn-conscrypt-client -12.0.8 +org.eclipse.jetty +jetty-alpn-conscrypt-client +12.0.10 -org.eclipse.jetty -jetty-alpn-conscrypt-server -12.0.8 +org.eclipse.jetty +jetty-alpn-conscrypt-server +12.0.10 -org.eclipse.jetty -jetty-alpn-java-client -12.0.8 +org.eclipse.jetty +jetty-alpn-java-client +12.0.10 -org.eclipse.jetty -jetty-alpn-java-server -12.0.8 +org.eclipse.jetty +jetty-alpn-java-server +12.0.10 -org.eclipse.jetty -jetty-alpn-server -12.0.8 +org.eclipse.jetty +jetty-alpn-server +12.0.10 -org.eclipse.jetty -jetty-client -12.0.8 +org.eclipse.jetty +jetty-client +12.0.10 -org.eclipse.jetty -jetty-deploy -12.0.8 +org.eclipse.jetty +jetty-deploy +12.0.10 -org.eclipse.jetty -jetty-http -12.0.8
(camel-quarkus) 04/41: Fixed knative + generated files
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 commit 28a1a21803c57b323e3d072ecbed97a4e00d2ecf Author: JiriOndrusek AuthorDate: Fri May 17 12:08:52 2024 +0200 Fixed knative + generated files --- .../component/knative/consumer/it/KnativeChannelConsumerTest.java | 2 +- .../component/knative/producer/it/KnativeProducerResource.java | 2 +- .../apache/camel/quarkus/component/knative/producer/it/Routes.java | 2 +- pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java b/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java index 7ff3cc8ce0..696db79d9c 100644 --- a/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java +++ b/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; import io.quarkus.test.junit.QuarkusTest; import jakarta.ws.rs.core.MediaType; -import org.apache.camel.component.cloudevents.CloudEvents; +import org.apache.camel.cloudevents.CloudEvents; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java index 4df151ee54..1112cf1c42 100644 --- a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java +++ b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java @@ -33,7 +33,7 @@ import jakarta.ws.rs.core.Response; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; -import org.apache.camel.component.cloudevents.CloudEvents; +import org.apache.camel.cloudevents.CloudEvents; import org.apache.camel.component.knative.KnativeComponent; import org.apache.camel.component.mock.MockEndpoint; diff --git a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java index 529b26f1c0..f9240e3c11 100644 --- a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java +++ b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java @@ -17,7 +17,7 @@ package org.apache.camel.quarkus.component.knative.producer.it; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.cloudevents.CloudEvent; +import org.apache.camel.cloudevents.CloudEvent; public class Routes extends RouteBuilder { diff --git a/pom.xml b/pom.xml index 1e4c469e1d..fbfab2895c 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ 1.313 1.23.0 ${google-oauth-client-version} -0.219.0 - 1.129.1 -1.129.1 +0.220.0 + 1.129.3 +1.129.3 23.1.2 jdk21 4.0.21 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e73ea53c4c..3cb5a666c2 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6410,7 +6410,7 @@ com.google.cloud google-cloud-pubsub -1.129.1 +1.129.3 com.google.android diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 29effd185a..2070b79ff4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6410,7 +6410,7 @@ com.google.cloud google-cloud-pubsub -1.129.1 +1.129.3 com.google.android diff --git a/poms/bom/src/main/generated/flattened
(camel-quarkus) 17/41: TestSupport fixes (CAMEL-20785) and langchain4j version conflict
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 commit c01ffef2e212acc0efb9feccd6cc38bcb2959091 Author: JiriOndrusek AuthorDate: Wed Jun 5 13:49:04 2024 +0200 TestSupport fixes (CAMEL-20785) and langchain4j version conflict --- pom.xml| 10 +- poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml | 405 +++-- .../src/main/generated/flattened-reduced-pom.xml | 49 +-- .../generated/flattened-reduced-verbose-pom.xml| 113 +++--- .../quarkus/test/CamelQuarkusTestSupport.java | 16 +- .../test/ContextNotStoppingManagerFactory.java | 46 +++ .../test/LegacyCamelContextNotStoppingManager.java | 41 +++ .../TransientCamelContextNotStoppingManager.java | 41 +++ .../quarkus/test/common/AbstractCallbacksTest.java | 264 -- .../test/common/CallbacksPerTestFalse01Test.java | 71 .../test/common/CallbacksPerTestFalse02Test.java | 40 -- .../test/common/CallbacksPerTestTrue01Test.java| 71 .../test/common/CallbacksPerTestTrue02Test.java| 40 -- .../test/junit5/patterns/DebugJUnit5Test.java | 18 +- .../patterns/DebugNoLazyTypeConverterTest.java | 18 +- .../quarkus/test/junit5/patterns/DebugTest.java| 19 +- 17 files changed, 484 insertions(+), 783 deletions(-) diff --git a/pom.xml b/pom.xml index fbfab2895c..0fe1cbcb0d 100644 --- a/pom.xml +++ b/pom.xml @@ -78,8 +78,8 @@ 3.26.0 1.11.714 ${azure-sdk-bom-version} -1.48.0 -1.12.0 +1.49.0 +1.12.1 1.0.0-beta.18 3.7.1 1.78.1 @@ -98,9 +98,9 @@ 1.313 1.23.0 ${google-oauth-client-version} -0.220.0 - 1.129.3 -1.129.3 +0.221.0 + 1.129.6 +1.129.6 23.1.2 jdk21 4.0.21 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index ee714262d9..b07e7870cd 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6650,6 +6650,11 @@ commons-lang ${commons-lang.version} + +dev.langchain4j +langchain4j +${langchain4j-version} + io.dropwizard.metrics dropwizard-core diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 6054dbeb82..84f750d16a 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6280,7 +6280,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.2.0 +7.2.1 com.google.code.findbugs @@ -6299,12 +6299,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.2.0 +7.2.1 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.2.0 +7.2.1 junit @@ -6319,22 +6319,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.2.0 +7.2.1 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.2.0 +7.2.1 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.2.0 +7.2.1 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.2.0 +7.2.1 ca.uhn.hapi.fhir @@ -6421,7 +6421,7 @@ com.google.cloud google-cloud-pubsub -1.129.3 +1.129.6 com.google.android @@ -6572,6 +6572,11 @@ commons-lang 2.6 + +dev.langchain4j +langchain4j +0.31.0 + io.dropwizard.metrics dropwizard-core @@ -7242,7 +7247,7 @@ org.springframework.data spring-data-redis -3.2.5 +3.3.0 org.springframework @@ -22526,314 +22531,324 @@ 12.0.8 -com.azure -azure-ai-contentsafety -1.0.2 +com.azure +azure-ai-contentsafety +1.0.3 + + +com.azure +azure-ai-formrecognizer +4.1.8 + + +com.azure +azure-ai-metricsadvisor +1.1.25 -com.azure -azure-ai-formrecognizer -4.1.7 +com.azure +azure-ai-textanalytics +5.4.6 -com.azure -azure-ai-metricsadvisor -1.1.24 +com.azure +azure-ai-translation-text +1.0.0 -com.azure -azure-ai-textanalytics
(camel-quarkus) 26/41: Reverted langchain4j dependency exclusions, as the camel Quarkus has now the same version as Camel
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 commit 9515b83dfc78bf0f0baa055adeedb309de325150 Author: JiriOndrusek AuthorDate: Tue Jun 11 11:33:07 2024 +0200 Reverted langchain4j dependency exclusions, as the camel Quarkus has now the same version as Camel --- poms/bom/pom.xml | 12 poms/bom/src/main/generated/flattened-full-pom.xml | 12 poms/bom/src/main/generated/flattened-reduced-pom.xml| 12 .../bom/src/main/generated/flattened-reduced-verbose-pom.xml | 12 4 files changed, 48 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 2353c50e12..c1ce0f9364 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1781,23 +1781,11 @@ org.apache.camel camel-langchain4j-chat ${camel.version} - - -dev.langchain4j -* - - org.apache.camel camel-langchain4j-core ${camel.version} - - -dev.langchain4j -* - - org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 83c553ff46..2e4de36549 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1718,23 +1718,11 @@ org.apache.camel camel-langchain4j-chat 4.7.0-SNAPSHOT - - -dev.langchain4j -* - - org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT - - -dev.langchain4j -* - - org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 010e9e5e0e..bfc730f3de 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1718,23 +1718,11 @@ org.apache.camel camel-langchain4j-chat 4.7.0-SNAPSHOT - - -dev.langchain4j -* - - org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT - - -dev.langchain4j -* - - org.apache.camel diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 5ca10b95ce..fd08dea8dd 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1718,23 +1718,11 @@ org.apache.camel camel-langchain4j-chat 4.7.0-SNAPSHOT - - -dev.langchain4j -* - - org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT - - -dev.langchain4j -* - - org.apache.camel
(camel-quarkus) 33/41: Fixed pubnub
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 commit 34f4bb8821008af67357d5888ff14093d83fe770 Author: JiriOndrusek AuthorDate: Tue Jun 18 10:51:39 2024 +0200 Fixed pubnub --- .../quarkus/component/pubnub/deployment/PubnubProcessor.java | 11 +-- .../camel/quarkus/component/pubnub/it/PubnubResource.java | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/extensions/pubnub/deployment/src/main/java/org/apache/camel/quarkus/component/pubnub/deployment/PubnubProcessor.java b/extensions/pubnub/deployment/src/main/java/org/apache/camel/quarkus/component/pubnub/deployment/PubnubProcessor.java index 0d553fc155..208263fe70 100644 --- a/extensions/pubnub/deployment/src/main/java/org/apache/camel/quarkus/component/pubnub/deployment/PubnubProcessor.java +++ b/extensions/pubnub/deployment/src/main/java/org/apache/camel/quarkus/component/pubnub/deployment/PubnubProcessor.java @@ -50,7 +50,8 @@ class PubnubProcessor { String[] reflectiveClasses = index.getKnownClasses() .stream() .map(classInfo -> classInfo.name().toString()) -.filter(name -> name.startsWith("com.pubnub.api.models")) +.filter(name -> name.startsWith("com.pubnub.internal.models") +|| name.startsWith("com.pubnub.internal.services")) .toArray(String[]::new); return ReflectiveClassBuildItem.builder(reflectiveClasses).fields().build(); @@ -63,8 +64,14 @@ class PubnubProcessor { index.getKnownClasses() .stream() .map(classInfo -> classInfo.name().toString()) -.filter(name -> name.startsWith("com.pubnub.api.services")) +.filter(name -> name.startsWith("com.pubnub.internal.services")) .map(NativeImageProxyDefinitionBuildItem::new) .forEach(proxyDefinitions::produce); } + +@BuildStep +void addDependencies(BuildProducer indexDependency) { +indexDependency.produce(new IndexDependencyBuildItem("com.pubnub", "pubnub-core-impl")); +} + } diff --git a/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java b/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java index 26cba623e0..0fc78a3b5c 100644 --- a/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java +++ b/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java @@ -124,14 +124,15 @@ public class PubnubResource { public void setState() throws Exception { Map state = new HashMap<>(); state.put("test-state-key", "test-state-value"); - producerTemplate.requestBodyAndHeader("pubnub:test-state?pubNub=#pubNub", state, PubNubConstants.OPERATION, "SETSTATE"); + producerTemplate.requestBodyAndHeader("pubnub:test-state?uuid=myuuid=#pubNub", state, PubNubConstants.OPERATION, +"SETSTATE"); } @Path("/state") @GET @Produces(MediaType.TEXT_PLAIN) public String getState() throws Exception { -PNGetStateResult result = producerTemplate.requestBodyAndHeader("pubnub:test-state?pubNub=#pubNub", null, +PNGetStateResult result = producerTemplate.requestBodyAndHeader("pubnub:test-state?uuid=myuuid=#pubNub", null, PubNubConstants.OPERATION, "GETSTATE", PNGetStateResult.class); return result.getStateByUUID().get("test-state").getAsJsonObject().get("test-state-key").getAsString(); }
(camel-quarkus) 28/41: Fixed junit5-extension-tests
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 commit 0aafb478a5c1cbbaeac0eda89e253fd6956c8806 Author: JiriOndrusek AuthorDate: Wed Jun 12 10:47:40 2024 +0200 Fixed junit5-extension-tests --- .../doubeRouteBuilderPerClass/SecondPerClassET.java | 8 .../camel/quarkus/test/CamelQuarkusTestSupport.java | 15 ++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java index 563ebc565f..5b58726702 100644 --- a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java +++ b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java @@ -33,23 +33,23 @@ public class SecondPerClassET extends CamelQuarkusTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { -from("direct:startTest").to("direct:start").to("mock:result"); +from("direct:startTest2").to("direct:start").to("mock:result"); } }; } @Test -public void someTestA() throws InterruptedException { +public void someTestC() throws InterruptedException { MockEndpoint mockEndpoint = getMockEndpoint("mock:result"); mockEndpoint.expectedBodiesReceived("Some Value"); -template.sendBody("direct:startTest", null); +template.sendBody("direct:startTest2", null); mockEndpoint.assertIsSatisfied(); } @Test -public void someTestB() throws InterruptedException { +public void someTestD() throws InterruptedException { MockEndpoint mockEndpoint = getMockEndpoint("mock:result"); mockEndpoint.expectedBodiesReceived("Some Value"); diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 94cd0f63b2..571113b5f8 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -242,6 +242,16 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport contextManager.createCamelContext(this); context = contextManager.context(); +//log warning in case that at least one RouteBuilder in the registry, it might mean, that unintentionally +// RouteBuilders are shared across or that RouteBuilder is created with @Produces +if (isUseRouteBuilder() && !context.getRegistry().findByType(RouteBuilder.class).isEmpty()) { +LOG.warn( +"Test with `true` in `isUserRouteBuilder' and `RouteBuilder` detected in the context registry. " + +"All tests will share this routeBuilder from the registry. This is usually not intended. " + +"If `@Produces` is used to create such a RouteBuilder, please refactor the code " + +"by overriding the method `createRouteBuilder()` instead."); +} + doPostSetup(); // only start timing after all the setup @@ -317,7 +327,10 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport void internalAfterAll(QuarkusTestContext context, ExtensionContext extensionContext) { try { -if (!testConfiguration().isCreateCamelContextPerClass()) { +if (testConfiguration().isCreateCamelContextPerClass()) { +//call all clear and release methods, stop is not called as it is disabled on the camelContextManagers +contextManager.stop(); +} else { doPostTearDown(); } cleanupResources();
(camel-quarkus) 18/41: Proper fix of longchain4j version conflict
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 commit 5afe67f5e47c7e5484462f1c239ff3441c7e3d44 Author: JiriOndrusek AuthorDate: Wed Jun 5 14:50:42 2024 +0200 Proper fix of longchain4j version conflict --- poms/bom/pom.xml| 11 ++- poms/bom/src/main/generated/flattened-full-pom.xml | 11 ++- .../src/main/generated/flattened-reduced-pom.xml| 21 ++--- .../generated/flattened-reduced-verbose-pom.xml | 21 ++--- 4 files changed, 24 insertions(+), 40 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index b07e7870cd..2353c50e12 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1781,6 +1781,12 @@ org.apache.camel camel-langchain4j-chat ${camel.version} + + +dev.langchain4j +* + + org.apache.camel @@ -6650,11 +6656,6 @@ commons-lang ${commons-lang.version} - -dev.langchain4j -langchain4j -${langchain4j-version} - io.dropwizard.metrics dropwizard-core diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 84f750d16a..8cc7fc 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1718,6 +1718,12 @@ org.apache.camel camel-langchain4j-chat 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6572,11 +6578,6 @@ commons-lang 2.6 - -dev.langchain4j -langchain4j -0.31.0 - io.dropwizard.metrics dropwizard-core diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 9261117acb..53ab707188 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1718,6 +1718,12 @@ org.apache.camel camel-langchain4j-chat 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6552,11 +6558,6 @@ commons-cli 1.4 - -dev.langchain4j -langchain4j -0.31.0 - io.minio minio @@ -7725,16 +7726,6 @@ groovy 4.0.21 - -org.apache.groovy -groovy-json -4.0.21 - - -org.apache.groovy -groovy-xml -4.0.21 - software.amazon.awssdk annotations diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 373577e3ab..946dff4d48 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1718,6 +1718,12 @@ org.apache.camel camel-langchain4j-chat 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6552,11 +6558,6 @@ commons-cli 1.4 - -dev.langchain4j -langchain4j -0.31.0 - io.minio minio @@ -7725,16 +7726,6 @@ groovy 4.0.21 - -org.apache.groovy -groovy-json -4.0.21 - - -org.apache.groovy -groovy-xml -4.0.21 - software.amazon.awssdk annotations
(camel-quarkus) 19/41: Fixed style
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 commit c18675e9fd78ca88cd02a832d1dbe6206078374c Author: JiriOndrusek AuthorDate: Fri Jun 7 09:24:53 2024 +0200 Fixed style --- .../camel/quarkus/test/ContextNotStoppingManagerFactory.java | 11 ++- .../quarkus/test/LegacyCamelContextNotStoppingManager.java| 3 ++- .../quarkus/test/TransientCamelContextNotStoppingManager.java | 3 ++- .../camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java | 1 + .../apache/camel/quarkus/test/junit5/patterns/DebugTest.java | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java index 60700ae250..0ea21dd066 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/ContextNotStoppingManagerFactory.java @@ -35,12 +35,13 @@ public class ContextNotStoppingManagerFactory extends ContextManagerFactory { } @Override -public CamelContextManager createContextManager(ContextManagerFactory.Type type, TestExecutionConfiguration testConfiguration, CamelContextConfiguration contextConfiguration) { +public CamelContextManager createContextManager(ContextManagerFactory.Type type, +TestExecutionConfiguration testConfiguration, CamelContextConfiguration contextConfiguration) { return switch (type) { -case BEFORE_ALL: -yield new LegacyCamelContextNotStoppingManager(testConfiguration, contextConfiguration); -case BEFORE_EACH: -yield new TransientCamelContextNotStoppingManager(testConfiguration, contextConfiguration); +case BEFORE_ALL: +yield new LegacyCamelContextNotStoppingManager(testConfiguration, contextConfiguration); +case BEFORE_EACH: +yield new TransientCamelContextNotStoppingManager(testConfiguration, contextConfiguration); }; } } diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java index 2ca589e6b3..7a831415bf 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/LegacyCamelContextNotStoppingManager.java @@ -30,7 +30,8 @@ import org.apache.camel.test.junit5.TestExecutionConfiguration; */ public class LegacyCamelContextNotStoppingManager extends LegacyCamelContextManager { -public LegacyCamelContextNotStoppingManager(TestExecutionConfiguration testConfigurationBuilder, CamelContextConfiguration camelContextConfiguration) { +public LegacyCamelContextNotStoppingManager(TestExecutionConfiguration testConfigurationBuilder, +CamelContextConfiguration camelContextConfiguration) { super(testConfigurationBuilder, camelContextConfiguration); } diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java index 8d9fa69e8d..89219b9842 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/TransientCamelContextNotStoppingManager.java @@ -25,7 +25,8 @@ import org.apache.camel.test.junit5.TransientCamelContextManager; public class TransientCamelContextNotStoppingManager extends TransientCamelContextManager { -public TransientCamelContextNotStoppingManager(TestExecutionConfiguration testConfigurationBuilder, CamelContextConfiguration camelContextConfiguration) { +public TransientCamelContextNotStoppingManager(TestExecutionConfiguration testConfigurationBuilder, + CamelContextConfiguration camelContextConfiguration) { super(testConfigurationBuilder, camelContextConfiguration); } diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java index fe85af6424..19797864c5 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/junit5/patterns/DebugJUnit5Test.java
(camel-quarkus) 07/41: Handle DebuggerJmxConnectorService being present in the camel core
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 commit 0b95f0e910b99f4fb1d37fa85942efede3feb2c1 Author: James Netherton AuthorDate: Tue May 21 14:45:47 2024 +0100 Handle DebuggerJmxConnectorService being present in the camel core --- .../core/deployment/CamelDebugProcessor.java | 46 +++ .../DebuggerJmxConnectorServiceSubstitutions.java | 67 ++ .../camel/quarkus/main/CoreMainResource.java | 31 ++ .../main/src/main/resources/application.properties | 2 + .../apache/camel/quarkus/main/CoreMainTest.java| 18 ++ .../quarkus/component/management/it/Routes.java| 2 + .../src/main/resources/application.properties | 3 + .../component/management/it/ManagementTest.java| 14 + 8 files changed, 183 insertions(+) diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java new file mode 100644 index 00..5ee593c439 --- /dev/null +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.core.deployment; + +import java.util.function.BooleanSupplier; +import java.util.stream.StreamSupport; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.BuildSteps; +import io.quarkus.deployment.builditem.AllowJNDIBuildItem; +import org.eclipse.microprofile.config.ConfigProvider; + +/** + * Build steps relating to camel debugging support. This is primarily required due to camel-main + * having the capability to enable debugging features that live in the Camel core such as the + * DebuggerJmxConnectorService + */ +@BuildSteps(onlyIf = CamelDebugProcessor.CamelDebugConfigurationPresent.class) +public class CamelDebugProcessor { +@BuildStep +AllowJNDIBuildItem allowJNDI() { +return new AllowJNDIBuildItem(); +} + +static final class CamelDebugConfigurationPresent implements BooleanSupplier { +@Override +public boolean getAsBoolean() { +return StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false) +.anyMatch(key -> key.startsWith("camel.debug")); +} +} +} diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java new file mode 100644 index 00..866bcb7f89 --- /dev/null +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.core.graal; + +import java.io.IOException; +import java.util.function.BooleanSupplier; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.RecomputeFieldValue; +import com.oracl
(camel-quarkus) 16/41: Conflict + generated POMs
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 commit e38a1b25ae9cfa6b857111a0febe5c11cc099302 Author: JiriOndrusek AuthorDate: Mon Jun 3 09:23:12 2024 +0200 Conflict + generated POMs --- poms/bom/src/main/generated/flattened-full-pom.xml | 16 poms/bom/src/main/generated/flattened-reduced-pom.xml| 16 .../src/main/generated/flattened-reduced-verbose-pom.xml | 16 3 files changed, 48 insertions(+) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 26f37fe019..6054dbeb82 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1723,6 +1723,12 @@ org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6673,6 +6679,16 @@ quarkus-jsch-deployment 3.0.8 + +io.quarkiverse.langchain4j +quarkus-langchain4j-core +0.14.2 + + +io.quarkiverse.langchain4j +quarkus-langchain4j-core-deployment +0.14.2 + io.quarkiverse.messaginghub quarkus-pooled-jms diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 194967448a..dc12420f6f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1723,6 +1723,12 @@ org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6643,6 +6649,16 @@ quarkus-jsch-deployment 3.0.8 + +io.quarkiverse.langchain4j +quarkus-langchain4j-core +0.14.2 + + +io.quarkiverse.langchain4j +quarkus-langchain4j-core-deployment +0.14.2 + io.quarkiverse.messaginghub quarkus-pooled-jms diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 8904414670..f1678848a3 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1723,6 +1723,12 @@ org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6643,6 +6649,16 @@ quarkus-jsch-deployment 3.0.8 + +io.quarkiverse.langchain4j +quarkus-langchain4j-core +0.14.2 + + +io.quarkiverse.langchain4j +quarkus-langchain4j-core-deployment +0.14.2 + io.quarkiverse.messaginghub quarkus-pooled-jms
(camel-quarkus) 08/41: Generated files
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 commit 43ab9208dcdc9bd13c403877c21effe82490873b Author: JiriOndrusek AuthorDate: Thu May 23 08:54:34 2024 +0200 Generated files --- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1d1040593c..d3498b0eb9 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7090,7 +7090,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7273,7 +7273,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index ceb6c97395..bd500087bb 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7009,7 +7009,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7177,7 +7177,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 75a26dfb52..62641d6041 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7009,7 +7009,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7177,7 +7177,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk
(camel-quarkus) 09/41: Generated poms
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 commit 64674584ee7fb2fabc4794f7dd307000db6b8ca9 Author: JiriOndrusek AuthorDate: Mon May 27 08:40:08 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 14 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 ++-- .../src/main/generated/flattened-reduced-verbose-pom.xml | 12 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index d3498b0eb9..d86c08ae49 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7120,7 +7120,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7135,7 +7135,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7146,7 +7146,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7161,7 +7161,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7176,7 +7176,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7191,7 +7191,7 @@ org.springframework spring-orm -6.1.7 +6.1.8 org.springframework @@ -7206,7 +7206,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index bd500087bb..e6578fc7a7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7039,7 +7039,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7054,7 +7054,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7065,7 +7065,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7080,7 +7080,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7095,7 +7095,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7110,7 +7110,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 62641d6041..2cea333a33 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7039,7 +7039,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7054,7 +7054,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7065,7 +7065,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7080,7 +7080,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7095,7 +7095,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7110,7 +7110,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 org.springframework
(camel-quarkus) 03/41: generated poms
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 commit 4a6f84eee5862e240892e7d34e622a8aa2941b92 Author: JiriOndrusek AuthorDate: Wed May 15 13:09:41 2024 +0200 generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8c53f2ed2d..e73ea53c4c 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6611,7 +6611,7 @@ io.projectreactor.netty reactor-netty -1.1.18 +1.1.19 io.quarkiverse.freemarker diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index c417eeedc8..29effd185a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6581,7 +6581,7 @@ io.projectreactor.netty reactor-netty -1.1.18 +1.1.19 io.quarkiverse.freemarker diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index e94e7d668b..0ef8798368 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6581,7 +6581,7 @@ io.projectreactor.netty reactor-netty -1.1.18 +1.1.19 io.quarkiverse.freemarker
(camel-quarkus) branch camel-main updated (a75ee9656a -> 3452843acb)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard a75ee9656a Disabled native dataformat test discard ccdb6b6954 fix of dataformat for Etc/UTC discard 2432393552 Better fix of dataformat discard 263315191b Fixed datetime + generated poms discard 549743e772 Generated poms discard e856005d4b Generated files discard 4e8878ba77 Fixed servlet discard c73cd5a9f8 Fixed pubnub discard 8820ce73b8 Fixed couchdb issue + generated files discard 754750ff19 Fixed pubNub + generated files discard f15a032ec3 Fixed azure-queue discard 0ea8e9d0b3 Added coap doc change discard eb1bcc4201 Fixed junit5-extension-tests discard 9b0ed50311 Fixed langchain4j (requires CAMEL-20863) discard 5e19911180 Reverted langchain4j dependency exclusions, as the camel Quarkus has now the same version as Camel discard 639c61efd8 Fixed smb discard 66261d72cb Solved conflict + rebased discard 5be0cc26ab Removed unnecessary change made for xchange discard 51991b40f4 fixed azure and xchange discard d6b4ff4917 Rebased + format fix discard 820fba79c6 Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport discard fecc99b4cc Fixed style discard 364248cc94 Proper fix of longchain4j version conflict discard d0fa3fa374 TestSupport fixes (CAMEL-20785) and langchain4j version conflict discard 0f32fc159c Conflict + generated POMs discard 4b54cba53e Generated poms discard ca584804be Fixed alphjabetical order of bom dependencies (langchain4j) discard 4478cd28fb Added camel-langchain4j-core to pom discard 23a3c7cb0d Fixed forrmatting discard 5ca1655908 fixed test-framework/junit5 + generated changes discard 780f7b07a1 Fix of compilation error in test-framework discard 3bae5cea11 Generated poms discard efe6e5d1e3 Generated files discard bb23e8758a Handle DebuggerJmxConnectorService being present in the camel core discard 39cf0f1d0a Generated poms discard 33533f3bbc Generated files discard 7204a4d7d4 Fixed knative + generated files discard 6d95aa4966 generated poms discard b8aa227537 Fixed debug + generated poms discard 19ffe20497 Upgrade Camel to 4.7.0 add ebb852f71b Using WireMock in weather extension integration tests #6047 add 47d4bc24bd Upgrade Quarkus Jgit version to 3.1.2 add 14bc3bec04 Bump com.unboundid:unboundid-ldapsdk from 7.0.0 to 7.0.1 (#6205) add f76231067f Add Pinecone extension add 395320bbc7 Update Maven wrapper distribution URL to Maven 3.9.8 add 9e223f242b Auto label issues relating to flaky tests add 14dcb31271 Upgrade Quarkus to 3.12.0 add 83ed3aa0e5 Upgrade to Quarkus CxF 3.12.0 add 44b5f7adbe Next is 3.13.0-SNAPSHOT add a3338cf3a6 Add default value of modePackage in camel-quarkus-rest-openapi add a6d3198fa9 Regen SBOM from commit a3338cf3a6c17849c980c1ebbc23dba506d25e83 (#6219) new ad577d0159 Upgrade Camel to 4.7.0 new ec0b9e6957 Fixed debug + generated poms new 4a6f84eee5 generated poms new 28a1a21803 Fixed knative + generated files new 6cd39baf09 Generated files new a90eea51be Generated poms new 0b95f0e910 Handle DebuggerJmxConnectorService being present in the camel core new 43ab9208dc Generated files new 64674584ee Generated poms new 1207ebb940 Fix of compilation error in test-framework new ddf0dc24fd fixed test-framework/junit5 + generated changes new cb365e4f9a Fixed forrmatting new 1aaf971889 Added camel-langchain4j-core to pom new 9a6ce42c09 Fixed alphjabetical order of bom dependencies (langchain4j) new 0e65c81a0f Generated poms new e38a1b25ae Conflict + generated POMs new c01ffef2e2 TestSupport fixes (CAMEL-20785) and langchain4j version conflict new 5afe67f5e4 Proper fix of longchain4j version conflict new c18675e9fd Fixed style new 00be55a027 Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport new 99b4487454 Rebased + format fix new ecd7e9ed34 fixed azure and xchange new 3a59f3492c Removed unnecessary change made for xchange new b8e6a87953 Solved conflict + rebased new bed6ab1972 Fixed smb new 9515b83dfc Reverted langchain4j dependency exclusions, as the camel Quarkus has now the same version as Camel new 587ae2529f Fixed langchain4j (requires CAMEL-20863) new 0aafb478a5 Fixed junit5-extension-tests new 832832271f Added coap doc change new 39fa39c330 Fixed azure-queue new 5b2bcf4463 Fixed pubNub + generated files new 098d9d8fa4 Fixed couchdb issue + generated files new 34f4bb8821 Fixed pubnub new 0f2b8b7b3b Fixed servlet new f20bafb897 Generated files new a089879d2a Generated poms new a55ed3ca31 Fixed datetime + generated poms new f2136205ab Better fix of dataformat new 871fc703d1 fix of dataformat for Etc/UTC new a2668e885c Disabled native dataformat test
(camel-quarkus) 02/41: Fixed debug + generated poms
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 commit ec0b9e6957ea79dd10d665e3a12bf7c9339650ea Author: JiriOndrusek AuthorDate: Wed May 15 09:25:44 2024 +0200 Fixed debug + generated poms --- .../java/org/apache/camel/quarkus/component/debug/it/DebugTest.java | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java b/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java index b2f5a41742..2098c7b436 100644 --- a/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java +++ b/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java @@ -34,9 +34,9 @@ import org.apache.camel.ServiceStatus; import org.apache.camel.api.management.mbean.ManagedBacklogDebuggerMBean; import org.junit.jupiter.api.Test; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_HOST; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_REGISTRY_PORT; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_SERVICE_URL_PATH; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_HOST; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_REGISTRY_PORT; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_SERVICE_URL_PATH; import static org.awaitility.Awaitility.await; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 6a6a84fdc1..8c53f2ed2d 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6441,7 +6441,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index c81b86ab43..c417eeedc8 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6441,7 +6441,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 2e37c0214f..e94e7d668b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6441,7 +6441,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging
(camel-quarkus) branch camel-main updated: Disabled native dataformat test
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 a75ee9656a Disabled native dataformat test a75ee9656a is described below commit a75ee9656a421abd64fde30d26dc97be7a402e1a Author: JiriOndrusek AuthorDate: Fri Jun 21 16:43:48 2024 +0200 Disabled native dataformat test --- integration-tests/dataformat/pom.xml | 5 +++-- .../apache/camel/quarkus/component/dataformat/it/DataformatIT.java | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/integration-tests/dataformat/pom.xml b/integration-tests/dataformat/pom.xml index 7180e285de..eb2f37ce81 100644 --- a/integration-tests/dataformat/pom.xml +++ b/integration-tests/dataformat/pom.xml @@ -67,7 +67,8 @@ - + virtualDependencies diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java index 8676954dce..441d53bb66 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatIT.java @@ -17,7 +17,9 @@ package org.apache.camel.quarkus.component.dataformat.it; import io.quarkus.test.junit.QuarkusIntegrationTest; +import org.junit.jupiter.api.Disabled; +@Disabled //https://github.com/apache/camel-quarkus/issues/6218 @QuarkusIntegrationTest class DataformatIT extends DataformatTest {
(camel-quarkus) branch camel-main updated: fix of dataformat for Etc/UTC
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 ccdb6b6954 fix of dataformat for Etc/UTC ccdb6b6954 is described below commit ccdb6b69541278e8c0d82ee1efbc8f168cb71f0a Author: JiriOndrusek AuthorDate: Fri Jun 21 13:50:54 2024 +0200 fix of dataformat for Etc/UTC --- .../apache/camel/quarkus/component/dataformat/it/DataformatTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java index f2cf856cba..c249c5fb9b 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java @@ -99,9 +99,6 @@ class DataformatTest { static String toFormatedLocalDateTime(ZonedDateTime zonedDateTime) { String result = zonedDateTime.format(DateTimeFormatter.ofPattern("MMdd'T'hhmmss")); -if (zonedDateTime.getZone().getId().equals("Etc/UTC")) { -result += "Z"; -} return result; }
(camel-quarkus) branch camel-main updated: Better fix of dataformat
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 2432393552 Better fix of dataformat 2432393552 is described below commit 2432393552e4ac37de7506aac1b05e076beb113f Author: JiriOndrusek AuthorDate: Fri Jun 21 12:02:55 2024 +0200 Better fix of dataformat --- .../camel/quarkus/component/dataformat/it/ICalUtils.java | 10 ++ .../camel/quarkus/component/dataformat/it/DataformatTest.java | 2 ++ integration-tests/dataformat/src/test/resources/test.ics | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java index 30ead3641b..b5d04fd036 100644 --- a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java +++ b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java @@ -17,12 +17,10 @@ package org.apache.camel.quarkus.component.dataformat.it; import java.net.URI; -import java.time.DateTimeException; import java.time.Instant; import java.time.ZonedDateTime; import net.fortuna.ical4j.model.Calendar; -import net.fortuna.ical4j.model.DateTime; import net.fortuna.ical4j.model.TimeZoneRegistry; import net.fortuna.ical4j.model.TimeZoneRegistryFactory; import net.fortuna.ical4j.model.component.VEvent; @@ -49,8 +47,8 @@ public class ICalUtils { // Create the event VEvent meeting = new VEvent(); meeting.replace(new DtStamp(Instant.ofEpochMilli(0))); -meeting.add(new DtStart(toDateTime(start, registry).toInstant())); -meeting.add(new DtEnd(toDateTime(end, registry).toInstant())); +meeting.add(new DtStart(start)); +meeting.add(new DtEnd(end)); meeting.add(new Summary(summary)); // add timezone info.. @@ -76,8 +74,4 @@ public class ICalUtils { return icsCalendar; } -static DateTime toDateTime(ZonedDateTime zonedDateTime, TimeZoneRegistry registry) { -return new DateTime(zonedDateTime.toInstant().toEpochMilli()); -} - } diff --git a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java index 5556571bfa..f2cf856cba 100644 --- a/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java +++ b/integration-tests/dataformat/src/test/java/org/apache/camel/quarkus/component/dataformat/it/DataformatTest.java @@ -68,7 +68,9 @@ class DataformatTest { final String icsTemplate = IOUtils.toString(getClass().getResourceAsStream("/test.ics"), StandardCharsets.UTF_8); final String icalString = String.format( icsTemplate, +ZoneId.systemDefault().getId(), toFormatedLocalDateTime(START), +ZoneId.systemDefault().getId(), toFormatedLocalDateTime(END), START.getZone().getId()); diff --git a/integration-tests/dataformat/src/test/resources/test.ics b/integration-tests/dataformat/src/test/resources/test.ics index c730b9af11..8da810106e 100644 --- a/integration-tests/dataformat/src/test/resources/test.ics +++ b/integration-tests/dataformat/src/test/resources/test.ics @@ -4,8 +4,8 @@ PRODID:-//Events Calendar//iCal4j 1.0//EN CALSCALE:GREGORIAN BEGIN:VEVENT DTSTAMP:19700101T00Z -DTSTART:%s -DTEND:%s +DTSTART;TZID=%s:%s +DTEND;TZID=%s:%s SUMMARY:Progress Meeting TZID:%s UID:
(camel-quarkus) branch camel-main updated: Fixed datetime + generated poms
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 263315191b Fixed datetime + generated poms 263315191b is described below commit 263315191bcef8769c96f1c9a4894bd67941554d Author: JiriOndrusek AuthorDate: Fri Jun 21 11:51:59 2024 +0200 Fixed datetime + generated poms --- .../quarkus/component/dataformat/it/ICalUtils.java | 38 ++ poms/bom/src/main/generated/flattened-full-pom.xml | 14 .../src/main/generated/flattened-reduced-pom.xml | 12 +++ .../generated/flattened-reduced-verbose-pom.xml| 12 +++ 4 files changed, 37 insertions(+), 39 deletions(-) diff --git a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java index b13ec412f8..30ead3641b 100644 --- a/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java +++ b/integration-tests/dataformat/src/main/java/org/apache/camel/quarkus/component/dataformat/it/ICalUtils.java @@ -17,18 +17,18 @@ package org.apache.camel.quarkus.component.dataformat.it; import java.net.URI; +import java.time.DateTimeException; +import java.time.Instant; import java.time.ZonedDateTime; import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.model.DateTime; -import net.fortuna.ical4j.model.PropertyList; import net.fortuna.ical4j.model.TimeZoneRegistry; import net.fortuna.ical4j.model.TimeZoneRegistryFactory; import net.fortuna.ical4j.model.component.VEvent; import net.fortuna.ical4j.model.parameter.Cn; import net.fortuna.ical4j.model.parameter.Role; import net.fortuna.ical4j.model.property.Attendee; -import net.fortuna.ical4j.model.property.CalScale; import net.fortuna.ical4j.model.property.DtEnd; import net.fortuna.ical4j.model.property.DtStamp; import net.fortuna.ical4j.model.property.DtStart; @@ -36,7 +36,8 @@ import net.fortuna.ical4j.model.property.ProdId; import net.fortuna.ical4j.model.property.Summary; import net.fortuna.ical4j.model.property.TzId; import net.fortuna.ical4j.model.property.Uid; -import net.fortuna.ical4j.model.property.Version; +import net.fortuna.ical4j.model.property.immutable.ImmutableCalScale; +import net.fortuna.ical4j.model.property.immutable.ImmutableVersion; public class ICalUtils { @@ -46,35 +47,32 @@ public class ICalUtils { String tzId = start.getZone().getId(); // Create the event -PropertyList propertyList = new PropertyList(); -DateTime ts = new DateTime(true); -ts.setTime(0); -propertyList.add(new DtStamp(ts)); -propertyList.add(new DtStart(toDateTime(start, registry))); -propertyList.add(new DtEnd(toDateTime(end, registry))); -propertyList.add(new Summary(summary)); -VEvent meeting = new VEvent(propertyList); +VEvent meeting = new VEvent(); +meeting.replace(new DtStamp(Instant.ofEpochMilli(0))); +meeting.add(new DtStart(toDateTime(start, registry).toInstant())); +meeting.add(new DtEnd(toDateTime(end, registry).toInstant())); +meeting.add(new Summary(summary)); // add timezone info.. -meeting.getProperties().add(new TzId(tzId)); +meeting.add(new TzId(tzId)); // generate unique identifier.. -meeting.getProperties().add(new Uid("")); +meeting.add(new Uid("")); // add attendees.. Attendee dev1 = new Attendee(URI.create("mailto:; + attendee)); -dev1.getParameters().add(Role.REQ_PARTICIPANT); -dev1.getParameters().add(new Cn(attendee)); -meeting.getProperties().add(dev1); +dev1.add(Role.REQ_PARTICIPANT); +dev1.add(new Cn(attendee)); +meeting.add(dev1); // Create a calendar net.fortuna.ical4j.model.Calendar icsCalendar = new net.fortuna.ical4j.model.Calendar(); -icsCalendar.getProperties().add(Version.VERSION_2_0); -icsCalendar.getProperties().add(new ProdId("-//Events Calendar//iCal4j 1.0//EN")); -icsCalendar.getProperties().add(CalScale.GREGORIAN); +icsCalendar.add(ImmutableVersion.VERSION_2_0); +icsCalendar.add(new ProdId("-//Events Calendar//iCal4j 1.0//EN")); +icsCalendar.add(ImmutableCalScale.GREGORIAN); // Add the event and print -icsCalendar.getComponents().add(meeting); +icsCalendar.add(meeting); return icsCalendar; } diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a8d8950b86..85ef1ccad9 100644 --- a/poms/bom/src/main/generated/f
(camel-quarkus) branch camel-main updated: Generated poms
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 549743e772 Generated poms 549743e772 is described below commit 549743e7723536377af2cad9faaac212fd7c3ab1 Author: JiriOndrusek AuthorDate: Thu Jun 20 09:22:06 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a1cd71d6e5..a8d8950b86 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7203,7 +7203,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 260d03ecd4..a45f39724b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7107,7 +7107,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 8c1e789cea..728937a290 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7107,7 +7107,7 @@ org.springframework.data spring-data-redis -3.3.0 +3.3.1 org.springframework
(camel-quarkus) branch camel-main updated: Generated files
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 e856005d4b Generated files e856005d4b is described below commit e856005d4b740004fb7aea790987ee9958b1551d Author: JiriOndrusek AuthorDate: Wed Jun 19 09:32:22 2024 +0200 Generated files --- docs/modules/ROOT/examples/others/kotlin-dsl.yml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/modules/ROOT/examples/others/kotlin-dsl.yml b/docs/modules/ROOT/examples/others/kotlin-dsl.yml index 032388d0ab..66f23c3ded 100644 --- a/docs/modules/ROOT/examples/others/kotlin-dsl.yml +++ b/docs/modules/ROOT/examples/others/kotlin-dsl.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.8.0 cqNativeSince: 2.16.0 cqCamelPartName: kotlin-dsl cqCamelPartTitle: Kotlin DSL -cqCamelPartDescription: Camel DSL with Kotlin +cqCamelPartDescription: Camel DSL with Kotlin (Deprecated) cqExtensionPageTitle: Kotlin DSL diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 0ac9e605f8..a1cd71d6e5 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6459,7 +6459,7 @@ com.orbitz.consul consul-client -1.3.2 +1.3.3 com.google.code.findbugs @@ -7042,7 +7042,7 @@ org.kiwiproject consul-client -1.3.2 +1.3.3 com.google.code.findbugs diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index f144a10af4..260d03ecd4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6961,7 +6961,7 @@ org.kiwiproject consul-client -1.3.2 +1.3.3 com.google.code.findbugs diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 6281a51c8d..8c1e789cea 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6961,7 +6961,7 @@ org.kiwiproject consul-client -1.3.2 +1.3.3 com.google.code.findbugs
(camel-quarkus) branch camel-main updated: Fixed servlet
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 4e8878ba77 Fixed servlet 4e8878ba77 is described below commit 4e8878ba77812c9caf0ee13fe0e3845ea4fe3cce Author: JiriOndrusek AuthorDate: Tue Jun 18 11:33:30 2024 +0200 Fixed servlet --- .../org/apache/camel/quarkus/component/servlet/ServletProducers.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java index 292be43a1e..c0172831a1 100644 --- a/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java +++ b/integration-tests/servlet/src/main/java/org/apache/camel/quarkus/component/servlet/ServletProducers.java @@ -33,6 +33,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.apache.camel.Exchange; import org.apache.camel.Message; import org.apache.camel.Processor; +import org.apache.camel.http.common.HttpMessage; import org.apache.camel.spi.MimeType; import static org.apache.camel.quarkus.servlet.runtime.CamelServletConfig.ServletConfig.DEFAULT_SERVLET_NAME; @@ -51,7 +52,8 @@ public class ServletProducers { return exchange -> { JsonObject json = new JsonObject(); Message message = exchange.getMessage(); -HttpServletRequest request = message.getHeader(Exchange.HTTP_SERVLET_REQUEST, HttpServletRequest.class); +HttpMessage httpMessage = exchange.getIn(HttpMessage.class); +HttpServletRequest request = httpMessage.getRequest(); String servletName = message.getHeader("servletName", DEFAULT_SERVLET_NAME, String.class); ServletContext servletContext = request.getServletContext(); Deployment deployment = ((ServletContextImpl) servletContext).getDeployment();
(camel-quarkus) 08/33: Generated files
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 commit efe6e5d1e3ed6212e70e9a67f2f08b20bbf3 Author: JiriOndrusek AuthorDate: Thu May 23 08:54:34 2024 +0200 Generated files --- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index ee21571c82..beda07e394 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7057,7 +7057,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7240,7 +7240,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7aaf6da0d3..850c04c96e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6976,7 +6976,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7144,7 +7144,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 06e95261a5..2cae69726b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6976,7 +6976,7 @@ org.opensearch.client opensearch-rest-client -2.13.0 +2.14.0 org.optaplanner @@ -7144,7 +7144,7 @@ redis.clients jedis -5.1.2 +5.1.3 software.amazon.awssdk
(camel-quarkus) 30/33: Fixed azure-queue
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 commit f15a032ec36dfb3ee718765d1ec4d39b2f203ec7 Author: JiriOndrusek AuthorDate: Wed Jun 12 13:44:35 2024 +0200 Fixed azure-queue --- .../storage/queue/deployment/AzureStorageQueueProcessor.java | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java index 8d0df10777..9f73e984fa 100644 --- a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java +++ b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java @@ -16,6 +16,7 @@ */ package org.apache.camel.quarkus.component.azure.storage.queue.deployment; +import com.azure.xml.XmlSerializable; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; @@ -31,6 +32,7 @@ class AzureStorageQueueProcessor { private static final Logger LOG = Logger.getLogger(AzureStorageQueueProcessor.class); private static final String FEATURE = "camel-azure-storage-queue"; +private static final DotName XML_SERIALIZABLE_NAME = DotName.createSimple(XmlSerializable.class.getName()); @BuildStep FeatureBuildItem feature() { @@ -55,8 +57,16 @@ class AzureStorageQueueProcessor { || n.startsWith("com.azure.storage.queue.models.")) .sorted() .toArray(String[]::new); - reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().build()); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().serialization().build()); +final String[] knownSerializableImpls = combinedIndex.getIndex() +.getAllKnownImplementors(XML_SERIALIZABLE_NAME) +.stream() +.map(ClassInfo::name) +.map(DotName::toString) +.sorted() +.toArray(String[]::new); + reflectiveClasses.produce(ReflectiveClassBuildItem.builder(knownSerializableImpls).methods().build()); } @BuildStep
(camel-quarkus) 10/33: Fix of compilation error in test-framework
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 commit 780f7b07a1466242b8df2ac65da083890e4ad143 Author: JiriOndrusek AuthorDate: Mon May 27 16:05:44 2024 +0200 Fix of compilation error in test-framework --- .../camel/quarkus/test/CamelQuarkusTestSupport.java | 2 +- .../quarkus/test/common/AbstractCallbacksTest.java | 17 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 70910d51d8..62c1a21af7 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -267,7 +267,7 @@ public class CamelQuarkusTestSupport extends CamelTestSupport * Method is not intended to be overridden. */ @Override -protected final void doQuarkusCheck() { +protected final void unsupportedCheck() { //can run on Quarkus //log warning in case that at least one RouteBuilder in the registry, it might mean, that unintentionally diff --git a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java index 4d9d7b5501..77c6b64c7f 100644 --- a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java +++ b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/common/AbstractCallbacksTest.java @@ -36,15 +36,15 @@ import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.quarkus.test.CamelQuarkusTestSupport; -import org.apache.camel.quarkus.test.junit5.patterns.DebugJUnit5Test; import org.apache.camel.util.StopWatch; import org.jboss.logging.Logger; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { -private static final Logger LOG = Logger.getLogger(DebugJUnit5Test.class); +private static final Logger LOG = Logger.getLogger(AbstractCallbacksTest.class); public enum Callback { postTearDown, @@ -69,6 +69,12 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { this.afterClassTestName = afterClassTestName; } +@BeforeEach +protected void createTmpFiles() throws Exception { +createTmpFile(testName, Callback.doSetup); +createTmpFile(afterClassTestName, Callback.doSetup); +} + @Override protected CamelContext createCamelContext() throws Exception { createTmpFile(testName, Callback.contextCreation); @@ -83,13 +89,6 @@ public abstract class AbstractCallbacksTest extends CamelQuarkusTestSupport { super.doPostSetup(); } -@Override -protected void doSetUp() throws Exception { -createTmpFile(testName, Callback.doSetup); -createTmpFile(afterClassTestName, Callback.doSetup); -super.doSetUp(); -} - @Override protected void doPostSetup() throws Exception { createTmpFile(testName, Callback.postSetup);
(camel-quarkus) 24/33: Solved conflict + rebased
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 commit 66261d72cb642bb28d86ab747b8adfecef725837 Author: JiriOndrusek AuthorDate: Tue Jun 11 08:54:50 2024 +0200 Solved conflict + rebased --- poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8084ab23cc..18c35adebf 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6548,12 +6548,12 @@ io.dropwizard.metrics dropwizard-core -4.2.25 +4.2.26 io.dropwizard.metrics metrics-jmx -4.2.25 +4.2.26 io.minio @@ -6655,12 +6655,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 6a9d1dc774..4c42bfc17f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6625,12 +6625,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index b0518255c4..d9be41f34f 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6625,12 +6625,12 @@ io.quarkiverse.langchain4j quarkus-langchain4j-core -0.14.2 +0.15.1 io.quarkiverse.langchain4j quarkus-langchain4j-core-deployment -0.14.2 +0.15.1 io.quarkiverse.messaginghub
(camel-quarkus) 27/33: Fixed langchain4j (requires CAMEL-20863)
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 commit 9b0ed503119b4700be632978a075108cc17791bf Author: JiriOndrusek AuthorDate: Tue Jun 11 14:05:27 2024 +0200 Fixed langchain4j (requires CAMEL-20863) --- .../component/langchain/chat/it/OllamaRoute.java | 22 ++ 1 file changed, 22 insertions(+) diff --git a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java index c87d2cffe8..47d9c68c40 100644 --- a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java +++ b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java @@ -16,11 +16,22 @@ */ package org.apache.camel.quarkus.component.langchain.chat.it; +import dev.langchain4j.model.chat.ChatLanguageModel; +import io.quarkiverse.langchain4j.ollama.OllamaChatLanguageModel; +import io.quarkiverse.langchain4j.ollama.Options; import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.apache.camel.builder.RouteBuilder; +import org.eclipse.microprofile.config.inject.ConfigProperty; + +import static java.time.Duration.ofSeconds; @ApplicationScoped public class OllamaRoute extends RouteBuilder { + +@ConfigProperty(name = "quarkus.langchain4j.ollama.base-url") +private String ollamaUrl; + @Override public void configure() throws Exception { from("direct:send-simple-message?timeout=3") @@ -35,4 +46,15 @@ public class OllamaRoute extends RouteBuilder { .to("langchain4j-chat:test3?chatOperation=CHAT_MULTIPLE_MESSAGES") .to("mock:multipleMessageResponse"); } + +//model reflects the values in wire-mocked response +@Produces +public ChatLanguageModel produceModel() { +return OllamaChatLanguageModel.builder() + .options(Options.builder().temperature(0.3).topK(40).topP(0.9).build()) +.model("orca-mini") +.baseUrl(ollamaUrl) +.timeout(ofSeconds(3000)) +.build(); +} }
(camel-quarkus) 02/33: Fixed debug + generated poms
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 commit b8aa22753738159c3e5c8688bb112dc54258ca0f Author: JiriOndrusek AuthorDate: Wed May 15 09:25:44 2024 +0200 Fixed debug + generated poms --- .../java/org/apache/camel/quarkus/component/debug/it/DebugTest.java | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java b/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java index b2f5a41742..2098c7b436 100644 --- a/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java +++ b/integration-tests/debug/src/test/java/org/apache/camel/quarkus/component/debug/it/DebugTest.java @@ -34,9 +34,9 @@ import org.apache.camel.ServiceStatus; import org.apache.camel.api.management.mbean.ManagedBacklogDebuggerMBean; import org.junit.jupiter.api.Test; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_HOST; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_REGISTRY_PORT; -import static org.apache.camel.component.debug.JmxConnectorService.DEFAULT_SERVICE_URL_PATH; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_HOST; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_REGISTRY_PORT; +import static org.apache.camel.impl.debugger.DebuggerJmxConnectorService.DEFAULT_SERVICE_URL_PATH; import static org.awaitility.Awaitility.await; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index fdb4d44c86..2f650dbfd4 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6408,7 +6408,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 52e958fce0..64c24ae0a4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6408,7 +6408,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 1075917ceb..466f55006c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6408,7 +6408,7 @@ com.google.oauth-client google-oauth-client -1.35.0 +1.36.0 commons-logging
(camel-quarkus) 14/33: Fixed alphjabetical order of bom dependencies (langchain4j)
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 commit ca584804bef8a39c946d35635366f0e27b9cb6a1 Author: JiriOndrusek AuthorDate: Wed May 29 10:26:55 2024 +0200 Fixed alphjabetical order of bom dependencies (langchain4j) --- poms/bom/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 6a186f18e8..4755616ef8 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1779,12 +1779,12 @@ org.apache.camel -camel-langchain4j-core +camel-langchain4-chat ${camel.version} org.apache.camel -camel-langchain4j-chat +camel-langchain4j-core ${camel.version}
(camel-quarkus) 16/33: Conflict + generated POMs
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 commit 0f32fc159c40803b7ff015bafe785f6daa2200ea Author: JiriOndrusek AuthorDate: Mon Jun 3 09:23:12 2024 +0200 Conflict + generated POMs --- poms/bom/src/main/generated/flattened-full-pom.xml | 16 poms/bom/src/main/generated/flattened-reduced-pom.xml| 16 .../src/main/generated/flattened-reduced-verbose-pom.xml | 16 3 files changed, 48 insertions(+) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index d1ccbe9cf1..00fcfef684 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1723,6 +1723,12 @@ org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6640,6 +6646,16 @@ quarkus-jsch-deployment 3.0.8 + +io.quarkiverse.langchain4j +quarkus-langchain4j-core +0.14.2 + + +io.quarkiverse.langchain4j +quarkus-langchain4j-core-deployment +0.14.2 + io.quarkiverse.messaginghub quarkus-pooled-jms diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index dd5b548cf8..292ff78059 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1723,6 +1723,12 @@ org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6610,6 +6616,16 @@ quarkus-jsch-deployment 3.0.8 + +io.quarkiverse.langchain4j +quarkus-langchain4j-core +0.14.2 + + +io.quarkiverse.langchain4j +quarkus-langchain4j-core-deployment +0.14.2 + io.quarkiverse.messaginghub quarkus-pooled-jms diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d0456f0689..91ba522589 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1723,6 +1723,12 @@ org.apache.camel camel-langchain4j-core 4.7.0-SNAPSHOT + + +dev.langchain4j +* + + org.apache.camel @@ -6610,6 +6616,16 @@ quarkus-jsch-deployment 3.0.8 + +io.quarkiverse.langchain4j +quarkus-langchain4j-core +0.14.2 + + +io.quarkiverse.langchain4j +quarkus-langchain4j-core-deployment +0.14.2 + io.quarkiverse.messaginghub quarkus-pooled-jms
(camel-quarkus) 28/33: Fixed junit5-extension-tests
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 commit eb1bcc4201ba2376b5d5ea09fd5ec5cfc685f4e1 Author: JiriOndrusek AuthorDate: Wed Jun 12 10:47:40 2024 +0200 Fixed junit5-extension-tests --- .../doubeRouteBuilderPerClass/SecondPerClassET.java | 8 .../camel/quarkus/test/CamelQuarkusTestSupport.java | 15 ++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java index 563ebc565f..5b58726702 100644 --- a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java +++ b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/SecondPerClassET.java @@ -33,23 +33,23 @@ public class SecondPerClassET extends CamelQuarkusTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { -from("direct:startTest").to("direct:start").to("mock:result"); +from("direct:startTest2").to("direct:start").to("mock:result"); } }; } @Test -public void someTestA() throws InterruptedException { +public void someTestC() throws InterruptedException { MockEndpoint mockEndpoint = getMockEndpoint("mock:result"); mockEndpoint.expectedBodiesReceived("Some Value"); -template.sendBody("direct:startTest", null); +template.sendBody("direct:startTest2", null); mockEndpoint.assertIsSatisfied(); } @Test -public void someTestB() throws InterruptedException { +public void someTestD() throws InterruptedException { MockEndpoint mockEndpoint = getMockEndpoint("mock:result"); mockEndpoint.expectedBodiesReceived("Some Value"); diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java index 94cd0f63b2..571113b5f8 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java @@ -242,6 +242,16 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport contextManager.createCamelContext(this); context = contextManager.context(); +//log warning in case that at least one RouteBuilder in the registry, it might mean, that unintentionally +// RouteBuilders are shared across or that RouteBuilder is created with @Produces +if (isUseRouteBuilder() && !context.getRegistry().findByType(RouteBuilder.class).isEmpty()) { +LOG.warn( +"Test with `true` in `isUserRouteBuilder' and `RouteBuilder` detected in the context registry. " + +"All tests will share this routeBuilder from the registry. This is usually not intended. " + +"If `@Produces` is used to create such a RouteBuilder, please refactor the code " + +"by overriding the method `createRouteBuilder()` instead."); +} + doPostSetup(); // only start timing after all the setup @@ -317,7 +327,10 @@ public class CamelQuarkusTestSupport extends AbstractTestSupport void internalAfterAll(QuarkusTestContext context, ExtensionContext extensionContext) { try { -if (!testConfiguration().isCreateCamelContextPerClass()) { +if (testConfiguration().isCreateCamelContextPerClass()) { +//call all clear and release methods, stop is not called as it is disabled on the camelContextManagers +contextManager.stop(); +} else { doPostTearDown(); } cleanupResources();
(camel-quarkus) 09/33: Generated poms
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 commit 3bae5cea11c5c4e3f0c1fb9288f7d8137acfcebc Author: JiriOndrusek AuthorDate: Mon May 27 08:40:08 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 14 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 ++-- .../src/main/generated/flattened-reduced-verbose-pom.xml | 12 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index beda07e394..1d54746ca1 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7087,7 +7087,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7102,7 +7102,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7113,7 +7113,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7128,7 +7128,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7143,7 +7143,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7158,7 +7158,7 @@ org.springframework spring-orm -6.1.7 +6.1.8 org.springframework @@ -7173,7 +7173,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 850c04c96e..a83492646e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7006,7 +7006,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7021,7 +7021,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7032,7 +7032,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7047,7 +7047,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7062,7 +7062,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7077,7 +7077,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 org.springframework diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 2cae69726b..d4cb4dff3a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7006,7 +7006,7 @@ org.springframework spring-aop -6.1.7 +6.1.8 org.springframework @@ -7021,7 +7021,7 @@ org.springframework spring-expression -6.1.7 +6.1.8 org.springframework @@ -7032,7 +7032,7 @@ org.springframework spring-jdbc -6.1.7 +6.1.8 org.springframework @@ -7047,7 +7047,7 @@ org.springframework spring-jms -6.1.7 +6.1.8 org.springframework @@ -7062,7 +7062,7 @@ org.springframework spring-messaging -6.1.7 +6.1.8 org.springframework @@ -7077,7 +7077,7 @@ org.springframework spring-tx -6.1.7 +6.1.8 org.springframework
(camel-quarkus) 13/33: Added camel-langchain4j-core to pom
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 commit 4478cd28fbda2fb622f2e513ce59621469a42070 Author: JiriOndrusek AuthorDate: Wed May 29 08:54:35 2024 +0200 Added camel-langchain4j-core to pom --- poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml| 5 + poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 + poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 + 4 files changed, 20 insertions(+) diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 6d5ff9ac93..6a186f18e8 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1777,6 +1777,11 @@ camel-kudu ${camel.version} + +org.apache.camel +camel-langchain4j-core +${camel.version} + org.apache.camel camel-langchain4j-chat diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1d54746ca1..417035c19d 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a83492646e..148047cadd 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index d4cb4dff3a..1252e3bc37 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1714,6 +1714,11 @@ camel-kudu 4.7.0-SNAPSHOT + +org.apache.camel +camel-langchain4j-core +4.7.0-SNAPSHOT + org.apache.camel camel-langchain4j-chat
(camel-quarkus) 07/33: Handle DebuggerJmxConnectorService being present in the camel core
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 commit bb23e8758a7254cb3d711b2b5387d64a59fbf5b0 Author: James Netherton AuthorDate: Tue May 21 14:45:47 2024 +0100 Handle DebuggerJmxConnectorService being present in the camel core --- .../core/deployment/CamelDebugProcessor.java | 46 +++ .../DebuggerJmxConnectorServiceSubstitutions.java | 67 ++ .../camel/quarkus/main/CoreMainResource.java | 31 ++ .../main/src/main/resources/application.properties | 2 + .../apache/camel/quarkus/main/CoreMainTest.java| 18 ++ .../quarkus/component/management/it/Routes.java| 2 + .../src/main/resources/application.properties | 3 + .../component/management/it/ManagementTest.java| 14 + 8 files changed, 183 insertions(+) diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java new file mode 100644 index 00..5ee593c439 --- /dev/null +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelDebugProcessor.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.core.deployment; + +import java.util.function.BooleanSupplier; +import java.util.stream.StreamSupport; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.BuildSteps; +import io.quarkus.deployment.builditem.AllowJNDIBuildItem; +import org.eclipse.microprofile.config.ConfigProvider; + +/** + * Build steps relating to camel debugging support. This is primarily required due to camel-main + * having the capability to enable debugging features that live in the Camel core such as the + * DebuggerJmxConnectorService + */ +@BuildSteps(onlyIf = CamelDebugProcessor.CamelDebugConfigurationPresent.class) +public class CamelDebugProcessor { +@BuildStep +AllowJNDIBuildItem allowJNDI() { +return new AllowJNDIBuildItem(); +} + +static final class CamelDebugConfigurationPresent implements BooleanSupplier { +@Override +public boolean getAsBoolean() { +return StreamSupport.stream(ConfigProvider.getConfig().getPropertyNames().spliterator(), false) +.anyMatch(key -> key.startsWith("camel.debug")); +} +} +} diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java new file mode 100644 index 00..866bcb7f89 --- /dev/null +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/graal/DebuggerJmxConnectorServiceSubstitutions.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.quarkus.core.graal; + +import java.io.IOException; +import java.util.function.BooleanSupplier; + +import com.oracle.svm.core.annotate.Alias; +import com.oracle.svm.core.annotate.RecomputeFieldValue; +import com.oracl
(camel-quarkus) 06/33: Generated poms
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 commit 39cf0f1d0aae941f24c4cc99b701c072d520b1c2 Author: JiriOndrusek AuthorDate: Tue May 21 09:25:54 2024 +0200 Generated poms --- poms/bom/src/main/generated/flattened-full-pom.xml | 20 ++-- .../bom/src/main/generated/flattened-reduced-pom.xml | 20 ++-- .../main/generated/flattened-reduced-verbose-pom.xml | 20 ++-- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 96ddbc9980..ee21571c82 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6236,7 +6236,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6255,12 +6255,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6275,22 +6275,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0 ca.uhn.hapi.fhir @@ -6735,17 +6735,17 @@ io.swagger.core.v3 swagger-annotations-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-core-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-models-jakarta -2.2.21 +2.2.22 io.swagger.parser.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 9c59f797d4..7aaf6da0d3 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6236,7 +6236,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6255,12 +6255,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6275,22 +6275,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0 ca.uhn.hapi.fhir @@ -6695,17 +6695,17 @@ io.swagger.core.v3 swagger-annotations-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-core-jakarta -2.2.21 +2.2.22 io.swagger.core.v3 swagger-models-jakarta -2.2.21 +2.2.22 io.swagger.parser.v3 diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 87ce674107..06e95261a5 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6236,7 +6236,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.0.2 +7.2.0 com.google.code.findbugs @@ -6255,12 +6255,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.0.2 +7.2.0 junit @@ -6275,22 +6275,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.0.2 +7.2.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.0.2 +7.2.0
(camel-quarkus) 04/33: Fixed knative + generated files
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 commit 7204a4d7d4f409641e43cc07e227ec2df65c1051 Author: JiriOndrusek AuthorDate: Fri May 17 12:08:52 2024 +0200 Fixed knative + generated files --- .../component/knative/consumer/it/KnativeChannelConsumerTest.java | 2 +- .../component/knative/producer/it/KnativeProducerResource.java | 2 +- .../apache/camel/quarkus/component/knative/producer/it/Routes.java | 2 +- pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java b/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java index 7ff3cc8ce0..696db79d9c 100644 --- a/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java +++ b/integration-tests/knative-channel-consumer/src/test/java/org/apache/camel/quarkus/component/knative/consumer/it/KnativeChannelConsumerTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit; import io.quarkus.test.junit.QuarkusTest; import jakarta.ws.rs.core.MediaType; -import org.apache.camel.component.cloudevents.CloudEvents; +import org.apache.camel.cloudevents.CloudEvents; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java index 4df151ee54..1112cf1c42 100644 --- a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java +++ b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/KnativeProducerResource.java @@ -33,7 +33,7 @@ import jakarta.ws.rs.core.Response; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; -import org.apache.camel.component.cloudevents.CloudEvents; +import org.apache.camel.cloudevents.CloudEvents; import org.apache.camel.component.knative.KnativeComponent; import org.apache.camel.component.mock.MockEndpoint; diff --git a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java index 529b26f1c0..f9240e3c11 100644 --- a/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java +++ b/integration-tests/knative-producer/src/main/java/org/apache/camel/quarkus/component/knative/producer/it/Routes.java @@ -17,7 +17,7 @@ package org.apache.camel.quarkus.component.knative.producer.it; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.cloudevents.CloudEvent; +import org.apache.camel.cloudevents.CloudEvent; public class Routes extends RouteBuilder { diff --git a/pom.xml b/pom.xml index c882f30e37..00a9c8ad32 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ 1.313 1.23.0 ${google-oauth-client-version} -0.219.0 - 1.129.1 -1.129.1 +0.220.0 + 1.129.3 +1.129.3 23.1.2 jdk21 4.0.21 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 5e0b7fbb63..d18eea5c1e 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6377,7 +6377,7 @@ com.google.cloud google-cloud-pubsub -1.129.1 +1.129.3 com.google.android diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 7023dae945..6a33720ac7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6377,7 +6377,7 @@ com.google.cloud google-cloud-pubsub -1.129.1 +1.129.3 com.google.android diff --git a/poms/bom/src/main/generated/flattened
(camel-quarkus) branch camel-main updated (0d318a0c08 -> c73cd5a9f8)
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 0d318a0c08 Fixed couchdb issue + generated files discard d29d7309a5 Fixed pubNub + generated files discard 23ea207ed5 Fixed azure-queue discard cf1cbf7d67 Added coap doc change discard ddea8b2bbe Fixed junit5-extension-tests discard a7938dcf7b Fixed langchain4j (requires CAMEL-20863) discard 8e190fa34b Reverted langchain4j dependency exclusions, as the camel Quarkus has now the same version as Camel discard d94dba4b45 Fixed smb discard cf3f2559a1 Solved conflict + rebased discard 417d05c9a3 Removed unnecessary change made for xchange discard 7e29dfaa0f fixed azure and xchange discard 98770850d2 Rebased + format fix discard 8c983e1964 Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport discard b5d223c49f Fixed style discard 6bde128ae3 Proper fix of longchain4j version conflict discard 8c66a66730 TestSupport fixes (CAMEL-20785) and langchain4j version conflict discard bfa26bd11f Conflict + generated POMs discard ab666d92ee Generated poms discard 0299661e4d Fixed alphjabetical order of bom dependencies (langchain4j) discard 87fbc86104 Added camel-langchain4j-core to pom discard 37a99637ca Fixed forrmatting discard 55d440c94a fixed test-framework/junit5 + generated changes discard d9cfdbffa9 Fix of compilation error in test-framework discard bbca1b4c73 Generated poms discard fea2d3f4fa Generated files discard 40df7a9fe5 Handle DebuggerJmxConnectorService being present in the camel core discard 2feded1b65 Generated poms discard e7da190ff9 Generated files discard 03b97e8309 Fixed knative + generated files discard e341ec2bd4 generated poms discard df7e85f91d Fixed debug + generated poms discard 9a7066cca4 Upgrade Camel to 4.7.0 add 714fd3a80a Added aws2-kinesis-firehose test service dependency STS (#6183) add dbb1c41e46 [Azure] Fix flaky storage queue crud test add f6c7a287a5 Bump quarkiverse-groovy.version from 3.10.0 to 3.11.0 (#6187) add ce6d4b642a Added some small logs to Aws2KinesisFirehoseTest for better understanding of flaky tests (#6186) add 4a39b1c11f Add httpclient5 support extension add a888afd8ed Bump quarkiverse-minio.version from 3.7.2 to 3.7.3 add 8ed51d7066 Bump quarkiverse-jgit.version from 3.1.0 to 3.1.1 add 4b2e3a7dde Regen SBOM from commit 8ed51d7066732d64233eb4ec157292f3ced66b1b (#6194) add 415d6eed26 Use LazySecretKeysHandler for Jasypt Config add 19bd357f9a Bump quarkiverse-jsch.version from 3.0.7 to 3.0.8 (#6200) add a5a869ea1f [Slack] Decrease delay when getting messages (#6197) new 19ffe20497 Upgrade Camel to 4.7.0 new b8aa227537 Fixed debug + generated poms new 6d95aa4966 generated poms new 7204a4d7d4 Fixed knative + generated files new 33533f3bbc Generated files new 39cf0f1d0a Generated poms new bb23e8758a Handle DebuggerJmxConnectorService being present in the camel core new efe6e5d1e3 Generated files new 3bae5cea11 Generated poms new 780f7b07a1 Fix of compilation error in test-framework new 5ca1655908 fixed test-framework/junit5 + generated changes new 23a3c7cb0d Fixed forrmatting new 4478cd28fb Added camel-langchain4j-core to pom new ca584804be Fixed alphjabetical order of bom dependencies (langchain4j) new 4b54cba53e Generated poms new 0f32fc159c Conflict + generated POMs new d0fa3fa374 TestSupport fixes (CAMEL-20785) and langchain4j version conflict new 364248cc94 Proper fix of longchain4j version conflict new fecc99b4cc Fixed style new 820fba79c6 Refactor of CamelQuarkusTestSupport to extends AbstractTestSupport new d6b4ff4917 Rebased + format fix new 51991b40f4 fixed azure and xchange new 5be0cc26ab Removed unnecessary change made for xchange new 66261d72cb Solved conflict + rebased new 639c61efd8 Fixed smb new 5e19911180 Reverted langchain4j dependency exclusions, as the camel Quarkus has now the same version as Camel new 9b0ed50311 Fixed langchain4j (requires CAMEL-20863) new eb1bcc4201 Fixed junit5-extension-tests new 0ea8e9d0b3 Added coap doc change new f15a032ec3 Fixed azure-queue new 754750ff19 Fixed pubNub + generated files new 8820ce73b8 Fixed couchdb issue + generated files new c73cd5a9f8 Fixed pubnub 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 (0d318a0c08) \ N -- N -- N refs/heads/camel-main (c73cd5a9f8) You should already have received notification emails for all of the O revisions, and so the following
(camel-quarkus) 32/33: Fixed couchdb issue + generated files
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 commit 8820ce73b887d75312f54368dabce3b8937fd1cf Author: JiriOndrusek AuthorDate: Mon Jun 17 14:41:45 2024 +0200 Fixed couchdb issue + generated files --- .../component/couchdb/it/CouchdbResource.java| 6 +++--- .../component/couchdb/it/CouchdbTestDocument.java| 17 + .../camel/quarkus/component/couchdb/it/CouchbIT.java | 2 +- .../quarkus/component/couchdb/it/CouchdbTest.java| 20 +++- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2 +- .../bom/src/main/generated/flattened-reduced-pom.xml | 2 +- .../main/generated/flattened-reduced-verbose-pom.xml | 2 +- 8 files changed, 32 insertions(+), 21 deletions(-) diff --git a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java index fcb7aa4725..03b2f09756 100644 --- a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java +++ b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbResource.java @@ -19,6 +19,7 @@ package org.apache.camel.quarkus.component.couchdb.it; import java.util.Collection; import java.util.concurrent.ConcurrentLinkedQueue; +import com.ibm.cloud.sdk.core.service.exception.NotFoundException; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.ws.rs.Consumes; @@ -33,7 +34,6 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.couchdb.CouchDbConstants; import org.apache.camel.component.couchdb.CouchDbOperations; import org.jboss.logging.Logger; -import org.lightcouch.NoDocumentException; import static org.apache.camel.quarkus.component.couchdb.it.CouchDbRoute.COUCHDB_ENDPOINT_URI; @@ -52,7 +52,7 @@ public class CouchdbResource { @PUT @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) -public CouchdbTestDocument create(CouchdbTestDocument document) { +public CouchdbTestDocument create(CouchdbTestDocument document) throws InterruptedException { LOG.info("Invoking create"); Exchange createExchange = producerTemplate.request(COUCHDB_ENDPOINT_URI, e -> e.getMessage().setBody(document.toJsonObject())); @@ -72,7 +72,7 @@ public class CouchdbResource { e.getMessage().setHeader(CouchDbConstants.HEADER_METHOD, CouchDbOperations.GET); e.getMessage().setHeader(CouchDbConstants.HEADER_DOC_ID, document.getId()); }); -if (getExchange.getException(NoDocumentException.class) != null) { +if (getExchange.getException(NotFoundException.class) != null) { return null; } else { return getExchange.getMessage().getBody(String.class); diff --git a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java index f384ba8213..9e55787379 100644 --- a/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java +++ b/integration-tests/couchdb/src/main/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTestDocument.java @@ -16,7 +16,11 @@ */ package org.apache.camel.quarkus.component.couchdb.it; +import java.util.Optional; +import java.util.stream.StreamSupport; + import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.JsonArray; import com.google.gson.JsonObject; public class CouchdbTestDocument { @@ -67,11 +71,16 @@ public class CouchdbTestDocument { public static CouchdbTestDocument fromJsonObject(JsonObject jsonObject) { CouchdbTestDocument doc = new CouchdbTestDocument(); -if (jsonObject.has("_id")) { -doc.setId(jsonObject.get("_id").getAsString()); +if (jsonObject.has("id")) { +doc.setId(jsonObject.get("id").getAsString()); } -if (jsonObject.has("_rev")) { -doc.setRevision(jsonObject.get("_rev").getAsString()); +if (jsonObject.has("changes") && jsonObject.get("changes").isJsonArray()) { +JsonArray ja = jsonObject.get("changes").getAsJsonArray(); +Optional rev = StreamSupport.stream(ja.spliterator(), true) +.filter(jo -> ((JsonObject) jo).has("rev")) +.map(jo2 -> ((JsonObject) jo2).get("rev").getA
(camel-quarkus) 17/33: TestSupport fixes (CAMEL-20785) and langchain4j version conflict
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 commit d0fa3fa37459fc247e49d7b3ac04e82f20446661 Author: JiriOndrusek AuthorDate: Wed Jun 5 13:49:04 2024 +0200 TestSupport fixes (CAMEL-20785) and langchain4j version conflict --- pom.xml| 10 +- poms/bom/pom.xml | 5 + poms/bom/src/main/generated/flattened-full-pom.xml | 405 +++-- .../src/main/generated/flattened-reduced-pom.xml | 49 +-- .../generated/flattened-reduced-verbose-pom.xml| 113 +++--- .../quarkus/test/CamelQuarkusTestSupport.java | 16 +- .../test/ContextNotStoppingManagerFactory.java | 46 +++ .../test/LegacyCamelContextNotStoppingManager.java | 41 +++ .../TransientCamelContextNotStoppingManager.java | 41 +++ .../quarkus/test/common/AbstractCallbacksTest.java | 264 -- .../test/common/CallbacksPerTestFalse01Test.java | 71 .../test/common/CallbacksPerTestFalse02Test.java | 40 -- .../test/common/CallbacksPerTestTrue01Test.java| 71 .../test/common/CallbacksPerTestTrue02Test.java| 40 -- .../test/junit5/patterns/DebugJUnit5Test.java | 18 +- .../patterns/DebugNoLazyTypeConverterTest.java | 18 +- .../quarkus/test/junit5/patterns/DebugTest.java| 19 +- 17 files changed, 484 insertions(+), 783 deletions(-) diff --git a/pom.xml b/pom.xml index 00a9c8ad32..0987eef53f 100644 --- a/pom.xml +++ b/pom.xml @@ -78,8 +78,8 @@ 3.26.0 1.11.714 ${azure-sdk-bom-version} -1.48.0 -1.12.0 +1.49.0 +1.12.1 1.0.0-beta.18 3.7.1 1.78.1 @@ -98,9 +98,9 @@ 1.313 1.23.0 ${google-oauth-client-version} -0.220.0 - 1.129.3 -1.129.3 +0.221.0 + 1.129.6 +1.129.6 23.1.2 jdk21 4.0.21 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 0e49cba95f..7d4df42bb6 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6617,6 +6617,11 @@ commons-lang ${commons-lang.version} + +dev.langchain4j +langchain4j +${langchain4j-version} + io.dropwizard.metrics dropwizard-core diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 00fcfef684..22952304cc 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6247,7 +6247,7 @@ ca.uhn.hapi.fhir hapi-fhir-base -7.2.0 +7.2.1 com.google.code.findbugs @@ -6266,12 +6266,12 @@ ca.uhn.hapi.fhir hapi-fhir-client -7.2.0 +7.2.1 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 -7.2.0 +7.2.1 junit @@ -6286,22 +6286,22 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 -7.2.0 +7.2.1 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 -7.2.0 +7.2.1 ca.uhn.hapi.fhir hapi-fhir-structures-r4 -7.2.0 +7.2.1 ca.uhn.hapi.fhir hapi-fhir-structures-r5 -7.2.0 +7.2.1 ca.uhn.hapi.fhir @@ -6388,7 +6388,7 @@ com.google.cloud google-cloud-pubsub -1.129.3 +1.129.6 com.google.android @@ -6539,6 +6539,11 @@ commons-lang 2.6 + +dev.langchain4j +langchain4j +0.31.0 + io.dropwizard.metrics dropwizard-core @@ -7209,7 +7214,7 @@ org.springframework.data spring-data-redis -3.2.5 +3.3.0 org.springframework @@ -22493,314 +22498,324 @@ 12.0.8 -com.azure -azure-ai-contentsafety -1.0.2 +com.azure +azure-ai-contentsafety +1.0.3 + + +com.azure +azure-ai-formrecognizer +4.1.8 + + +com.azure +azure-ai-metricsadvisor +1.1.25 -com.azure -azure-ai-formrecognizer -4.1.7 +com.azure +azure-ai-textanalytics +5.4.6 -com.azure -azure-ai-metricsadvisor -1.1.24 +com.azure +azure-ai-translation-text +1.0.0 -com.azure -azure-ai-textanalytics
(camel-quarkus) 31/33: Fixed pubNub + generated files
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 commit 754750ff1958eae6add0bd2a904a8e34bb6bb33c Author: JiriOndrusek AuthorDate: Fri Jun 14 09:51:05 2024 +0200 Fixed pubNub + generated files --- .../component/pubnub/it/PubnubResource.java| 2 +- pom.xml| 6 +- poms/bom/src/main/generated/flattened-full-pom.xml | 354 ++--- .../src/main/generated/flattened-reduced-pom.xml | 44 +-- .../generated/flattened-reduced-verbose-pom.xml| 100 +++--- 5 files changed, 253 insertions(+), 253 deletions(-) diff --git a/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java b/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java index 0d5a5a6c94..26cba623e0 100644 --- a/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java +++ b/integration-tests/pubnub/src/main/java/org/apache/camel/quarkus/component/pubnub/it/PubnubResource.java @@ -172,6 +172,6 @@ public class PubnubResource { configuration.setReconnectionPolicy(PNReconnectionPolicy.LINEAR); } -return new PubNub(configuration); +return PubNub.create(configuration); } } diff --git a/pom.xml b/pom.xml index c849873d4e..90654abcab 100644 --- a/pom.xml +++ b/pom.xml @@ -98,9 +98,9 @@ 1.313 1.23.0 ${google-oauth-client-version} -0.221.0 - 1.129.6 -1.129.6 +0.222.0 + 1.130.0 +1.130.0 23.1.2 jdk21 4.0.21 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index f303a629ca..273fe1e0a8 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6382,7 +6382,7 @@ com.google.cloud google-cloud-pubsub -1.129.6 +1.130.0 com.google.android @@ -6583,7 +6583,7 @@ io.projectreactor.netty reactor-netty -1.1.19 +1.1.20 io.quarkiverse.freemarker @@ -7102,7 +7102,7 @@ org.springframework spring-aop -6.1.8 +6.1.9 org.springframework @@ -7117,7 +7117,7 @@ org.springframework spring-expression -6.1.8 +6.1.9 org.springframework @@ -7128,7 +7128,7 @@ org.springframework spring-jdbc -6.1.8 +6.1.9 org.springframework @@ -7143,7 +7143,7 @@ org.springframework spring-jms -6.1.8 +6.1.9 org.springframework @@ -7158,7 +7158,7 @@ org.springframework spring-messaging -6.1.8 +6.1.9 org.springframework @@ -7173,7 +7173,7 @@ org.springframework spring-orm -6.1.8 +6.1.9 org.springframework @@ -7188,7 +7188,7 @@ org.springframework spring-tx -6.1.8 +6.1.9 org.springframework @@ -22207,284 +22207,284 @@ 2.2 -org.eclipse.jetty -jetty-alpn-client -12.0.8 +org.eclipse.jetty +jetty-alpn-client +12.0.10 -org.eclipse.jetty -jetty-alpn-conscrypt-client -12.0.8 +org.eclipse.jetty +jetty-alpn-conscrypt-client +12.0.10 -org.eclipse.jetty -jetty-alpn-conscrypt-server -12.0.8 +org.eclipse.jetty +jetty-alpn-conscrypt-server +12.0.10 -org.eclipse.jetty -jetty-alpn-java-client -12.0.8 +org.eclipse.jetty +jetty-alpn-java-client +12.0.10 -org.eclipse.jetty -jetty-alpn-java-server -12.0.8 +org.eclipse.jetty +jetty-alpn-java-server +12.0.10 -org.eclipse.jetty -jetty-alpn-server -12.0.8 +org.eclipse.jetty +jetty-alpn-server +12.0.10 -org.eclipse.jetty -jetty-client -12.0.8 +org.eclipse.jetty +jetty-client +12.0.10 -org.eclipse.jetty -jetty-deploy -12.0.8 +org.eclipse.jetty +jetty-deploy +12.0.10 -org.eclipse.jetty -jetty-http -12.0.8