diff --git a/catalog/pom.xml b/catalog/pom.xml index 038638e5727b..834804b5605a 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -1605,19 +1605,6 @@ - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-grpc @@ -2164,19 +2151,6 @@ - - org.apache.camel.quarkus - camel-quarkus-js-dsl - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-jsch @@ -2190,19 +2164,6 @@ - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-jslt @@ -2385,32 +2346,6 @@ - - org.apache.camel.quarkus - camel-quarkus-kotlin - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-kubernetes diff --git a/docs/antora.yml b/docs/antora.yml index 49348c0b8da0..ad915391cea1 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -28,18 +28,18 @@ asciidoc: requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'" # Project versions - camel-version: 4.8.1 # replace ${camel.version} - camel-docs-version: 4.8.x + camel-version: 4.9.0 # replace ${camel.version} + camel-docs-version: next camel-quarkus-version: 3.17.0 # replace ${camel-quarkus.version} quarkus-version: 3.17.2 # replace ${quarkus.version} graalvm-version: 23.1.2 # replace ${graalvm.version} graalvm-docs-version: jdk21 # replace ${graalvm-docs.version} - mapstruct-version: 1.6.0 # replace ${mapstruct.version} + mapstruct-version: 1.6.3 # replace ${mapstruct.version} min-maven-version: 3.8.2 # replace ${min-maven-version} target-maven-version: 3.9.9 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components - cq-camel-components: components + cq-camel-components: next@components doc-link-icon-lock: "icon:lock" quarkus-examples-version: latest diff --git a/docs/modules/ROOT/examples/components/etcd3.yml b/docs/modules/ROOT/examples/components/etcd3.yml index ecd418ebee08..fecae4c6ca34 100644 --- a/docs/modules/ROOT/examples/components/etcd3.yml +++ b/docs/modules/ROOT/examples/components/etcd3.yml @@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-etcd3 cqArtifactIdBase: etcd3 cqNativeSupported: false cqStatus: Preview -cqDeprecated: false +cqDeprecated: true cqJvmSince: 2.0.0 cqNativeSince: n/a cqCamelPartName: etcd3 diff --git a/docs/modules/ROOT/examples/components/jms.yml b/docs/modules/ROOT/examples/components/jms.yml index d80cb8d247c6..58b6396f66d9 100644 --- a/docs/modules/ROOT/examples/components/jms.yml +++ b/docs/modules/ROOT/examples/components/jms.yml @@ -9,5 +9,5 @@ cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 cqCamelPartName: jms cqCamelPartTitle: JMS -cqCamelPartDescription: Sent and receive messages to/from a JMS Queue or Topic. +cqCamelPartDescription: Send and receive messages to/from JMS message brokers. cqExtensionPageTitle: JMS diff --git a/docs/modules/ROOT/examples/components/openshift-build-configs.yml b/docs/modules/ROOT/examples/components/openshift-build-configs.yml index aa5fabb80894..1428697f6bdb 100644 --- a/docs/modules/ROOT/examples/components/openshift-build-configs.yml +++ b/docs/modules/ROOT/examples/components/openshift-build-configs.yml @@ -8,6 +8,6 @@ cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 cqCamelPartName: openshift-build-configs -cqCamelPartTitle: Openshift Build Config +cqCamelPartTitle: OpenShift Build Config cqCamelPartDescription: Perform operations on OpenShift Build Configs. cqExtensionPageTitle: Kubernetes diff --git a/docs/modules/ROOT/examples/components/openshift-builds.yml b/docs/modules/ROOT/examples/components/openshift-builds.yml index 9f880da3551b..75cce0af9169 100644 --- a/docs/modules/ROOT/examples/components/openshift-builds.yml +++ b/docs/modules/ROOT/examples/components/openshift-builds.yml @@ -8,6 +8,6 @@ cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 cqCamelPartName: openshift-builds -cqCamelPartTitle: Openshift Builds +cqCamelPartTitle: OpenShift Builds cqCamelPartDescription: Perform operations on OpenShift Builds. cqExtensionPageTitle: Kubernetes diff --git a/docs/modules/ROOT/examples/components/openshift-deploymentconfigs.yml b/docs/modules/ROOT/examples/components/openshift-deploymentconfigs.yml index 57d66e627298..7079711d3af6 100644 --- a/docs/modules/ROOT/examples/components/openshift-deploymentconfigs.yml +++ b/docs/modules/ROOT/examples/components/openshift-deploymentconfigs.yml @@ -8,6 +8,6 @@ cqDeprecated: false cqJvmSince: 1.0.0 cqNativeSince: 1.0.0 cqCamelPartName: openshift-deploymentconfigs -cqCamelPartTitle: Openshift Deployment Configs -cqCamelPartDescription: Perform operations on Openshift Deployment Configs and get notified on Deployment Config changes. +cqCamelPartTitle: OpenShift Deployment Configs +cqCamelPartDescription: Perform operations on OpenShift Deployment Configs and get notified on Deployment Config changes. cqExtensionPageTitle: Kubernetes diff --git a/docs/modules/ROOT/examples/others/groovy-dsl.yml b/docs/modules/ROOT/examples/others/groovy-dsl.yml deleted file mode 100644 index f70adafc7290..000000000000 --- a/docs/modules/ROOT/examples/others/groovy-dsl.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-groovy-dsl -cqArtifactIdBase: groovy-dsl -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: true -cqJvmSince: 1.8.0 -cqNativeSince: 2.16.0 -cqCamelPartName: groovy-dsl -cqCamelPartTitle: Groovy DSL -cqCamelPartDescription: Camel DSL with Groovy -cqExtensionPageTitle: Groovy DSL diff --git a/docs/modules/ROOT/examples/others/js-dsl.yml b/docs/modules/ROOT/examples/others/js-dsl.yml deleted file mode 100644 index 1e813b7d8691..000000000000 --- a/docs/modules/ROOT/examples/others/js-dsl.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-js-dsl -cqArtifactIdBase: js-dsl -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: true -cqJvmSince: 1.8.0 -cqNativeSince: 1.8.0 -cqCamelPartName: js-dsl -cqCamelPartTitle: JavaScript DSL -cqCamelPartDescription: Camel DSL with JavaScript -cqExtensionPageTitle: JavaScript DSL diff --git a/docs/modules/ROOT/examples/others/jsh-dsl.yml b/docs/modules/ROOT/examples/others/jsh-dsl.yml deleted file mode 100644 index b6ea34a53709..000000000000 --- a/docs/modules/ROOT/examples/others/jsh-dsl.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-jsh-dsl -cqArtifactIdBase: jsh-dsl -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: true -cqJvmSince: 2.16.0 -cqNativeSince: 2.16.0 -cqCamelPartName: jsh-dsl -cqCamelPartTitle: JavaShell DSL -cqCamelPartDescription: Camel DSL with JavaShell -cqExtensionPageTitle: JavaShell DSL diff --git a/docs/modules/ROOT/examples/others/kotlin-dsl.yml b/docs/modules/ROOT/examples/others/kotlin-dsl.yml deleted file mode 100644 index 3c4453bd1981..000000000000 --- a/docs/modules/ROOT/examples/others/kotlin-dsl.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-kotlin-dsl -cqArtifactIdBase: kotlin-dsl -cqNativeSupported: true -cqStatus: Stable -cqDeprecated: true -cqJvmSince: 1.8.0 -cqNativeSince: 2.16.0 -cqCamelPartName: kotlin-dsl -cqCamelPartTitle: Kotlin DSL -cqCamelPartDescription: Camel DSL with Kotlin (deprecated) -cqExtensionPageTitle: Kotlin DSL diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 7ba1f002c8df..2cf27cf89382 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -143,7 +143,6 @@ *** xref:reference/extensions/graphql.adoc[GraphQL] *** xref:reference/extensions/grok.adoc[Grok] *** xref:reference/extensions/groovy.adoc[Groovy] -*** xref:reference/extensions/groovy-dsl.adoc[Groovy DSL] *** xref:reference/extensions/gson.adoc[Gson] *** xref:reference/extensions/guava-eventbus.adoc[Guava EventBus] *** xref:reference/extensions/hl7.adoc[HL7] @@ -181,8 +180,6 @@ *** xref:reference/extensions/jasypt.adoc[Jasypt] *** xref:reference/extensions/java-joor-dsl.adoc[Java jOOR DSL] *** xref:reference/extensions/javascript.adoc[JavaScript] -*** xref:reference/extensions/js-dsl.adoc[JavaScript DSL] -*** xref:reference/extensions/jsh-dsl.adoc[JavaShell DSL] *** xref:reference/extensions/jfr.adoc[Jfr] *** xref:reference/extensions/jira.adoc[Jira] *** xref:reference/extensions/json-patch.adoc[JsonPatch] @@ -191,8 +188,6 @@ *** xref:reference/extensions/knative.adoc[Knative] *** xref:reference/extensions/knative-consumer.adoc[Knative Consumer] *** xref:reference/extensions/knative-producer.adoc[Knative Producer] -*** xref:reference/extensions/kotlin.adoc[Kotlin] -*** xref:reference/extensions/kotlin-dsl.adoc[Kotlin DSL] *** xref:reference/extensions/kubernetes.adoc[Kubernetes] *** xref:reference/extensions/kubernetes-cluster-service.adoc[Kubernetes Cluster Service] *** xref:reference/extensions/kudu.adoc[Kudu] diff --git a/docs/modules/ROOT/pages/reference/extensions/etcd3.adoc b/docs/modules/ROOT/pages/reference/extensions/etcd3.adoc index 7281417109ae..6bb3fab22467 100644 --- a/docs/modules/ROOT/pages/reference/extensions/etcd3.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/etcd3.adoc @@ -6,15 +6,15 @@ :cq-artifact-id: camel-quarkus-etcd3 :cq-native-supported: false :cq-status: Preview -:cq-status-deprecation: Preview +:cq-status-deprecation: Preview Deprecated :cq-description: Aggregation repository using EtcD as datastore -:cq-deprecated: false +:cq-deprecated: true :cq-jvm-since: 2.0.0 :cq-native-since: n/a ifeval::[{doc-show-badges} == true] [.badges] -[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## +[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## endif::[] Aggregation repository using EtcD as datastore diff --git a/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc b/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc deleted file mode 100644 index 3f4d94e0e843..000000000000 --- a/docs/modules/ROOT/pages/reference/extensions/groovy-dsl.adoc +++ /dev/null @@ -1,45 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-groovy-dsl"] -= Groovy DSL -:linkattrs: -:cq-artifact-id: camel-quarkus-groovy-dsl -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable Deprecated -:cq-description: Support for parsing Groovy route definitions at runtime -: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]##⚠️##[.badge-unsupported]##Deprecated## -endif::[] - -Support for parsing Groovy route definitions at runtime - -[id="extensions-groovy-dsl-whats-inside"] -== What's inside - -* xref:{cq-camel-components}:others:groovy-dsl.adoc[Groovy DSL] - -Please refer to the above link for usage and configuration details. - -[id="extensions-groovy-dsl-maven-coordinates"] -== Maven coordinates - -https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-groovy-dsl[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl - ----- -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::[] diff --git a/docs/modules/ROOT/pages/reference/extensions/jms.adoc b/docs/modules/ROOT/pages/reference/extensions/jms.adoc index 07be4a5d4eab..580b821ce498 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jms.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jms.adoc @@ -8,7 +8,7 @@ :cq-native-supported: true :cq-status: Stable :cq-status-deprecation: Stable -:cq-description: Sent and receive messages to/from a JMS Queue or Topic. +:cq-description: Send and receive messages to/from JMS message brokers. :cq-deprecated: false :cq-jvm-since: 1.0.0 :cq-native-since: 1.0.0 @@ -18,7 +18,7 @@ ifeval::[{doc-show-badges} == true] [.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## endif::[] -Sent and receive messages to/from a JMS Queue or Topic. +Send and receive messages to/from JMS message brokers. [id="extensions-jms-whats-inside"] == What's inside diff --git a/docs/modules/ROOT/pages/reference/extensions/js-dsl.adoc b/docs/modules/ROOT/pages/reference/extensions/js-dsl.adoc deleted file mode 100644 index 158db04d43d3..000000000000 --- a/docs/modules/ROOT/pages/reference/extensions/js-dsl.adoc +++ /dev/null @@ -1,79 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-js-dsl"] -= JavaScript DSL -:linkattrs: -:cq-artifact-id: camel-quarkus-js-dsl -:cq-native-supported: true -:cq-status: Experimental -:cq-status-deprecation: Experimental Deprecated -:cq-description: An JavaScript stack for parsing JavaScript route definitions -:cq-deprecated: true -:cq-jvm-since: 1.8.0 -:cq-native-since: 1.8.0 - -ifeval::[{doc-show-badges} == true] -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.8.0## [.badge-key]##Native since##[.badge-supported]##1.8.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## -endif::[] - -An JavaScript stack for parsing JavaScript route definitions - -[id="extensions-js-dsl-whats-inside"] -== What's inside - -* xref:{cq-camel-components}:others:js-dsl.adoc[JavaScript DSL] - -Please refer to the above link for usage and configuration details. - -[id="extensions-js-dsl-maven-coordinates"] -== Maven coordinates - -[source,xml] ----- - - org.apache.camel.quarkus - camel-quarkus-js-dsl - ----- -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-js-dsl-camel-quarkus-limitations"] -== Camel Quarkus limitations - -Since the function `Java.extend` https://www.graalvm.org/latest/reference-manual/js/JavaInteroperability/#extending-java-classes[is only available in JVM mode], by default, there is no way to implement a functional interface like a `Camel Processor` in JavaScript that is supported by the native compilation. - -As workaround, an implementation of the main functional interfaces (`org.apache.camel.Processor`, `java.util.function.Consumer`, `java.util.function.Supplier`, `java.util.function.Function`, `java.util.function.Predicate`, `java.util.function.BiConsumer`, `java.util.function.BiFunction` and `java.util.function.BiPredicate`) is available in the package `org.apache.camel.quarkus.dsl.js.runtime` whose simple name is prefixed by `JavaScriptDsl`. For each implementation, the body of the method to implement must be provided to the constructor. When the method to implement has arguments, the name of the arguments can also be provided to the constructor if the default names are not good enough. - -So for example, to implement a `Camel Processor` instead of using the function `Java.extend` which is only available in JVM mode as next: - -[source,javascript] ----- -const Processor = Java.type("org.apache.camel.Processor"); // <1> -const p = Java.extend(Processor); // <2> -const a = new p(e => { e.getMessage().setBody('Some Content') }); // <3> - -from('direct:a') - .process(a); // <4> ----- -<1> Retrieve the class `org.apache.camel.Processor` -<2> Create a new class that implements the functional interface `org.apache.camel.Processor` -<3> Instantiate the new class with a function as argument representing the implementation of the method to implement -<4> Provide the processor to the route definition. - -To have a code compatible with the both modes, it is possible to instantiate directly the implementation of the corresponding functional interface which is in this case the class `org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslProcessor` as next: - -[source,javascript] ----- -const Processor = Java.type("org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslProcessor"); // <1> -const p = new Processor("e", `e.getMessage().setBody('Some Content')`); // <2> - -from('direct:a') - .process(p); // <3> ----- -<1> Retrieve the class `org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslProcessor` -<2> Instantiate the dedicated class with the name of the argument `e` as first parameter and the body of the function as second parameter representing the implementation of the method to implement -<3> Provide the processor to the route definition. - diff --git a/docs/modules/ROOT/pages/reference/extensions/jsh-dsl.adoc b/docs/modules/ROOT/pages/reference/extensions/jsh-dsl.adoc deleted file mode 100644 index 37cfb846115f..000000000000 --- a/docs/modules/ROOT/pages/reference/extensions/jsh-dsl.adoc +++ /dev/null @@ -1,45 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-jsh-dsl"] -= JavaShell DSL -:linkattrs: -:cq-artifact-id: camel-quarkus-jsh-dsl -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable Deprecated -:cq-description: Camel DSL with JavaShell -:cq-deprecated: true -:cq-jvm-since: 2.16.0 -:cq-native-since: 2.16.0 - -ifeval::[{doc-show-badges} == true] -[.badges] -[.badge-key]##JVM since##[.badge-supported]##2.16.0## [.badge-key]##Native since##[.badge-supported]##2.16.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## -endif::[] - -Camel DSL with JavaShell - -[id="extensions-jsh-dsl-whats-inside"] -== What's inside - -* xref:{cq-camel-components}:others:jsh-dsl.adoc[JavaShell DSL] - -Please refer to the above link for usage and configuration details. - -[id="extensions-jsh-dsl-maven-coordinates"] -== Maven coordinates - -https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-jsh-dsl[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl - ----- -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::[] diff --git a/docs/modules/ROOT/pages/reference/extensions/kotlin-dsl.adoc b/docs/modules/ROOT/pages/reference/extensions/kotlin-dsl.adoc deleted file mode 100644 index 6995a51fc22e..000000000000 --- a/docs/modules/ROOT/pages/reference/extensions/kotlin-dsl.adoc +++ /dev/null @@ -1,45 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-kotlin-dsl"] -= Kotlin DSL -:linkattrs: -:cq-artifact-id: camel-quarkus-kotlin-dsl -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable Deprecated -:cq-description: Support for parsing Kotlin route definitions at runtime -: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]##⚠️##[.badge-unsupported]##Deprecated## -endif::[] - -Support for parsing Kotlin route definitions at runtime - -[id="extensions-kotlin-dsl-whats-inside"] -== What's inside - -* [Kotlin DSL] - -Please refer to the above link for usage and configuration details. - -[id="extensions-kotlin-dsl-maven-coordinates"] -== Maven coordinates - -https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-kotlin-dsl[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl - ----- -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::[] diff --git a/docs/modules/ROOT/pages/reference/extensions/kotlin.adoc b/docs/modules/ROOT/pages/reference/extensions/kotlin.adoc deleted file mode 100644 index 66b25bc0ba07..000000000000 --- a/docs/modules/ROOT/pages/reference/extensions/kotlin.adoc +++ /dev/null @@ -1,39 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-kotlin"] -= Kotlin -:page-aliases: extensions/kotlin.adoc -:linkattrs: -:cq-artifact-id: camel-quarkus-kotlin -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable Deprecated -:cq-description: Write Camel integration routes in Kotlin -:cq-deprecated: true -:cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 - -ifeval::[{doc-show-badges} == true] -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated## -endif::[] - -Write Camel integration routes in Kotlin - -[id="extensions-kotlin-maven-coordinates"] -== Maven coordinates - -https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-kotlin[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- - - org.apache.camel.quarkus - camel-quarkus-kotlin - ----- -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::[] diff --git a/docs/modules/ROOT/pages/reference/extensions/kubernetes.adoc b/docs/modules/ROOT/pages/reference/extensions/kubernetes.adoc index 0554b726540f..957d5292bada 100644 --- a/docs/modules/ROOT/pages/reference/extensions/kubernetes.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/kubernetes.adoc @@ -40,9 +40,9 @@ Perform operations against Kubernetes API * xref:{cq-camel-components}::kubernetes-secrets-component.adoc[Kubernetes Secrets component], URI syntax: `kubernetes-secrets:masterUrl` * xref:{cq-camel-components}::kubernetes-service-accounts-component.adoc[Kubernetes Service Account component], URI syntax: `kubernetes-service-accounts:masterUrl` * xref:{cq-camel-components}::kubernetes-services-component.adoc[Kubernetes Services component], URI syntax: `kubernetes-services:masterUrl` -* xref:{cq-camel-components}::openshift-build-configs-component.adoc[Openshift Build Config component], URI syntax: `openshift-build-configs:masterUrl` -* xref:{cq-camel-components}::openshift-builds-component.adoc[Openshift Builds component], URI syntax: `openshift-builds:masterUrl` -* xref:{cq-camel-components}::openshift-deploymentconfigs-component.adoc[Openshift Deployment Configs component], URI syntax: `openshift-deploymentconfigs:masterUrl` +* xref:{cq-camel-components}::openshift-build-configs-component.adoc[OpenShift Build Config component], URI syntax: `openshift-build-configs:masterUrl` +* xref:{cq-camel-components}::openshift-builds-component.adoc[OpenShift Builds component], URI syntax: `openshift-builds:masterUrl` +* xref:{cq-camel-components}::openshift-deploymentconfigs-component.adoc[OpenShift Deployment Configs component], URI syntax: `openshift-deploymentconfigs:masterUrl` Please refer to the above links for usage and configuration details. diff --git a/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc b/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc index c1dd8a886ca5..35ff3c6cfe07 100644 --- a/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/micrometer.adoc @@ -138,6 +138,12 @@ for both the camel context and routes. `route` captures metrics for routes only. camel context only. | `all`, `context`, `route` | `all` + +|icon:lock[title=Fixed at build time] [[quarkus.camel.metrics.route-policy-exclude-pattern]]`link:#quarkus.camel.metrics.route-policy-exclude-pattern[quarkus.camel.metrics.route-policy-exclude-pattern]` + +Comma separated list of route IDs to exclude from metrics collection. +| `string` +| |=== [.configuration-legend] diff --git a/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc b/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc index cbc39593c721..93e824f4554a 100644 --- a/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc +++ b/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc @@ -216,13 +216,6 @@ camel.main.routes-include-pattern = routes/routes.yaml, routes/rests.yaml, rests value: "5s" ---- -== Other route DSLs - -* xref:reference/extensions/java-joor-dsl.adoc[Java jOOR] -* xref:reference/extensions/groovy-dsl.adoc[Groovy] -* xref:reference/extensions/yaml-dsl.adoc[YAML] -* xref:reference/extensions/js-dsl.adoc[JavaScript] - == What's next? We recommend to continue with xref:user-guide/configuration.adoc[Configuration]. diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java index 1b485382f832..3f0857268041 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java @@ -17,6 +17,7 @@ package org.apache.camel.quarkus.core; import java.util.List; +import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.NamedNode; @@ -40,4 +41,12 @@ public String dumpBeansAsXml(CamelContext context, List beans) throws Ex throw new UnsupportedOperationException( "Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl"); } + + @Override + public String dumpDataFormatsAsXml(CamelContext context, Map dataFormats) + throws Exception { + throw new UnsupportedOperationException( + "Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl"); + } + } diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java index d3c916bfffcc..0e6eecdaceec 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java @@ -17,6 +17,7 @@ package org.apache.camel.quarkus.core; import java.util.List; +import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.NamedNode; @@ -41,4 +42,11 @@ public String dumpModelAsYaml(CamelContext context, NamedNode definition, boolea throw new UnsupportedOperationException( "Please add a dependency to camel-quarkus-yaml-io"); } + + @Override + public String dumpDataFormatsAsYaml(CamelContext context, Map dataFormats) + throws Exception { + throw new UnsupportedOperationException( + "Please add a dependency to camel-quarkus-yaml-io"); + } } diff --git a/extensions-jvm/etcd3/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-jvm/etcd3/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 7b631d083cee..8e7339e02497 100644 --- a/extensions-jvm/etcd3/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions-jvm/etcd3/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -32,3 +32,4 @@ metadata: - "integration" status: - "preview" + - "deprecated" \ No newline at end of file diff --git a/extensions/bindy/deployment/src/main/java/org/apache/camel/quarkus/component/bindy/deployment/BindyProcessor.java b/extensions/bindy/deployment/src/main/java/org/apache/camel/quarkus/component/bindy/deployment/BindyProcessor.java index e79349484202..718ae5c7a0b2 100644 --- a/extensions/bindy/deployment/src/main/java/org/apache/camel/quarkus/component/bindy/deployment/BindyProcessor.java +++ b/extensions/bindy/deployment/src/main/java/org/apache/camel/quarkus/component/bindy/deployment/BindyProcessor.java @@ -53,7 +53,7 @@ FeatureBuildItem feature() { @BuildStep NativeImageResourceDirectoryBuildItem resourceBundles() { - String resourcePath = String.format("com/ibm/icu/impl/data/icudt%db/brkitr", ICU_VERSION.getMajor()); + String resourcePath = String.format("com/ibm/icu/impl/data/icudata/brkitr", ICU_VERSION.getMajor()); return new NativeImageResourceDirectoryBuildItem(resourcePath); } diff --git a/extensions/groovy-dsl/deployment/pom.xml b/extensions/groovy-dsl/deployment/pom.xml deleted file mode 100644 index 4afad6dfb626..000000000000 --- a/extensions/groovy-dsl/deployment/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl-parent - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-groovy-dsl-deployment - Camel Quarkus :: Groovy DSL :: Deployment - - - - io.quarkiverse.groovy - quarkus-groovy-deployment - - - org.apache.camel.quarkus - camel-quarkus-core-deployment - - - org.apache.camel.quarkus - camel-quarkus-support-dsl-deployment - - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - diff --git a/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java b/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java deleted file mode 100644 index ff03faea7862..000000000000 --- a/extensions/groovy-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/groovy/deployment/GroovyDslProcessor.java +++ /dev/null @@ -1,197 +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.dsl.groovy.deployment; - -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - -import io.quarkus.deployment.annotations.BuildProducer; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.GeneratedClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; -import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.paths.PathCollection; -import org.apache.camel.CamelContext; -import org.apache.camel.Exchange; -import org.apache.camel.ExchangePattern; -import org.apache.camel.Message; -import org.apache.camel.quarkus.core.deployment.main.CamelMainHelper; -import org.apache.camel.quarkus.dsl.groovy.runtime.Configurer; -import org.apache.camel.quarkus.support.dsl.deployment.DslGeneratedClassBuildItem; -import org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor; -import org.apache.camel.spi.Resource; -import org.apache.camel.util.IOHelper; -import org.codehaus.groovy.control.CompilationUnit; -import org.codehaus.groovy.control.CompilerConfiguration; -import org.codehaus.groovy.control.Phases; -import org.codehaus.groovy.tools.GroovyClass; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.DotName; -import org.jboss.jandex.IndexView; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.determineName; -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.extractImports; - -public class GroovyDslProcessor { - - private static final Logger LOG = LoggerFactory.getLogger(GroovyDslProcessor.class); - private static final List> CAMEL_REFLECTIVE_CLASSES = Arrays.asList( - Exchange.class, - Message.class, - ExchangePattern.class, - CamelContext.class); - private static final String PACKAGE_NAME = "org.apache.camel.quarkus.dsl.groovy.generated"; - private static final String FILE_FORMAT = """ - package %s - %s - @groovy.transform.InheritConstructors - class %s extends %s { - void configure() { - %s - } - } - """; - - private static final String FEATURE = "camel-groovy-dsl"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) - void compileScriptsAOT(BuildProducer generatedClass, - BuildProducer reflectiveClass, - BuildProducer generatedGroovyClass, - CurateOutcomeBuildItem curateOutcomeBuildItem) throws Exception { - LOG.debug("Loading .groovy resources"); - Map nameToResource = new HashMap<>(); - CompilationUnit unit = new CompilationUnit(); - CamelMainHelper.forEachMatchingResource( - resource -> { - if (!resource.getLocation().endsWith(".groovy")) { - return; - } - try (InputStream is = resource.getInputStream()) { - String name = determineName(resource); - String fqn = String.format("%s.%s", PACKAGE_NAME, name); - unit.addSource(fqn, toGroovyClass(name, IOHelper.loadText(is))); - nameToResource.put(fqn, resource); - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - if (nameToResource.isEmpty()) { - return; - } - CompilerConfiguration cc = new CompilerConfiguration(); - cc.setClasspathList( - curateOutcomeBuildItem.getApplicationModel().getDependencies().stream() - .map(ResolvedDependency::getResolvedPaths) - .flatMap(PathCollection::stream) - .map(Objects::toString) - .toList()); - unit.configure(cc); - unit.compile(Phases.CLASS_GENERATION); - for (GroovyClass clazz : unit.getClasses()) { - String className = clazz.getName(); - generatedClass.produce(new GeneratedClassBuildItem(true, className, clazz.getBytes())); - if (nameToResource.containsKey(className)) { - reflectiveClass.produce(ReflectiveClassBuildItem.builder(className).build()); - generatedGroovyClass - .produce(new DslGeneratedClassBuildItem(className, nameToResource.get(className).getLocation())); - } - } - } - - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) - void registerReflectiveClasses( - BuildProducer reflectiveClass, - CombinedIndexBuildItem combinedIndexBuildItem) { - - IndexView view = combinedIndexBuildItem.getIndex(); - - for (Class type : CAMEL_REFLECTIVE_CLASSES) { - DotName name = DotName.createSimple(type.getName()); - - if (type.isInterface()) { - for (ClassInfo info : view.getAllKnownImplementors(name)) { - reflectiveClass.produce(ReflectiveClassBuildItem.builder(info.name().toString()).methods().build()); - } - } else { - for (ClassInfo info : view.getAllKnownSubclasses(name)) { - reflectiveClass.produce(ReflectiveClassBuildItem.builder(info.name().toString()).methods().build()); - } - } - - reflectiveClass.produce(ReflectiveClassBuildItem.builder(type).methods().fields(type.isEnum()).build()); - } - - Set> types = new HashSet<>(); - // Register all the Camel return types of public methods of the camel reflective classes for reflection to - // be accessible in native mode from a Groovy resource - for (Class c : CAMEL_REFLECTIVE_CLASSES) { - for (Method method : c.getMethods()) { - if (!method.getDeclaringClass().equals(Object.class)) { - Class returnType = method.getReturnType(); - if (returnType.getPackageName().startsWith("org.apache.camel.") - && !CAMEL_REFLECTIVE_CLASSES.contains(returnType)) { - types.add(returnType); - } - } - } - } - // Allow access to methods by reflection to be accessible in native mode from a Groovy resource - reflectiveClass.produce( - ReflectiveClassBuildItem.builder(types.toArray(new Class[0])).constructors(false).methods().build()); - - } - - /** - * Convert a Groovy script into a Groovy class to be able to compile it. - * - * @param name the name of the Groovy class - * @param contentResource the content of the Groovy script - * @return the content of the corresponding Groovy class. - */ - private static String toGroovyClass(String name, String contentResource) { - List imports = new ArrayList<>(); - imports.add("import org.apache.camel.*"); - imports.add("import org.apache.camel.spi.*"); - DslSupportProcessor.ExtractImportResult extractImportResult = extractImports(contentResource); - imports.addAll(extractImportResult.getImports()); - return String.format( - FILE_FORMAT, PACKAGE_NAME, String.join("\n", imports), name, Configurer.class.getName(), - extractImportResult.getContent()); - } -} diff --git a/extensions/groovy-dsl/pom.xml b/extensions/groovy-dsl/pom.xml deleted file mode 100644 index d82fe38244d8..000000000000 --- a/extensions/groovy-dsl/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-extensions - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-groovy-dsl-parent - Camel Quarkus :: Groovy DSL - pom - - - deployment - runtime - - diff --git a/extensions/groovy-dsl/runtime/pom.xml b/extensions/groovy-dsl/runtime/pom.xml deleted file mode 100644 index 79c517289de2..000000000000 --- a/extensions/groovy-dsl/runtime/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl-parent - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-groovy-dsl - Camel Quarkus :: Groovy DSL :: Runtime - Support for parsing Groovy route definitions at runtime - - - 1.8.0 - 2.16.0 - true - - - - - io.quarkiverse.groovy - quarkus-groovy - - - org.apache.camel.quarkus - camel-quarkus-core - - - org.apache.camel.quarkus - camel-quarkus-support-dsl - - - org.apache.camel - camel-groovy-dsl - - - - - - - io.quarkus - quarkus-extension-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - diff --git a/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/Configurer.java b/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/Configurer.java deleted file mode 100644 index b4c39432e7da..000000000000 --- a/extensions/groovy-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/groovy/runtime/Configurer.java +++ /dev/null @@ -1,30 +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.dsl.groovy.runtime; - -import org.apache.camel.builder.endpoint.EndpointRouteBuilder; -import org.apache.camel.dsl.groovy.common.GroovyDSL; -import org.apache.camel.quarkus.support.dsl.runtime.RoutesBuilderConfigurer; - -public abstract class Configurer extends GroovyDSL implements RoutesBuilderConfigurer { - - // The constructor needs to remain public to be accessible from a Groovy Script - public Configurer(EndpointRouteBuilder builder) { - super(builder); - } - -} diff --git a/extensions/groovy-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/groovy-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index c1f868e18bd7..000000000000 --- a/extensions/groovy-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,34 +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. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel Groovy DSL" -description: "Support for parsing Groovy route definitions at runtime" -metadata: - icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" - sponsor: "Apache Software Foundation" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/groovy-dsl.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/jms/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jms/runtime/src/main/resources/META-INF/quarkus-extension.yaml index e14730b725ea..35672d374b97 100644 --- a/extensions/jms/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions/jms/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -22,7 +22,7 @@ # --- name: "Camel JMS" -description: "Sent and receive messages to/from a JMS Queue or Topic" +description: "Send and receive messages to/from JMS message brokers" metadata: icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" sponsor: "Apache Software Foundation" diff --git a/extensions/js-dsl/deployment/pom.xml b/extensions/js-dsl/deployment/pom.xml deleted file mode 100644 index e25dc30ed48a..000000000000 --- a/extensions/js-dsl/deployment/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-js-dsl-parent - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-js-dsl-deployment - Camel Quarkus :: JavaScript DSL DSL :: Deployment - - - - org.apache.camel.quarkus - camel-quarkus-core-deployment - - - org.apache.camel.quarkus - camel-quarkus-js-dsl - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - diff --git a/extensions/js-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/js/deployment/JavaScriptDslFeature.java b/extensions/js-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/js/deployment/JavaScriptDslFeature.java deleted file mode 100644 index bd14ef10a0af..000000000000 --- a/extensions/js-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/js/deployment/JavaScriptDslFeature.java +++ /dev/null @@ -1,30 +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.dsl.js.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -public class JavaScriptDslFeature { - private static final String FEATURE = "camel-js-dsl"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/extensions/js-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/js/deployment/JavaScriptDslProcessor.java b/extensions/js-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/js/deployment/JavaScriptDslProcessor.java deleted file mode 100644 index 8232ccfcd93f..000000000000 --- a/extensions/js-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/js/deployment/JavaScriptDslProcessor.java +++ /dev/null @@ -1,224 +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.dsl.js.deployment; - -import java.lang.reflect.Method; -import java.time.Duration; -import java.time.Instant; -import java.time.temporal.Temporal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.stream.Collectors; - -import io.quarkus.arc.Components; -import io.quarkus.deployment.annotations.BuildProducer; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveMethodBuildItem; -import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; -import org.apache.camel.CamelContext; -import org.apache.camel.Component; -import org.apache.camel.Endpoint; -import org.apache.camel.Exchange; -import org.apache.camel.ExchangePattern; -import org.apache.camel.Message; -import org.apache.camel.NamedNode; -import org.apache.camel.builder.DataFormatClause; -import org.apache.camel.builder.ExpressionClause; -import org.apache.camel.dsl.js.JavaScriptDSL; -import org.apache.camel.model.Block; -import org.apache.camel.model.FromDefinition; -import org.apache.camel.model.NoOutputDefinition; -import org.apache.camel.model.OptionalIdentifiedDefinition; -import org.apache.camel.model.ProcessDefinition; -import org.apache.camel.model.ProcessorDefinition; -import org.apache.camel.model.RouteDefinition; -import org.apache.camel.model.ToDefinition; -import org.apache.camel.model.dataformat.JsonLibrary; -import org.apache.camel.model.language.ExpressionDefinition; -import org.apache.camel.model.rest.RestSecurityDefinition; -import org.apache.camel.model.transformer.TransformerDefinition; -import org.apache.camel.model.validator.ValidatorDefinition; -import org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslBiConsumer; -import org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslBiFunction; -import org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslBiPredicate; -import org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslConsumer; -import org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslFunction; -import org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslPredicate; -import org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslSupplier; -import org.apache.camel.spi.ExchangeFormatter; -import org.apache.camel.spi.NamespaceAware; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.DotName; -import org.jboss.jandex.IndexView; - -public class JavaScriptDslProcessor { - private static final List> JAVA_CLASSES = Arrays.asList( - Character.class, - Byte.class, - CharSequence.class, String.class, - Number.class, - Integer.class, - Long.class, - Float.class, - Double.class, - // Time - Date.class, - Temporal.class, - Instant.class, - Duration.class, - // Containers - Map.class, HashMap.class, TreeMap.class, - List.class, ArrayList.class, LinkedList.class, - Set.class, HashSet.class, TreeSet.class); - - private static final List> CAMEL_REFLECTIVE_CLASSES = Arrays.asList( - ExchangeFormatter.class, - RouteDefinition.class, - ProcessorDefinition.class, - DataFormatClause.class, - FromDefinition.class, - ToDefinition.class, - ExpressionDefinition.class, - ProcessDefinition.class, - ExpressionDefinition.class, - ExpressionClause.class, - Exchange.class, - Message.class, - ExchangePattern.class, - Endpoint.class, - CamelContext.class, - JsonLibrary.class, - NamedNode.class, - OptionalIdentifiedDefinition.class, - NamespaceAware.class, - Block.class, - RestSecurityDefinition.class, - ValidatorDefinition.class, - TransformerDefinition.class, - NoOutputDefinition.class); - public static final String BUILDER_CLASS_SUFFIX = "Builders"; - - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) - void registerReflectiveClasses( - BuildProducer reflectiveClass, - BuildProducer reflectiveMethods, - CombinedIndexBuildItem combinedIndexBuildItem) { - - IndexView view = combinedIndexBuildItem.getIndex(); - - for (Class type : CAMEL_REFLECTIVE_CLASSES) { - DotName name = DotName.createSimple(type.getName()); - - if (type.isInterface()) { - for (ClassInfo info : view.getAllKnownImplementors(name)) { - reflectiveClass.produce( - ReflectiveClassBuildItem.builder(info.name().toString()).methods().build()); - } - } else { - for (ClassInfo info : view.getAllKnownSubclasses(name)) { - reflectiveClass.produce( - ReflectiveClassBuildItem.builder(info.name().toString()).methods().build()); - } - } - - reflectiveClass.produce( - ReflectiveClassBuildItem.builder(type) - .constructors(true) - .methods(true) - .fields(type.isEnum()) - .build()); - } - - for (Class type : JAVA_CLASSES) { - reflectiveClass.produce(ReflectiveClassBuildItem.builder(type).methods().build()); - } - - reflectiveClass.produce(ReflectiveClassBuildItem.builder(Components.class).methods().build()); - reflectiveClass.produce(ReflectiveClassBuildItem.builder(JavaScriptDSL.class).fields().build()); - reflectiveClass.produce(ReflectiveClassBuildItem.builder("org.apache.camel.converter.jaxp.XmlConverter").methods() - .build()); - - Set existingComponents = view.getAllKnownImplementors(Component.class) - .stream() - .map(JavaScriptDslProcessor::extractName) - .collect(Collectors.toSet()); - - Set> types = new HashSet<>(); - // Register all public methods of JavaScriptDSL for reflection to be accessible in native mode from a JavaScript resource - for (Method method : JavaScriptDSL.class.getMethods()) { - Class declaringClass = method.getDeclaringClass(); - if (!declaringClass.equals(Object.class)) { - String declaringClassName = declaringClass.getSimpleName(); - // Keep only the methods that are not from builder classes or that are from builder classes of included - // components - if (!declaringClassName.endsWith(BUILDER_CLASS_SUFFIX) || existingComponents.contains( - declaringClassName.substring(0, declaringClassName.length() - BUILDER_CLASS_SUFFIX.length()))) { - Class returnType = method.getReturnType(); - types.add(returnType); - reflectiveMethods.produce(new ReflectiveMethodBuildItem(method)); - if (declaringClassName.endsWith(BUILDER_CLASS_SUFFIX)) { - // Add the return type of the advanced method if any - Arrays.stream(returnType.getMethods()) - .filter(m -> m.getName().equals("advanced") && m.getParameterTypes().length == 0) - .findAny() - .ifPresent(m -> types.add(m.getReturnType())); - } - } - } - } - // Register all the Camel return types of public methods of the camel reflective classes for reflection to - // be accessible in native mode from a JavaScript resource - for (Class c : CAMEL_REFLECTIVE_CLASSES) { - for (Method method : c.getMethods()) { - if (!method.getDeclaringClass().equals(Object.class)) { - Class returnType = method.getReturnType(); - if (returnType.getPackageName().startsWith("org.apache.camel.") - && !CAMEL_REFLECTIVE_CLASSES.contains(returnType)) { - types.add(returnType); - } - } - } - } - // Allow access to methods by reflection to be accessible in native mode from a JavaScript resource - reflectiveClass.produce(ReflectiveClassBuildItem.builder(types.toArray(new Class[0])).constructors(false) - .methods().build()); - // Register for reflection the runtime implementation of the main functional interfaces. - reflectiveClass.produce( - ReflectiveClassBuildItem.builder(JavaScriptDslBiConsumer.class, JavaScriptDslBiFunction.class, - JavaScriptDslBiPredicate.class, JavaScriptDslConsumer.class, JavaScriptDslFunction.class, - JavaScriptDslPredicate.class, org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslProcessor.class, - JavaScriptDslSupplier.class).build()); - } - - private static String extractName(ClassInfo classInfo) { - String className = classInfo.simpleName(); - int index = className.lastIndexOf('.'); - return className.substring(index + 1).replace("Component", ""); - } -} diff --git a/extensions/js-dsl/pom.xml b/extensions/js-dsl/pom.xml deleted file mode 100644 index 4ee467dca5fe..000000000000 --- a/extensions/js-dsl/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-extensions - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-js-dsl-parent - Camel Quarkus :: JavaScript DSL - pom - - - deployment - runtime - - diff --git a/extensions/js-dsl/runtime/pom.xml b/extensions/js-dsl/runtime/pom.xml deleted file mode 100644 index 32f2f93e55ed..000000000000 --- a/extensions/js-dsl/runtime/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-js-dsl-parent - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-js-dsl - Camel Quarkus :: JavaScript DSL :: Runtime - An JavaScript stack for parsing JavaScript route definitions - - - 1.8.0 - 1.8.0 - true - experimental - - - - - org.apache.camel.quarkus - camel-quarkus-core - - - org.apache.camel - camel-js-dsl - - - org.graalvm.js - js-language - - - - - - - io.quarkus - quarkus-extension-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - diff --git a/extensions/js-dsl/runtime/src/main/doc/limitations.adoc b/extensions/js-dsl/runtime/src/main/doc/limitations.adoc deleted file mode 100644 index a287a0bb785e..000000000000 --- a/extensions/js-dsl/runtime/src/main/doc/limitations.adoc +++ /dev/null @@ -1,33 +0,0 @@ -Since the function `Java.extend` https://www.graalvm.org/latest/reference-manual/js/JavaInteroperability/#extending-java-classes[is only available in JVM mode], by default, there is no way to implement a functional interface like a `Camel Processor` in JavaScript that is supported by the native compilation. - -As workaround, an implementation of the main functional interfaces (`org.apache.camel.Processor`, `java.util.function.Consumer`, `java.util.function.Supplier`, `java.util.function.Function`, `java.util.function.Predicate`, `java.util.function.BiConsumer`, `java.util.function.BiFunction` and `java.util.function.BiPredicate`) is available in the package `org.apache.camel.quarkus.dsl.js.runtime` whose simple name is prefixed by `JavaScriptDsl`. For each implementation, the body of the method to implement must be provided to the constructor. When the method to implement has arguments, the name of the arguments can also be provided to the constructor if the default names are not good enough. - -So for example, to implement a `Camel Processor` instead of using the function `Java.extend` which is only available in JVM mode as next: - -[source,javascript] ----- -const Processor = Java.type("org.apache.camel.Processor"); // <1> -const p = Java.extend(Processor); // <2> -const a = new p(e => { e.getMessage().setBody('Some Content') }); // <3> - -from('direct:a') - .process(a); // <4> ----- -<1> Retrieve the class `org.apache.camel.Processor` -<2> Create a new class that implements the functional interface `org.apache.camel.Processor` -<3> Instantiate the new class with a function as argument representing the implementation of the method to implement -<4> Provide the processor to the route definition. - -To have a code compatible with the both modes, it is possible to instantiate directly the implementation of the corresponding functional interface which is in this case the class `org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslProcessor` as next: - -[source,javascript] ----- -const Processor = Java.type("org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslProcessor"); // <1> -const p = new Processor("e", `e.getMessage().setBody('Some Content')`); // <2> - -from('direct:a') - .process(p); // <3> ----- -<1> Retrieve the class `org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslProcessor` -<2> Instantiate the dedicated class with the name of the argument `e` as first parameter and the body of the function as second parameter representing the implementation of the method to implement -<3> Provide the processor to the route definition. diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiConsumer.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiConsumer.java deleted file mode 100644 index ca5e38f82c23..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiConsumer.java +++ /dev/null @@ -1,81 +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.dsl.js.runtime; - -import java.util.function.BiConsumer; - -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Value; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslBiConsumer} is meant to be used as type of {@link BiConsumer} from a JavaScript file to remain - * compatible - * with the native mode that doesn't support the function {@code Java.extend}. - * - * @param the type of the first argument to the operation - * @param the type of the second argument to the operation - */ -public final class JavaScriptDslBiConsumer implements BiConsumer { - - /** - * The name of the first argument. - */ - private final String firstArgumentName; - /** - * The name of the second argument. - */ - private final String secondArgumentName; - /** - * The source of the consumer. - */ - private final CharSequence source; - - /** - * Construct a {@code JavaScriptDslBiConsumer} with the given source, {@code t} as first argument name and {@code u} as - * second argument. - * - * @param source the source of the consumer. - */ - public JavaScriptDslBiConsumer(CharSequence source) { - this("t", "u", source); - } - - /** - * Construct a {@code JavaScriptDslBiConsumer} with the given source and argument names. - * - * @param firstArgumentName the name of the first argument. - * @param secondArgumentName the name of the second argument. - * @param source the source of the consumer. - */ - public JavaScriptDslBiConsumer(String firstArgumentName, String secondArgumentName, CharSequence source) { - this.firstArgumentName = firstArgumentName; - this.secondArgumentName = secondArgumentName; - this.source = source; - } - - @Override - public void accept(T t, U u) { - try (final Context context = JavaScriptDslHelper.createBuilder().build()) { - final Value bindings = context.getBindings(LANGUAGE_ID); - bindings.putMember(firstArgumentName, t); - bindings.putMember(secondArgumentName, u); - context.eval(LANGUAGE_ID, source); - } - } -} diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiFunction.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiFunction.java deleted file mode 100644 index 0148bef5b9cb..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiFunction.java +++ /dev/null @@ -1,84 +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.dsl.js.runtime; - -import java.util.function.BiFunction; - -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Value; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslBiFunction} is meant to be used as type of {@link BiFunction} from a JavaScript file to remain - * compatible - * with the native mode that doesn't support the function {@code Java.extend}. - * - * @param the type of the first argument to the function - * @param the type of the second argument to the function - * @param the type of the result of the function - */ -public final class JavaScriptDslBiFunction implements BiFunction { - - /** - * The name of the first argument. - */ - private final String firstArgumentName; - /** - * The name of the second argument. - */ - private final String secondArgumentName; - /** - * The source of the function. - */ - private final CharSequence source; - - /** - * Construct a {@code JavaScriptDslBiFunction} with the given source, {@code t} as first argument name and {@code u} as - * second argument. - * - * @param source the source of the function. - */ - public JavaScriptDslBiFunction(CharSequence source) { - this("t", "u", source); - } - - /** - * Construct a {@code JavaScriptDslBiFunction} with the given source and argument names. - * - * @param firstArgumentName the name of the first argument. - * @param secondArgumentName the name of the second argument. - * @param source the source of the function. - */ - public JavaScriptDslBiFunction(String firstArgumentName, String secondArgumentName, CharSequence source) { - this.firstArgumentName = firstArgumentName; - this.secondArgumentName = secondArgumentName; - this.source = source; - } - - @SuppressWarnings("unchecked") - @Override - public R apply(T t, U u) { - try (final Context context = JavaScriptDslHelper.createBuilder().build()) { - final Value bindings = context.getBindings(LANGUAGE_ID); - bindings.putMember(firstArgumentName, t); - bindings.putMember(secondArgumentName, u); - Value value = context.eval(LANGUAGE_ID, source); - return value == null ? null : (R) value.as(Object.class); - } - } -} diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiPredicate.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiPredicate.java deleted file mode 100644 index 43f7e979445b..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslBiPredicate.java +++ /dev/null @@ -1,82 +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.dsl.js.runtime; - -import java.util.function.BiPredicate; - -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Value; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslBiPredicate} is meant to be used as type of {@link BiPredicate} from a JavaScript file to remain - * compatible - * with the native mode that doesn't support the function {@code Java.extend}. - * - * @param the type of the first argument to the predicate - * @param the type of the second argument to the predicate - */ -public final class JavaScriptDslBiPredicate implements BiPredicate { - - /** - * The name of the first argument. - */ - private final String firstArgumentName; - /** - * The name of the second argument. - */ - private final String secondArgumentName; - /** - * The source of the predicate. - */ - private final CharSequence source; - - /** - * Construct a {@code JavaScriptDslBiPredicate} with the given source, {@code t} as first argument name and {@code u} as - * second argument. - * - * @param source the source of the predicate. - */ - public JavaScriptDslBiPredicate(CharSequence source) { - this("t", "u", source); - } - - /** - * Construct a {@code JavaScriptDslBiPredicate} with the given source and argument names. - * - * @param firstArgumentName the name of the first argument. - * @param secondArgumentName the name of the second argument. - * @param source the source of the consumer. - */ - public JavaScriptDslBiPredicate(String firstArgumentName, String secondArgumentName, CharSequence source) { - this.firstArgumentName = firstArgumentName; - this.secondArgumentName = secondArgumentName; - this.source = source; - } - - @Override - public boolean test(T t, U u) { - try (final Context context = JavaScriptDslHelper.createBuilder().build()) { - final Value bindings = context.getBindings(LANGUAGE_ID); - bindings.putMember(firstArgumentName, t); - bindings.putMember(secondArgumentName, u); - Value value = context.eval(LANGUAGE_ID, source); - return value != null && value.asBoolean(); - } - } -} diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslConsumer.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslConsumer.java deleted file mode 100644 index 0b58ccf3ece7..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslConsumer.java +++ /dev/null @@ -1,72 +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.dsl.js.runtime; - -import java.util.function.Consumer; - -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Value; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslConsumer} is meant to be used as type of {@link Consumer} from a JavaScript file to remain - * compatible - * with the native mode that doesn't support the function {@code Java.extend}. - * - * @param the type of the input to the operation - */ -public final class JavaScriptDslConsumer implements Consumer { - - /** - * The name of the argument. - */ - private final String argumentName; - /** - * The source of the consumer. - */ - private final CharSequence source; - - /** - * Construct a {@code JavaScriptDslConsumer} with the given source and {@code t} as argument name. - * - * @param source the source of the consumer. - */ - public JavaScriptDslConsumer(CharSequence source) { - this("t", source); - } - - /** - * Construct a {@code JavaScriptDslConsumer} with the given source and argument name. - * - * @param argumentName the name of the argument. - * @param source the source of the consumer. - */ - public JavaScriptDslConsumer(String argumentName, CharSequence source) { - this.argumentName = argumentName; - this.source = source; - } - - @Override - public void accept(T t) { - try (final Context context = JavaScriptDslHelper.createBuilder().build()) { - final Value bindings = context.getBindings(LANGUAGE_ID); - bindings.putMember(argumentName, t); - context.eval(LANGUAGE_ID, source); - } - } -} diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslFunction.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslFunction.java deleted file mode 100644 index 2ee269bc3694..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslFunction.java +++ /dev/null @@ -1,75 +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.dsl.js.runtime; - -import java.util.function.Function; - -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Value; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslFunction} is meant to be used as type of {@link Function} from a JavaScript file to remain - * compatible - * with the native mode that doesn't support the function {@code Java.extend}. - * - * @param the type of the input to the function - * @param the type of the result of the function - */ -public final class JavaScriptDslFunction implements Function { - - /** - * The name of the argument. - */ - private final String argumentName; - /** - * The source of the function. - */ - private final CharSequence source; - - /** - * Construct a {@code JavaScriptDslFunction} with the given source and {@code t} as argument name. - * - * @param source the source of the function. - */ - public JavaScriptDslFunction(CharSequence source) { - this("t", source); - } - - /** - * Construct a {@code JavaScriptDslFunction} with the given source and argument name. - * - * @param argumentName the name of the argument. - * @param source the source of the function. - */ - public JavaScriptDslFunction(String argumentName, CharSequence source) { - this.argumentName = argumentName; - this.source = source; - } - - @SuppressWarnings("unchecked") - @Override - public R apply(T t) { - try (final Context context = JavaScriptDslHelper.createBuilder().build()) { - final Value bindings = context.getBindings(LANGUAGE_ID); - bindings.putMember(argumentName, t); - Value value = context.eval(LANGUAGE_ID, source); - return value == null ? null : (R) value.as(Object.class); - } - } -} diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslHelper.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslHelper.java deleted file mode 100644 index 90d65dc1f45d..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslHelper.java +++ /dev/null @@ -1,46 +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.dsl.js.runtime; - -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.HostAccess; -import org.graalvm.polyglot.PolyglotAccess; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslHelper} is a utility class for the runtime implementation of the main functional interfaces. - */ -final class JavaScriptDslHelper { - - private JavaScriptDslHelper() { - - } - - /** - * @return a builder of context properly configured to evaluate a JavaScript expression. - */ - static Context.Builder createBuilder() { - return Context.newBuilder(LANGUAGE_ID) - .allowHostAccess(HostAccess.ALL) - .allowExperimentalOptions(true) - .allowHostClassLookup(s -> true) - .allowPolyglotAccess(PolyglotAccess.NONE) - .allowIO(true) - .option("engine.WarnInterpreterOnly", "false"); - } -} diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslPredicate.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslPredicate.java deleted file mode 100644 index f9cc0105cdb6..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslPredicate.java +++ /dev/null @@ -1,72 +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.dsl.js.runtime; - -import java.util.function.Predicate; - -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Value; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslPredicate} is meant to be used as type of {@link Predicate} from a JavaScript file to remain - * compatible - * with the native mode that doesn't support the function {@code Java.extend}. - * - * @param the type of the input to the predicate - */ -public final class JavaScriptDslPredicate implements Predicate { - - /** - * The name of the argument. - */ - private final String argumentName; - /** - * The source of the predicate. - */ - private final CharSequence source; - - /** - * Construct a {@code JavaScriptDslPredicate} with the given source and {@code t} as argument name. - * - * @param source the source of the predicate. - */ - public JavaScriptDslPredicate(CharSequence source) { - this("t", source); - } - - /** - * Construct a {@code JavaScriptDslPredicate} with the given source and argument name. - * - * @param source the source of the predicate. - */ - public JavaScriptDslPredicate(String argumentName, CharSequence source) { - this.argumentName = argumentName; - this.source = source; - } - - @Override - public boolean test(T t) { - try (final Context context = JavaScriptDslHelper.createBuilder().build()) { - final Value bindings = context.getBindings(LANGUAGE_ID); - bindings.putMember(argumentName, t); - Value value = context.eval(LANGUAGE_ID, source); - return value != null && value.asBoolean(); - } - } -} diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslProcessor.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslProcessor.java deleted file mode 100644 index 518311cef0a5..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslProcessor.java +++ /dev/null @@ -1,69 +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.dsl.js.runtime; - -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Value; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslProcessor} is meant to be used as type of {@link Processor} from a JavaScript file to remain - * compatible - * with the native mode that doesn't support the function {@code Java.extend}. - */ -public final class JavaScriptDslProcessor implements Processor { - - /** - * The name of the argument. - */ - private final String argumentName; - /** - * The source of the processor. - */ - private final CharSequence source; - - /** - * Construct a {@code JavaScriptDslProcessor} with the given source and {@code exchange} as argument name. - * - * @param source the source of the processor. - */ - public JavaScriptDslProcessor(CharSequence source) { - this("exchange", source); - } - - /** - * Construct a {@code JavaScriptDslProcessor} with the given source and argument name. - * - * @param source the source of the processor. - */ - public JavaScriptDslProcessor(String argumentName, CharSequence source) { - this.argumentName = argumentName; - this.source = source; - } - - @Override - public void process(Exchange exchange) { - try (final Context context = JavaScriptDslHelper.createBuilder().build()) { - final Value bindings = context.getBindings(LANGUAGE_ID); - bindings.putMember(argumentName, exchange); - context.eval(LANGUAGE_ID, source); - } - } -} diff --git a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslSupplier.java b/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslSupplier.java deleted file mode 100644 index 74a83e73e07c..000000000000 --- a/extensions/js-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/js/runtime/JavaScriptDslSupplier.java +++ /dev/null @@ -1,57 +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.dsl.js.runtime; - -import java.util.function.Supplier; - -import org.graalvm.polyglot.Context; -import org.graalvm.polyglot.Value; - -import static org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader.LANGUAGE_ID; - -/** - * {@code JavaScriptDslSupplier} is meant to be used as type of {@link Supplier} from a JavaScript file to remain - * compatible - * with the native mode that doesn't support the function {@code Java.extend}. - * - * @param the type of results supplied by this supplier - */ -public final class JavaScriptDslSupplier implements Supplier { - - /** - * The source of the supplier. - */ - private final CharSequence source; - - /** - * Construct a {@code JavaScriptDslSupplier} with the given source. - * - * @param source the source of the supplier. - */ - public JavaScriptDslSupplier(CharSequence source) { - this.source = source; - } - - @SuppressWarnings("unchecked") - @Override - public T get() { - try (final Context context = JavaScriptDslHelper.createBuilder().build()) { - Value value = context.eval(LANGUAGE_ID, source); - return value == null ? null : (T) value.as(Object.class); - } - } -} diff --git a/extensions/js-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/js-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index 5f2481d79fd9..000000000000 --- a/extensions/js-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,35 +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. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel JavaScript DSL" -description: "An JavaScript stack for parsing JavaScript route definitions" -metadata: - icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" - sponsor: "Apache Software Foundation" - unlisted: true - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/js-dsl.html" - categories: - - "integration" - status: - - "experimental" - - "deprecated" \ No newline at end of file diff --git a/extensions/jsh-dsl/deployment/pom.xml b/extensions/jsh-dsl/deployment/pom.xml deleted file mode 100644 index 2a98e276f3ea..000000000000 --- a/extensions/jsh-dsl/deployment/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl-parent - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-jsh-dsl-deployment - Camel Quarkus :: JavaShell DSL :: Deployment - - - - org.apache.camel.quarkus - camel-quarkus-core-deployment - - - org.apache.camel.quarkus - camel-quarkus-support-dsl-deployment - - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - diff --git a/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java b/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java deleted file mode 100644 index 68cd9129760d..000000000000 --- a/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java +++ /dev/null @@ -1,190 +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.dsl.jsh.deployment; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -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.GeneratedClassBuildItem; -import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.dev.CompilationProvider; -import io.quarkus.deployment.dev.JavaCompilationProvider; -import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem; -import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; -import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.paths.PathCollection; -import org.apache.camel.quarkus.core.deployment.main.CamelMainHelper; -import org.apache.camel.quarkus.core.deployment.util.CamelSupport; -import org.apache.camel.quarkus.dsl.jsh.runtime.Configurer; -import org.apache.camel.quarkus.support.dsl.deployment.DslGeneratedClassBuildItem; -import org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor; -import org.apache.camel.spi.Resource; -import org.apache.camel.util.IOHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.CLASS_EXT; -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.determineName; -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.extractImports; - -class JshDslProcessor { - private static final Logger LOG = LoggerFactory.getLogger(JshDslProcessor.class); - private static final String PACKAGE_NAME = "org.apache.camel.quarkus.dsl.jsh.generated"; - private static final String FILE_FORMAT = "package %s;\n" + - "%s\n" + - "public class %s extends %s { \n" + - " public %s(EndpointRouteBuilder builder, CamelContext context) {\n" + - " super(builder, context);\n" + - " }\n" + - " public void configure() { \n" + - " %s\n" + - " }\n" + - "}"; - private static final String FEATURE = "camel-jsh-dsl"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) - void compileScriptsAOT(BuildProducer generatedClass, - BuildProducer generatedResource, - BuildProducer reflectiveClass, - BuildProducer generatedJavaClass, - BuildSystemTargetBuildItem buildSystemTargetBuildItem, - CurateOutcomeBuildItem curateOutcomeBuildItem) throws Exception { - LOG.debug("Loading .jsh resources"); - final Path projectDir = Paths.get(".").toAbsolutePath().normalize(); - Path outputDirectory = buildSystemTargetBuildItem.getOutputDirectory(); - final Path generatedSourceDir = outputDirectory.resolve("jsh-dsl/generated-sources"); - Files.createDirectories(generatedSourceDir); - final Path generatedSourceHomeDir = generatedSourceDir.resolve(PACKAGE_NAME.replace('.', File.separatorChar)); - Files.createDirectories(generatedSourceHomeDir); - Map nameToResource = new HashMap<>(); - Set filesToCompile = new HashSet<>(); - CamelMainHelper.forEachMatchingResource( - resource -> { - if (!resource.getLocation().endsWith(".jsh")) { - return; - } - String name = determineName(resource); - try (InputStream is = resource.getInputStream()) { - String content = toJavaClass(name, IOHelper.loadText(is)); - LOG.debug("Generated Java source content:\n {}", content); - final Path sourceFile = generatedSourceHomeDir.resolve(String.format("%s.java", name)); - Files.write(sourceFile, content.getBytes(StandardCharsets.UTF_8)); - filesToCompile.add(sourceFile.toFile()); - nameToResource.put(String.format("%s.%s", PACKAGE_NAME, name), resource); - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - - if (filesToCompile.isEmpty()) { - return; - } - final Path classesDir = outputDirectory.resolve("jsh-dsl/generated-classes"); - Files.createDirectories(classesDir); - CompilationProvider.Context context = new CompilationProvider.Context( - FEATURE, - curateOutcomeBuildItem.getApplicationModel().getDependencies().stream() - .map(ResolvedDependency::getResolvedPaths) - .flatMap(PathCollection::stream) - .map(Path::toFile) - .filter(f -> f.getName().endsWith(".jar")) - .collect(Collectors.toSet()), - Collections.emptySet(), - projectDir.toFile(), - generatedSourceDir.toFile(), - classesDir.toFile(), - StandardCharsets.UTF_8.name(), - Collections.emptyMap(), - CamelSupport.COMPILATION_JVM_TARGET, - null, - null, - Collections.emptyList(), - Collections.emptyList(), - null, - Collections.emptySet(), - Collections.emptyList(), - null); - try (JavaCompilationProvider compiler = new JavaCompilationProvider()) { - compiler.compile(filesToCompile, context); - } - - try (Stream classFiles = Files.walk(classesDir)) { - classFiles - .filter(Files::isRegularFile) - .forEach(p -> { - String relativePath = classesDir.relativize(p).toString(); - String className = relativePath.replace(File.separatorChar, '.').substring(0, - relativePath.length() - CLASS_EXT.length()); - try { - generatedClass.produce(new GeneratedClassBuildItem(true, className, Files.readAllBytes(p))); - if (nameToResource.containsKey(className)) { - reflectiveClass.produce( - ReflectiveClassBuildItem.builder(className).build()); - generatedJavaClass - .produce(new DslGeneratedClassBuildItem(className, - nameToResource.get(className).getLocation(), true)); - } - } catch (IOException e) { - throw new RuntimeException("Could not read " + p); - } - }); - } - } - - /** - * Convert a JShell script into a Java class to be able to compile it. - * - * @param name the name of the Java class - * @param contentResource the content of the JShell script - * @return the content of the corresponding Java class. - */ - private static String toJavaClass(String name, String contentResource) { - List imports = new ArrayList<>(); - imports.add("import org.apache.camel.*;"); - imports.add("import org.apache.camel.spi.*;"); - imports.add("import org.apache.camel.builder.endpoint.EndpointRouteBuilder;"); - DslSupportProcessor.ExtractImportResult extractImportResult = extractImports(contentResource); - imports.addAll(extractImportResult.getImports()); - return String.format( - FILE_FORMAT, PACKAGE_NAME, String.join("\n", imports), name, - Configurer.class.getName(), name, extractImportResult.getContent()); - } -} diff --git a/extensions/jsh-dsl/pom.xml b/extensions/jsh-dsl/pom.xml deleted file mode 100644 index 8ac3f5a3f20c..000000000000 --- a/extensions/jsh-dsl/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-extensions - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-jsh-dsl-parent - Camel Quarkus :: JavaShell DSL - pom - - - deployment - runtime - - diff --git a/extensions/jsh-dsl/runtime/pom.xml b/extensions/jsh-dsl/runtime/pom.xml deleted file mode 100644 index 1c1bedbb0a89..000000000000 --- a/extensions/jsh-dsl/runtime/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl-parent - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-jsh-dsl - Camel Quarkus :: JavaShell DSL :: Runtime - Camel DSL with JavaShell - - - 2.16.0 - 2.16.0 - - - - - org.apache.camel.quarkus - camel-quarkus-core - - - org.apache.camel.quarkus - camel-quarkus-support-dsl - - - org.apache.camel - camel-jsh-dsl - - - org.graalvm.sdk - nativeimage - provided - - - - - - - io.quarkus - quarkus-extension-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - diff --git a/extensions/jsh-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/jsh/runtime/Configurer.java b/extensions/jsh-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/jsh/runtime/Configurer.java deleted file mode 100644 index 6084efe09591..000000000000 --- a/extensions/jsh-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/jsh/runtime/Configurer.java +++ /dev/null @@ -1,35 +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.dsl.jsh.runtime; - -import org.apache.camel.CamelContext; -import org.apache.camel.builder.endpoint.EndpointRouteBuilder; -import org.apache.camel.quarkus.support.dsl.runtime.RoutesBuilderConfigurer; -import org.apache.camel.spi.Registry; - -public abstract class Configurer implements RoutesBuilderConfigurer { - - protected final EndpointRouteBuilder builder; - protected final CamelContext context; - protected final Registry registry; - - protected Configurer(EndpointRouteBuilder builder, CamelContext context) { - this.builder = builder; - this.context = context; - this.registry = context.getRegistry(); - } -} diff --git a/extensions/jsh-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/jsh/runtime/graal/SubstituteJshRoutesBuilderLoader.java b/extensions/jsh-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/jsh/runtime/graal/SubstituteJshRoutesBuilderLoader.java deleted file mode 100644 index 3e86c6807552..000000000000 --- a/extensions/jsh-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/jsh/runtime/graal/SubstituteJshRoutesBuilderLoader.java +++ /dev/null @@ -1,33 +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.dsl.jsh.runtime.graal; - -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; -import org.apache.camel.RoutesBuilder; -import org.apache.camel.dsl.jsh.JshRoutesBuilderLoader; -import org.apache.camel.spi.Resource; - -@TargetClass(JshRoutesBuilderLoader.class) -final class SubstituteJshRoutesBuilderLoader { - - @Substitute - public RoutesBuilder loadRoutesBuilder(Resource resource) { - // Do nothing - return null; - } -} diff --git a/extensions/jsh-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/jsh-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index c9b34b22a380..000000000000 --- a/extensions/jsh-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,34 +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. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel JavaShell DSL" -description: "Camel DSL with JavaShell" -metadata: - icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" - sponsor: "Apache Software Foundation" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/jsh-dsl.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/knative/deployment/src/main/java/org/apache/camel/quarkus/component/knative/deployment/KnativeProcessor.java b/extensions/knative/deployment/src/main/java/org/apache/camel/quarkus/component/knative/deployment/KnativeProcessor.java index 3076c00cab65..14678d206b5d 100644 --- a/extensions/knative/deployment/src/main/java/org/apache/camel/quarkus/component/knative/deployment/KnativeProcessor.java +++ b/extensions/knative/deployment/src/main/java/org/apache/camel/quarkus/component/knative/deployment/KnativeProcessor.java @@ -24,8 +24,10 @@ import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; +import io.quarkus.runtime.RuntimeValue; import io.quarkus.vertx.core.deployment.CoreVertxBuildItem; import io.quarkus.vertx.http.deployment.VertxWebRouterBuildItem; +import org.apache.camel.CamelContext; import org.apache.camel.component.knative.KnativeComponent; import org.apache.camel.component.knative.KnativeConstants; import org.apache.camel.component.knative.spi.KnativeEnvironment; @@ -33,6 +35,7 @@ import org.apache.camel.quarkus.component.knative.KnativeConsumerRecorder; import org.apache.camel.quarkus.component.knative.KnativeProducerRecorder; import org.apache.camel.quarkus.component.knative.KnativeRecorder; +import org.apache.camel.quarkus.core.deployment.spi.CamelContextBuildItem; import org.apache.camel.quarkus.core.deployment.spi.CamelRuntimeBeanBuildItem; import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilter; import org.apache.camel.quarkus.core.deployment.spi.CamelServiceFilterBuildItem; @@ -92,12 +95,15 @@ CamelRuntimeBeanBuildItem knativeConsumerCustomizer( @Record(ExecutionTime.RUNTIME_INIT) @BuildStep CamelRuntimeBeanBuildItem knativeProducerCustomizer( + CamelContextBuildItem context, KnativeProducerRecorder recorder, CoreVertxBuildItem vertx) { + RuntimeValue camelContext = context.getCamelContext(); + return new CamelRuntimeBeanBuildItem( FEATURE + "-producer-customizer", ComponentCustomizer.class.getName(), - recorder.createKnativeProducerFactoryCustomizer(vertx.getVertx())); + recorder.createKnativeProducerFactoryCustomizer(camelContext, vertx.getVertx())); } } diff --git a/extensions/knative/runtime/src/main/java/org/apache/camel/quarkus/component/knative/KnativeProducerRecorder.java b/extensions/knative/runtime/src/main/java/org/apache/camel/quarkus/component/knative/KnativeProducerRecorder.java index ef173795f472..b4db90b3d6d2 100644 --- a/extensions/knative/runtime/src/main/java/org/apache/camel/quarkus/component/knative/KnativeProducerRecorder.java +++ b/extensions/knative/runtime/src/main/java/org/apache/camel/quarkus/component/knative/KnativeProducerRecorder.java @@ -21,6 +21,7 @@ import io.quarkus.runtime.RuntimeValue; import io.quarkus.runtime.annotations.Recorder; import io.vertx.core.Vertx; +import org.apache.camel.CamelContext; import org.apache.camel.Component; import org.apache.camel.component.knative.KnativeComponent; import org.apache.camel.component.knative.http.KnativeHttpProducerFactory; @@ -28,9 +29,11 @@ @Recorder public class KnativeProducerRecorder { - public RuntimeValue createKnativeProducerFactoryCustomizer(Supplier vertx) { + public RuntimeValue createKnativeProducerFactoryCustomizer(RuntimeValue context, + Supplier vertx) { KnativeHttpProducerFactory factory = new KnativeHttpProducerFactory(); factory.setVertx(vertx.get()); + factory.setCamelContext(context.getValue()); ComponentCustomizer cf = new ComponentCustomizer() { @Override diff --git a/extensions/kotlin-dsl/deployment/pom.xml b/extensions/kotlin-dsl/deployment/pom.xml deleted file mode 100644 index 74b903cd0a3f..000000000000 --- a/extensions/kotlin-dsl/deployment/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl-parent - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-kotlin-dsl-deployment - Camel Quarkus :: Kotlin DSL :: Deployment - - - - io.quarkus - quarkus-kotlin-deployment - - - org.apache.camel.quarkus - camel-quarkus-core-deployment - - - org.apache.camel.quarkus - camel-quarkus-support-dsl-deployment - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - diff --git a/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java b/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java deleted file mode 100644 index 7f1575c5df20..000000000000 --- a/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java +++ /dev/null @@ -1,210 +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.dsl.kotlin.deployment; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -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.GeneratedClassBuildItem; -import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ExcludeConfigBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.deployment.dev.CompilationProvider; -import io.quarkus.deployment.pkg.builditem.BuildSystemTargetBuildItem; -import io.quarkus.deployment.pkg.builditem.CurateOutcomeBuildItem; -import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild; -import io.quarkus.kotlin.deployment.KotlinCompilationProvider; -import io.quarkus.maven.dependency.ResolvedDependency; -import io.quarkus.paths.PathCollection; -import org.apache.camel.dsl.kotlin.KotlinConstantsKt; -import org.apache.camel.quarkus.core.deployment.main.CamelMainHelper; -import org.apache.camel.quarkus.dsl.kotlin.runtime.Configurer; -import org.apache.camel.quarkus.support.dsl.deployment.DslGeneratedClassBuildItem; -import org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor; -import org.apache.camel.spi.Resource; -import org.apache.camel.util.IOHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.CLASS_EXT; -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.determineName; -import static org.apache.camel.quarkus.support.dsl.deployment.DslSupportProcessor.extractImports; - -class KotlinDslProcessor { - - private static final Logger LOG = LoggerFactory.getLogger(KotlinDslProcessor.class); - private static final String PACKAGE_NAME = "org.apache.camel.quarkus.dsl.kotlin.generated"; - private static final String FILE_FORMAT = "package %s\n" + - "%s\n" + - "class %s(builder: org.apache.camel.builder.endpoint.EndpointRouteBuilder) :\n" + - " %s(builder) { \n" + - " override fun configure() { \n" + - " %s\n" + - " }\n" + - "}"; - private static final String FEATURE = "camel-kotlin-dsl"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - - @BuildStep - void excludeJLineNativeImageConfigs(BuildProducer nativeImageExclusions) { - // Exclude various jline native-image.properties, as the required native-image configuration files - // are not shaded into org.jetbrains.kotlin:kotlin-compiler-embeddable. - // See: https://github.com/apache/camel-quarkus/issues/6147 - String nativeResourceTemplate = "/META-INF/native-image/org\\.jline/jline-terminal%s/native-image\\.properties"; - Stream.of("", "-jansi", "-jna", "-jni") - .forEach(module -> { - nativeImageExclusions.produce(new ExcludeConfigBuildItem(".*kotlin-compiler-embeddable.*", - nativeResourceTemplate.formatted(module))); - }); - } - - @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class) - void compileScriptsAOT(BuildProducer generatedClass, - BuildProducer generatedResource, - BuildProducer reflectiveClass, - BuildProducer generatedKotlinClass, - BuildSystemTargetBuildItem buildSystemTargetBuildItem, - CurateOutcomeBuildItem curateOutcomeBuildItem) throws Exception { - LOG.debug("Loading .kts resources"); - final Path projectDir = Paths.get(".").toAbsolutePath().normalize(); - Path outputDirectory = buildSystemTargetBuildItem.getOutputDirectory(); - final Path generatedSourceDir = outputDirectory.resolve("kotlin-dsl/generated-sources"); - Files.createDirectories(generatedSourceDir); - final Path generatedSourceHomeDir = generatedSourceDir.resolve(PACKAGE_NAME.replace('.', File.separatorChar)); - Files.createDirectories(generatedSourceHomeDir); - Map nameToResource = new HashMap<>(); - Set filesToCompile = new HashSet<>(); - CamelMainHelper.forEachMatchingResource( - resource -> { - if (!resource.getLocation().endsWith(".kts")) { - return; - } - String name = determineName(resource); - try (InputStream is = resource.getInputStream()) { - String content = toKotlinClass(name, IOHelper.loadText(is)); - LOG.debug("Generated Kotlin source content:\n {}", content); - final Path sourceFile = generatedSourceHomeDir.resolve(String.format("%s.kt", name)); - Files.write(sourceFile, content.getBytes(StandardCharsets.UTF_8)); - filesToCompile.add(sourceFile.toFile()); - nameToResource.put(String.format("%s.%s", PACKAGE_NAME, name), resource); - } catch (IOException e) { - throw new RuntimeException(e); - } - }); - - if (filesToCompile.isEmpty()) { - return; - } - final Path classesDir = outputDirectory.resolve("kotlin-dsl/generated-classes"); - Files.createDirectories(classesDir); - CompilationProvider.Context context = new CompilationProvider.Context( - FEATURE, - curateOutcomeBuildItem.getApplicationModel().getDependencies().stream() - .map(ResolvedDependency::getResolvedPaths) - .flatMap(PathCollection::stream) - .map(Path::toFile) - .filter(f -> f.getName().endsWith(".jar")) - .collect(Collectors.toSet()), - Collections.emptySet(), - projectDir.toFile(), - generatedSourceDir.toFile(), - classesDir.toFile(), - StandardCharsets.UTF_8.name(), - Collections.emptyMap(), - KotlinConstantsKt.JVM_TARGET, - KotlinConstantsKt.JVM_TARGET, - KotlinConstantsKt.JVM_TARGET, - Collections.emptyList(), - Collections.emptyList(), - null, - Collections.emptySet(), - Collections.emptyList(), - null); - try (KotlinCompilationProvider compiler = new KotlinCompilationProvider()) { - compiler.compile(filesToCompile, context); - } - - try (Stream classFiles = Files.walk(classesDir)) { - classFiles - .filter(Files::isRegularFile) - .forEach(p -> { - String fileName = p.getFileName().toString(); - String relativePath = classesDir.relativize(p).toString(); - try { - if (fileName.endsWith(CLASS_EXT)) { - String className = relativePath.replace(File.separatorChar, '.').substring(0, - relativePath.length() - CLASS_EXT.length()); - generatedClass.produce(new GeneratedClassBuildItem(true, className, Files.readAllBytes(p))); - if (nameToResource.containsKey(className)) { - reflectiveClass.produce( - ReflectiveClassBuildItem.builder(className).build()); - generatedKotlinClass - .produce(new DslGeneratedClassBuildItem(className, - nameToResource.get(className).getLocation())); - } - } else { - generatedResource.produce(new GeneratedResourceBuildItem( - relativePath.replace(File.separatorChar, '/'), - Files.readAllBytes(p))); - } - } catch (IOException e) { - throw new RuntimeException("Could not read " + p); - } - }); - } - } - - /** - * Convert a Kotlin script into a Kotlin class to be able to compile it. - * - * @param name the name of the Kotlin class - * @param contentResource the content of the Kotlin script - * @return the content of the corresponding Kotlin class. - */ - private static String toKotlinClass(String name, String contentResource) { - List imports = new ArrayList<>(); - imports.add("import org.apache.camel.*"); - imports.add("import org.apache.camel.spi.*"); - DslSupportProcessor.ExtractImportResult extractImportResult = extractImports(contentResource); - imports.addAll(extractImportResult.getImports()); - return String.format( - FILE_FORMAT, PACKAGE_NAME, String.join("\n", imports), name, - Configurer.class.getName(), extractImportResult.getContent()); - } -} diff --git a/extensions/kotlin-dsl/pom.xml b/extensions/kotlin-dsl/pom.xml deleted file mode 100644 index c6ce6a73fa03..000000000000 --- a/extensions/kotlin-dsl/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-extensions - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-kotlin-dsl-parent - Camel Quarkus :: Kotlin DSL - pom - - - deployment - runtime - - diff --git a/extensions/kotlin-dsl/runtime/pom.xml b/extensions/kotlin-dsl/runtime/pom.xml deleted file mode 100644 index e0b27fbceaec..000000000000 --- a/extensions/kotlin-dsl/runtime/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl-parent - 3.17.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-kotlin-dsl - Camel Quarkus :: Kotlin DSL :: Runtime - Support for parsing Kotlin route definitions at runtime - - - 1.8.0 - 2.16.0 - - - - - io.quarkus - quarkus-kotlin - - - org.apache.camel.quarkus - camel-quarkus-core - - - org.apache.camel.quarkus - camel-quarkus-support-dsl - - - org.apache.camel - camel-kotlin-dsl - - - org.graalvm.sdk - nativeimage - provided - - - - - - - io.quarkus - quarkus-extension-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - diff --git a/extensions/kotlin-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/kotlin/runtime/Configurer.java b/extensions/kotlin-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/kotlin/runtime/Configurer.java deleted file mode 100644 index 49dbb851567e..000000000000 --- a/extensions/kotlin-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/kotlin/runtime/Configurer.java +++ /dev/null @@ -1,30 +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.dsl.kotlin.runtime; - -import org.apache.camel.builder.endpoint.EndpointRouteBuilder; -import org.apache.camel.dsl.kotlin.KotlinDSL; -import org.apache.camel.quarkus.support.dsl.runtime.RoutesBuilderConfigurer; -import org.jetbrains.annotations.NotNull; - -public abstract class Configurer extends KotlinDSL implements RoutesBuilderConfigurer { - - protected Configurer(@NotNull EndpointRouteBuilder builder) { - super(builder); - } - -} diff --git a/extensions/kotlin-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/kotlin/runtime/graal/SubstituteKotlinRoutesBuilderLoader.java b/extensions/kotlin-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/kotlin/runtime/graal/SubstituteKotlinRoutesBuilderLoader.java deleted file mode 100644 index 9b23e996a4eb..000000000000 --- a/extensions/kotlin-dsl/runtime/src/main/java/org/apache/camel/quarkus/dsl/kotlin/runtime/graal/SubstituteKotlinRoutesBuilderLoader.java +++ /dev/null @@ -1,33 +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.dsl.kotlin.runtime.graal; - -import java.io.Reader; - -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; -import org.apache.camel.builder.endpoint.EndpointRouteBuilder; -import org.apache.camel.dsl.kotlin.KotlinRoutesBuilderLoader; - -@TargetClass(KotlinRoutesBuilderLoader.class) -final class SubstituteKotlinRoutesBuilderLoader { - - @Substitute - protected void doLoadEndpointRouteBuilder(Reader reader, EndpointRouteBuilder builder) { - // Do nothing - } -} diff --git a/extensions/kotlin-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kotlin-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index 4fc8307b8e0a..000000000000 --- a/extensions/kotlin-dsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,34 +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. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel Kotlin DSL" -description: "Support for parsing Kotlin route definitions at runtime" -metadata: - icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" - sponsor: "Apache Software Foundation" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/kotlin-dsl.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/kotlin/deployment/pom.xml b/extensions/kotlin/deployment/pom.xml deleted file mode 100644 index 7772932cffe0..000000000000 --- a/extensions/kotlin/deployment/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - org.apache.camel.quarkus - camel-quarkus-kotlin-parent - 3.17.0-SNAPSHOT - - 4.0.0 - - camel-quarkus-kotlin-deployment - Camel Quarkus :: Kotlin :: Deployment - - - - org.apache.camel.quarkus - camel-quarkus-core-deployment - - - org.apache.camel.quarkus - camel-quarkus-kotlin - - - io.quarkus - quarkus-kotlin-deployment - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - diff --git a/extensions/kotlin/deployment/src/main/java/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.java b/extensions/kotlin/deployment/src/main/java/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.java deleted file mode 100644 index c5ee18191cfa..000000000000 --- a/extensions/kotlin/deployment/src/main/java/org/apache/camel/quarkus/kotlin/deployment/KotlinFeature.java +++ /dev/null @@ -1,29 +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.kotlin.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -class KotlinFeature { - private static final String FEATURE = "camel-kotlin"; - - @BuildStep - FeatureBuildItem featureBuildItem() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/extensions/kotlin/pom.xml b/extensions/kotlin/pom.xml deleted file mode 100644 index 4b66d6dd602a..000000000000 --- a/extensions/kotlin/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - org.apache.camel.quarkus - camel-quarkus-extensions - 3.17.0-SNAPSHOT - ../pom.xml - - - 4.0.0 - - camel-quarkus-kotlin-parent - Camel Quarkus :: Kotlin - pom - - deployment - runtime - - - diff --git a/extensions/kotlin/runtime/pom.xml b/extensions/kotlin/runtime/pom.xml deleted file mode 100644 index 1ebe178b470a..000000000000 --- a/extensions/kotlin/runtime/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - org.apache.camel.quarkus - camel-quarkus-kotlin-parent - 3.17.0-SNAPSHOT - - 4.0.0 - - camel-quarkus-kotlin - Camel Quarkus :: Kotlin :: Runtime - Write Camel integration routes in Kotlin - - - 1.0.0 - 1.0.0 - true - - - - - org.apache.camel - camel-core-engine - - - org.apache.camel.quarkus - camel-quarkus-core - - - io.quarkus - quarkus-kotlin - - - - - - - io.quarkus - quarkus-extension-maven-plugin - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - compile - - compile - - - - src/main/kotlin - - - - - test-compile - test-compile - - test-compile - - - - src/test/kotlin - - - - - - ${maven.compiler.release} - - - - - diff --git a/extensions/kotlin/runtime/src/main/kotlin/org/apache/camel/quarkus/kotlin/RoutesDSL.kt b/extensions/kotlin/runtime/src/main/kotlin/org/apache/camel/quarkus/kotlin/RoutesDSL.kt deleted file mode 100644 index a4bae2519166..000000000000 --- a/extensions/kotlin/runtime/src/main/kotlin/org/apache/camel/quarkus/kotlin/RoutesDSL.kt +++ /dev/null @@ -1,42 +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.kotlin - -import org.apache.camel.RoutesBuilder -import org.apache.camel.builder.RouteBuilder - -/** - * Functional routes definition Kotlin DSL. - * - * Example: - * - * ``` - * fun myRoutes() = routes { - * from("timer:foo?period=1000") - * .log("\${body}") - * } - * ``` - * - * In a nutshell, it makes it possible to configure routes with a lambda that acts as RouteBuilder. - */ -fun routes(block: RouteBuilder.() -> Unit) : RoutesBuilder { - return object: RouteBuilder() { - override fun configure() { - this.block() - } - } -} diff --git a/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index f5795f5c6792..000000000000 --- a/extensions/kotlin/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,34 +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. -# - -# This is a generated file. Do not edit directly! -# To re-generate, run the following command from the top level directory: -# -# mvn -N cq:update-quarkus-metadata -# ---- -name: "Camel Kotlin" -description: "Write Camel integration routes in Kotlin" -metadata: - icon-url: "https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg" - sponsor: "Apache Software Foundation" - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/kotlin.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java index 0588c8cdb1c1..1b467409d1ee 100644 --- a/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java +++ b/extensions/micrometer/deployment/src/test/java/org/apache/camel/quarkus/component/micrometer/deployment/MicrometerMetricsConfigDefaultsTest.java @@ -44,6 +44,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; public class MicrometerMetricsConfigDefaultsTest { @@ -67,6 +68,7 @@ public void testMicrometerMetricsConfiguration() { MicrometerRoutePolicyConfiguration policyConfiguration = micrometerRoutePolicyFactory.getPolicyConfiguration(); assertTrue(policyConfiguration.isContextEnabled()); assertTrue(policyConfiguration.isRouteEnabled()); + assertNull(policyConfiguration.getExcludePattern()); MessageHistoryFactory messageHistoryFactory = context.getMessageHistoryFactory(); assertNotNull(messageHistoryFactory); diff --git a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java index c6bedf87dc63..d10d224d0d84 100644 --- a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java +++ b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java @@ -16,6 +16,8 @@ */ package org.apache.camel.quarkus.component.micrometer; +import java.util.Optional; + import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; @@ -85,6 +87,14 @@ public class CamelMicrometerConfig { @ConfigItem(defaultValue = "all") public RoutePolicyLevel routePolicyLevel; + /** + * Comma separated list of route IDs to exclude from metrics collection. + * + * @asciidoclet + */ + @ConfigItem + public Optional routePolicyExcludePattern; + public enum MetricsNamingStrategy { DEFAULT, LEGACY diff --git a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java index bd4bf375f81e..30158d1164f7 100644 --- a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java +++ b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java @@ -85,6 +85,8 @@ public void configure(CamelContext camelContext) { policyConfiguration.setContextEnabled(false); policyConfiguration.setRouteEnabled(true); } + + config.routePolicyExcludePattern.ifPresent(policyConfiguration::setExcludePattern); } ManagementStrategy managementStrategy = camelContext.getManagementStrategy(); diff --git a/extensions/pinecone/deployment/src/main/java/org/apache/camel/quarkus/component/pinecone/deployment/PineconeProcessor.java b/extensions/pinecone/deployment/src/main/java/org/apache/camel/quarkus/component/pinecone/deployment/PineconeProcessor.java index 8f64d327aa36..b43da48454df 100644 --- a/extensions/pinecone/deployment/src/main/java/org/apache/camel/quarkus/component/pinecone/deployment/PineconeProcessor.java +++ b/extensions/pinecone/deployment/src/main/java/org/apache/camel/quarkus/component/pinecone/deployment/PineconeProcessor.java @@ -28,7 +28,7 @@ import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import org.jboss.jandex.ClassInfo; import org.jboss.jandex.DotName; -import org.openapitools.client.Configuration; +import org.openapitools.db_control.client.Configuration; class PineconeProcessor { private static final String FEATURE = "camel-pinecone"; @@ -47,7 +47,7 @@ IndexDependencyBuildItem indexDependencies() { void registerForReflection(CombinedIndexBuildItem combinedIndex, BuildProducer reflectiveClasses) { Set modelClasses = combinedIndex.getIndex() - .getClassesInPackage(DotName.createSimple("org.openapitools.client.model")) + .getClassesInPackage(DotName.createSimple("org.openapitools.db_control.client.model")) .stream() .map(ClassInfo::name) .map(DotName::toString) diff --git a/extensions/pom.xml b/extensions/pom.xml index 1d4b9c9c69a0..487d650c4980 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -122,7 +122,6 @@ graphql grok groovy - groovy-dsl grpc gson hashicorp-vault @@ -149,9 +148,7 @@ joor jpa jq - js-dsl jsch - jsh-dsl jslt json-validator jsonata @@ -164,8 +161,6 @@ knative knative-consumer knative-producer - kotlin - kotlin-dsl kubernetes kubernetes-cluster-service kudu 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 208263fe7085..9f137f777316 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 @@ -72,6 +72,7 @@ void registerProxyInterfaces(BuildProducer @BuildStep void addDependencies(BuildProducer indexDependency) { indexDependency.produce(new IndexDependencyBuildItem("com.pubnub", "pubnub-core-impl")); + indexDependency.produce(new IndexDependencyBuildItem("com.pubnub", "pubnub-kotlin-impl")); } } diff --git a/extensions/qute/component/src/generated/resources/META-INF/org/apache/camel/component/qute/qute.json b/extensions/qute/component/src/generated/resources/META-INF/org/apache/camel/component/qute/qute.json index e56a0f07cdfd..ea70763b3bd8 100644 --- a/extensions/qute/component/src/generated/resources/META-INF/org/apache/camel/component/qute/qute.json +++ b/extensions/qute/component/src/generated/resources/META-INF/org/apache/camel/component/qute/qute.json @@ -20,6 +20,7 @@ "consumerOnly": false, "producerOnly": true, "lenientProperties": false, + "browsable": false, "remote": true }, "componentProperties": { diff --git a/integration-tests/csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvTest.java b/integration-tests/csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvTest.java index 12e27e1a201e..51dc4d93ef25 100644 --- a/integration-tests/csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvTest.java +++ b/integration-tests/csv/src/test/java/org/apache/camel/quarkus/component/csv/it/CsvTest.java @@ -19,6 +19,7 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.is; @@ -39,6 +40,7 @@ public void json2csv() { } @Test + @Disabled //https://github.com/apache/camel-quarkus/issues/6560 public void csv2json() { RestAssured.given() // .contentType(ContentType.TEXT) diff --git a/integration-tests/groovy-dsl/pom.xml b/integration-tests/groovy-dsl/pom.xml deleted file mode 100644 index e653869102e0..000000000000 --- a/integration-tests/groovy-dsl/pom.xml +++ /dev/null @@ -1,201 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-groovy-dsl - Camel Quarkus :: Integration Tests :: Groovy DSL - Integration tests for Camel Groovy DSL extension - - - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl - - - org.apache.camel.quarkus - camel-quarkus-direct - - - org.apache.camel.quarkus - camel-quarkus-jackson - - - org.apache.camel.quarkus - camel-quarkus-bean - - - org.apache.camel.quarkus - camel-quarkus-log - - - org.apache.camel.quarkus - camel-quarkus-rest - - - io.quarkus - quarkus-resteasy-jsonb - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - - - org.assertj - assertj-core - test - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-bean-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-direct-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-jackson-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-log-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-rest-deployment - ${project.version} - pom - test - - - * - * - - - - - - - - - diff --git a/integration-tests/groovy-dsl/src/main/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslResource.java b/integration-tests/groovy-dsl/src/main/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslResource.java deleted file mode 100644 index 8eb3c028b2a4..000000000000 --- a/integration-tests/groovy-dsl/src/main/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslResource.java +++ /dev/null @@ -1,106 +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.dsl.groovy; - -import java.util.Set; -import java.util.stream.Collectors; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.Route; -import org.apache.camel.component.direct.DirectEndpoint; -import org.apache.camel.dsl.groovy.GroovyRoutesBuilderLoader; -import org.apache.camel.quarkus.main.CamelMain; -import org.apache.camel.spi.RoutesBuilderLoader; - -@Path("/groovy-dsl") -@ApplicationScoped -public class GroovyDslResource { - @Inject - CamelMain main; - - @Inject - ProducerTemplate producerTemplate; - - @GET - @Produces(MediaType.TEXT_PLAIN) - public String ready() { - return "OK"; - } - - @Path("/main/groovyRoutesBuilderLoader") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String groovyRoutesBuilder() { - final ExtendedCamelContext camelContext = main.getCamelContext().getCamelContextExtension(); - return camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH) - .findClass(GroovyRoutesBuilderLoader.EXTENSION).get().getName(); - } - - @Path("/main/routeBuilders") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routeBuilders() { - return main.configure().getRoutesBuilders().stream() - .map(rb -> rb.getClass().getSimpleName()) - .sorted() - .collect(Collectors.joining(",")); - } - - @Path("/main/routes") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routes() { - return main.getCamelContext().getRoutes().stream() - .map(Route::getId) - .sorted() - .collect(Collectors.joining(",")); - } - - @GET - @Path("/main/successful/routes") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public int successfulRoutes() { - int successful = 0; - Set excluded = Set.of("my-groovy-route", "routes-with-rest-dsl-get", "routes-with-rest-dsl-post"); - for (Route route : main.getCamelContext().getRoutes()) { - String name = route.getRouteId(); - if (route.getEndpoint() instanceof DirectEndpoint && !excluded.contains(name) - && producerTemplate.requestBody(route.getEndpoint(), "", Boolean.class) == Boolean.TRUE) { - successful++; - } - } - return successful; - } - - @POST - @Path("/hello") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public String hello(String message) { - return producerTemplate.requestBody("direct:groovyHello", message, String.class); - } -} diff --git a/integration-tests/groovy-dsl/src/main/resources/application.properties b/integration-tests/groovy-dsl/src/main/resources/application.properties deleted file mode 100644 index 7ab2bf28e3d4..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/application.properties +++ /dev/null @@ -1,21 +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. -## --------------------------------------------------------------------------- - -# -# Main -# -camel.main.routes-include-pattern = classpath:routes/*.groovy diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/my-routes.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/my-routes.groovy deleted file mode 100644 index e1e7cb2972c2..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/my-routes.groovy +++ /dev/null @@ -1,21 +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. - */ -from('direct:groovyHello') - .id('my-groovy-route') - .setBody().simple('Hello ${body} from Groovy!') - // Extensions are not supported due to https://github.com/apache/camel-quarkus/issues/4384 - // .setBody { e -> "Hello " + e.in.body + " from Groovy!" } diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-components-configuration.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-components-configuration.groovy deleted file mode 100644 index 276b1246d1e8..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-components-configuration.groovy +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import org.apache.camel.component.direct.DirectComponent - -camel { - components { - direct { - // set value as method - timeout 1234 - } - myDirect(DirectComponent) { - // set value as method - timeout = 4321 - } - } -} - - - -from('direct:routes-with-components-configuration') - .id('routes-with-components-configuration') - .setBody(simple('${camelContext.getComponent("myDirect")} != null', Boolean.class)) diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-dataformats-configuration.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-dataformats-configuration.groovy deleted file mode 100644 index 3e2788cbaf56..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-dataformats-configuration.groovy +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import org.apache.camel.component.jackson.JacksonDataFormat - -camel { - dataFormats { - dataFormat("jackson") { - unmarshalType = Map.class - prettyPrint = true - } - dataFormat("my-jackson", JacksonDataFormat) { - unmarshalType = String.class - prettyPrint = false - } - } -} - - -from('direct:routes-with-dataformats-configuration') - .id('routes-with-dataformats-configuration') - .setBody(simple('${ref:my-jackson} != null', Boolean.class)) diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-eip.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-eip.groovy deleted file mode 100644 index 8d2188191037..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-eip.groovy +++ /dev/null @@ -1,36 +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. - */ - -from('direct:routes-with-eip-setBody') - .id('routes-with-eip-setBody') - .setBody { "true" } - -from('direct:routes-with-eip-body') - .id('routes-with-eip-body') - .transform().body { b -> "true"} - -from('direct:routes-with-eip-message') - .id('routes-with-eip-message') - .transform().message { m -> m.body = "true"} - -from('direct:routes-with-eip-exchange') - .id('routes-with-eip-exchange') - .transform().exchange { e -> e.in.body = "true"} - -from('direct:routes-with-eip-process') - .id('routes-with-eip-process') - .process {e -> e.in.body = "true" } diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-endpoint-dsl.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-endpoint-dsl.groovy deleted file mode 100644 index 269ccd7e3a02..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-endpoint-dsl.groovy +++ /dev/null @@ -1,23 +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. - */ -def f = direct("routes-with-endpoint-dsl").advanced().synchronous(true) -def t = log('info') - -from(f) - .id('routes-with-endpoint-dsl') - .setBody().constant("true") - .to(t) diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-error-handler.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-error-handler.groovy deleted file mode 100644 index ecf90a49497c..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-error-handler.groovy +++ /dev/null @@ -1,26 +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. - */ - -onException(IllegalArgumentException.class) - .id('my-on-exception') - .to('log:exception') - -from('direct:routes-with-error-handler') - .id('routes-with-error-handler') - .setHeader("SomeHeader", constant("SomeHeaderValue")) - .filter().simple('${header.SomeHeader} == "SomeHeaderValue"') - .setBody().constant("true") diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-languages-configuration.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-languages-configuration.groovy deleted file mode 100644 index 7339de1b0eee..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-languages-configuration.groovy +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import org.apache.camel.language.bean.BeanLanguage - -camel { - - languages { - bean(BeanLanguage) { - validate = false - } - myBean(BeanLanguage) { - validate = true - } - } -} - -from('direct:routes-with-languages-configuration') - .id('routes-with-languages-configuration') - .setBody(simple('${ref:my-bean} != null', Boolean.class)) diff --git a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy b/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy deleted file mode 100644 index b09e06b0bd99..000000000000 --- a/integration-tests/groovy-dsl/src/main/resources/routes/routes-with-rest.groovy +++ /dev/null @@ -1,48 +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. - */ -rest { - configuration { - contextPath = "/root" - } - - path("/my/path") { - get("/get") { - produces("text/plain") - to("direct:get") - } - } - - post { - path("/post") - consumes("text/plain") - produces("text/plain") - to("direct:post") - } -} - -from('direct:get') - .id("routes-with-rest-dsl-get") - .transform().constant("Hello World") -from('direct:post') - .id("routes-with-rest-dsl-post") - .setBody().simple('Hello ${body}') - -from("direct:routes-with-rest") - .id("routes-with-rest") - .setHeader("AnotherHeader", constant("AnotherHeaderValue")) - .filter().simple('${header.AnotherHeader} == "AnotherHeaderValue"') - .setBody().constant("true") diff --git a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslIT.java b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslIT.java deleted file mode 100644 index 50fb8bd47d46..000000000000 --- a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslIT.java +++ /dev/null @@ -1,24 +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.dsl.groovy; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -class GroovyDslIT extends GroovyDslTest { - -} diff --git a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java b/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java deleted file mode 100644 index 5d366194af32..000000000000 --- a/integration-tests/groovy-dsl/src/test/java/org/apache/camel/quarkus/dsl/groovy/GroovyDslTest.java +++ /dev/null @@ -1,79 +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.dsl.groovy; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.apache.camel.dsl.groovy.GroovyRoutesBuilderLoader; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class GroovyDslTest { - - @Test - void groovyHello() { - RestAssured.given() - .body("John Smith") - .post("/groovy-dsl/hello") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello John Smith from Groovy!")); - } - - @Test - void testMainInstanceWithJavaRoutes() { - RestAssured.given() - .get("/groovy-dsl/main/groovyRoutesBuilderLoader") - .then() - .statusCode(200) - .body(CoreMatchers.is(GroovyRoutesBuilderLoader.class.getName())); - - RestAssured.given() - .get("/groovy-dsl/main/routeBuilders") - .then() - .statusCode(200) - .body(CoreMatchers.is("")); - - RestAssured.given() - .get("/groovy-dsl/main/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is( - "my-groovy-route,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-eip-body,routes-with-eip-exchange,routes-with-eip-message,routes-with-eip-process,routes-with-eip-setBody,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post")); - RestAssured.given() - .get("/groovy-dsl/main/successful/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is("10")); - } - - @Test - void testRestEndpoints() { - RestAssured.given() - .get("/root/my/path/get") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello World")); - RestAssured.given() - .body("Will") - .post("/root/post") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello Will")); - } -} diff --git a/integration-tests/js-dsl/README.adoc b/integration-tests/js-dsl/README.adoc deleted file mode 100644 index b36dda0ede83..000000000000 --- a/integration-tests/js-dsl/README.adoc +++ /dev/null @@ -1,10 +0,0 @@ -== Camel Quarkus JS Integration Tests - -To run the native JS integration tests, you must ensure that you have GraalVM installed locally, together with JS component. - -You can install GraalVM JS as follows. - -[source,shell] ----- -${GRAALVM_HOME}/bin/gu install js ----- diff --git a/integration-tests/js-dsl/pom.xml b/integration-tests/js-dsl/pom.xml deleted file mode 100644 index 705e18c6a120..000000000000 --- a/integration-tests/js-dsl/pom.xml +++ /dev/null @@ -1,199 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-js-dsl - Camel Quarkus :: Integration Tests ::JavaScript DSL :: Tests - The camel integration tests - - - - true - - - - - org.apache.camel.quarkus - camel-quarkus-js-dsl - - - org.apache.camel.quarkus - camel-quarkus-direct - - - org.apache.camel.quarkus - camel-quarkus-log - - - org.apache.camel.quarkus - camel-quarkus-platform-http - - - org.apache.camel.quarkus - camel-quarkus-rest - - - io.quarkus - quarkus-jsonb - - - io.quarkus - quarkus-resteasy-jsonb - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.assertj - assertj-core - test - - - - - - native - - - native - - - ${env.GRAALVM_HOME}/bin/js - - - - true - - false - --language:js - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-direct-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-js-dsl-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-log-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-platform-http-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-rest-deployment - ${project.version} - pom - test - - - * - * - - - - - - - - - diff --git a/integration-tests/js-dsl/src/main/java/org/apache/camel/quarkus/js/JavaScriptDslResource.java b/integration-tests/js-dsl/src/main/java/org/apache/camel/quarkus/js/JavaScriptDslResource.java deleted file mode 100644 index 88db3e868f62..000000000000 --- a/integration-tests/js-dsl/src/main/java/org/apache/camel/quarkus/js/JavaScriptDslResource.java +++ /dev/null @@ -1,100 +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.js; - -import java.util.Set; -import java.util.stream.Collectors; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.Route; -import org.apache.camel.component.direct.DirectEndpoint; -import org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader; -import org.apache.camel.quarkus.main.CamelMain; -import org.apache.camel.spi.RoutesBuilderLoader; - -@Path("/js-dsl") -@ApplicationScoped -public class JavaScriptDslResource { - @Inject - CamelMain main; - - @Inject - ProducerTemplate producerTemplate; - - @Path("/main/jsRoutesBuilderLoader") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String jsRoutesBuilder() { - final ExtendedCamelContext camelContext = main.getCamelContext().getCamelContextExtension(); - return camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH) - .findClass(JavaScriptRoutesBuilderLoader.EXTENSION).get().getName(); - } - - @Path("/main/routeBuilders") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routeBuilders() { - return main.configure().getRoutesBuilders().stream() - .map(rb -> rb.getClass().getSimpleName()) - .sorted() - .collect(Collectors.joining(",")); - } - - @Path("/main/routes") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routes() { - return main.getCamelContext().getRoutes().stream() - .map(Route::getId) - .sorted() - .collect(Collectors.joining(",")); - } - - @GET - @Path("/main/successful/routes") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public int successfulRoutes() { - Set excluded = Set.of("my-js-route", "routes-with-rest-dsl-hello", "routes-with-rest-configuration-goodbye"); - int successful = 0; - for (Route route : main.getCamelContext().getRoutes()) { - String name = route.getRouteId(); - if (route.getEndpoint() instanceof DirectEndpoint && !excluded.contains(name) - && producerTemplate.requestBody(route.getEndpoint(), "", Boolean.class) == Boolean.TRUE) { - successful++; - } - } - return successful; - } - - @POST - @Path("/hello") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public String hello(String message) { - return producerTemplate.requestBody("direct:jsHello", message, String.class); - } -} diff --git a/integration-tests/js-dsl/src/main/resources/application.properties b/integration-tests/js-dsl/src/main/resources/application.properties deleted file mode 100644 index 6534184a2ffb..000000000000 --- a/integration-tests/js-dsl/src/main/resources/application.properties +++ /dev/null @@ -1,21 +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. -## --------------------------------------------------------------------------- - -# -# Main -# -camel.main.routes-include-pattern = classpath:routes/my-routes.js,classpath:routes/routes-with-rest-dsl.js,classpath:routes/routes-with-context-configuration.js,classpath:routes/routes-with-endpoint-dsl.js,classpath:routes/routes-with-rest-configuration.js,classpath:routes/routes-with-component-configuration.js,classpath:routes/routes-with-modules.js,classpath:routes/routes-with-processors.js \ No newline at end of file diff --git a/integration-tests/js-dsl/src/main/resources/module.mjs b/integration-tests/js-dsl/src/main/resources/module.mjs deleted file mode 100644 index 43742fcb9a77..000000000000 --- a/integration-tests/js-dsl/src/main/resources/module.mjs +++ /dev/null @@ -1,18 +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. - */ - -export const greeting = "Hello World!"; \ No newline at end of file diff --git a/integration-tests/js-dsl/src/main/resources/routes/my-routes.js b/integration-tests/js-dsl/src/main/resources/routes/my-routes.js deleted file mode 100644 index 8b5b19ccac90..000000000000 --- a/integration-tests/js-dsl/src/main/resources/routes/my-routes.js +++ /dev/null @@ -1,20 +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. - */ - -from('direct:jsHello') - .id('my-js-route') - .setBody().simple('Hello ${body} from JavaScript!') \ No newline at end of file diff --git a/integration-tests/js-dsl/src/main/resources/routes/routes-with-component-configuration.js b/integration-tests/js-dsl/src/main/resources/routes/routes-with-component-configuration.js deleted file mode 100644 index bbea5b606f56..000000000000 --- a/integration-tests/js-dsl/src/main/resources/routes/routes-with-component-configuration.js +++ /dev/null @@ -1,25 +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. - */ - -const DirectType = Java.type("org.apache.camel.component.direct.DirectComponent"); - -const d = context.getComponent('direct', DirectType) -d.setTimeout(1234) - -from("direct:routes-with-component-configuration") - .id("routes-with-component-configuration") - .setBody().constant("true") diff --git a/integration-tests/js-dsl/src/main/resources/routes/routes-with-context-configuration.js b/integration-tests/js-dsl/src/main/resources/routes/routes-with-context-configuration.js deleted file mode 100644 index f23e80d086f5..000000000000 --- a/integration-tests/js-dsl/src/main/resources/routes/routes-with-context-configuration.js +++ /dev/null @@ -1,23 +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. - */ - -context.setTypeConverterStatisticsEnabled(true) - -from("direct:routes-with-context-configuration") - .id("routes-with-context-configuration") - .setBody().constant("true") - diff --git a/integration-tests/js-dsl/src/main/resources/routes/routes-with-endpoint-dsl.js b/integration-tests/js-dsl/src/main/resources/routes/routes-with-endpoint-dsl.js deleted file mode 100644 index ea7d73ecce13..000000000000 --- a/integration-tests/js-dsl/src/main/resources/routes/routes-with-endpoint-dsl.js +++ /dev/null @@ -1,24 +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. - */ - -const f = direct("routes-with-endpoint-dsl").advanced().synchronous(true) -const t = log("info"); - -from(f) - .id("routes-with-endpoint-dsl") - .setBody().constant("true") - .to(t); diff --git a/integration-tests/js-dsl/src/main/resources/routes/routes-with-modules.js b/integration-tests/js-dsl/src/main/resources/routes/routes-with-modules.js deleted file mode 100644 index 3daa029e2d77..000000000000 --- a/integration-tests/js-dsl/src/main/resources/routes/routes-with-modules.js +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import { greeting } from "src/main/resources/module.mjs"; - -from('direct:routes-with-modules') - .id("routes-with-modules") - .setBody().simple(greeting) - .filter().simple("${body} == 'Hello World!'") - .setBody().constant("true"); diff --git a/integration-tests/js-dsl/src/main/resources/routes/routes-with-processors.js b/integration-tests/js-dsl/src/main/resources/routes/routes-with-processors.js deleted file mode 100644 index 475b5ce0f8fe..000000000000 --- a/integration-tests/js-dsl/src/main/resources/routes/routes-with-processors.js +++ /dev/null @@ -1,32 +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. - */ -const consumer = Java.type("org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslConsumer"); -const c = new consumer("msg", `msg.setBody('From consumer')`); -const processor = Java.type("org.apache.camel.quarkus.dsl.js.runtime.JavaScriptDslProcessor"); -const p = new processor(`exchange.getMessage().setBody('From processor')`); - -from('direct:routes-with-processors-consumer') - .id("routes-with-processors-consumer") - .process().message(c) - .filter().simple("${body} == 'From consumer'") - .setBody().constant("true"); - -from('direct:routes-with-processors-processor') - .id("routes-with-processors-processor") - .process(p) - .filter().simple("${body} == 'From processor'") - .setBody().constant("true"); diff --git a/integration-tests/js-dsl/src/main/resources/routes/routes-with-rest-configuration.js b/integration-tests/js-dsl/src/main/resources/routes/routes-with-rest-configuration.js deleted file mode 100644 index 48b62198c740..000000000000 --- a/integration-tests/js-dsl/src/main/resources/routes/routes-with-rest-configuration.js +++ /dev/null @@ -1,30 +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. - */ - -const c = restConfiguration() -c.setComponent('platform-http') -c.setPort('1234') - -rest('/') - .produces("text/plain") - .get('/say/goodbye') - .id('routes-with-rest-configuration') - .to('direct:goodbye'); - -from('direct:goodbye') - .id('routes-with-rest-configuration-goodbye') - .transform().constant("Bye World"); diff --git a/integration-tests/js-dsl/src/main/resources/routes/routes-with-rest-dsl.js b/integration-tests/js-dsl/src/main/resources/routes/routes-with-rest-dsl.js deleted file mode 100644 index 4ab15b8d669a..000000000000 --- a/integration-tests/js-dsl/src/main/resources/routes/routes-with-rest-dsl.js +++ /dev/null @@ -1,26 +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. - */ - -rest('/') - .produces("text/plain") - .get('/say/hello') - .id('routes-with-rest-dsl') - .to('direct:hello'); - -from('direct:hello') - .id('routes-with-rest-dsl-hello') - .transform().constant("Hello World"); diff --git a/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslIT.java b/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslIT.java deleted file mode 100644 index 53e7cb36bad2..000000000000 --- a/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslIT.java +++ /dev/null @@ -1,23 +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.js; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -public class JavaScriptDslIT extends JavaScriptDslTest { -} diff --git a/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslTest.java b/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslTest.java deleted file mode 100644 index 9eef21e3abb1..000000000000 --- a/integration-tests/js-dsl/src/test/java/org/apache/camel/quarkus/js/JavaScriptDslTest.java +++ /dev/null @@ -1,79 +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.js; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.apache.camel.dsl.js.JavaScriptRoutesBuilderLoader; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class JavaScriptDslTest { - - @Test - void jsHello() { - RestAssured.given() - .body("David Smith") - .post("/js-dsl/hello") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello David Smith from JavaScript!")); - } - - @Test - void testMainInstanceWithJavaRoutes() { - RestAssured.given() - .get("/js-dsl/main/jsRoutesBuilderLoader") - .then() - .statusCode(200) - .body(CoreMatchers.is(JavaScriptRoutesBuilderLoader.class.getName())); - - RestAssured.given() - .get("/js-dsl/main/routeBuilders") - .then() - .statusCode(200) - .body(CoreMatchers.is("")); - - RestAssured.given() - .get("/js-dsl/main/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is( - "my-js-route,routes-with-component-configuration,routes-with-context-configuration,routes-with-endpoint-dsl,routes-with-modules,routes-with-processors-consumer,routes-with-processors-processor,routes-with-rest-configuration-goodbye,routes-with-rest-dsl-hello")); - - RestAssured.given() - .get("/js-dsl/main/successful/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is("6")); - } - - @Test - void testRestEndpoints() { - RestAssured.given() - .get("/say/hello") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello World")); - RestAssured.given() - .get("/say/goodbye") - .then() - .statusCode(200) - .body(CoreMatchers.is("Bye World")); - } -} diff --git a/integration-tests/jsh-dsl/pom.xml b/integration-tests/jsh-dsl/pom.xml deleted file mode 100644 index 991b0cf26aeb..000000000000 --- a/integration-tests/jsh-dsl/pom.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-jsh-dsl - Camel Quarkus :: Integration Tests :: JavaShell DSL - Integration tests for Camel Quarkus JavaShell DSL extension - - - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl - - - io.quarkus - quarkus-resteasy - - - org.apache.camel.quarkus - camel-quarkus-direct - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-direct-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl-deployment - ${project.version} - pom - test - - - * - * - - - - - - - - diff --git a/integration-tests/jsh-dsl/src/main/java/org/apache/camel/quarkus/dsl/jsh/JshDslResource.java b/integration-tests/jsh-dsl/src/main/java/org/apache/camel/quarkus/dsl/jsh/JshDslResource.java deleted file mode 100644 index df2e323c8a16..000000000000 --- a/integration-tests/jsh-dsl/src/main/java/org/apache/camel/quarkus/dsl/jsh/JshDslResource.java +++ /dev/null @@ -1,81 +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.dsl.jsh; - -import java.util.stream.Collectors; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.Route; -import org.apache.camel.dsl.jsh.JshRoutesBuilderLoader; -import org.apache.camel.quarkus.main.CamelMain; -import org.apache.camel.spi.RoutesBuilderLoader; - -@Path("/jsh-dsl") -@ApplicationScoped -public class JshDslResource { - @Inject - CamelMain main; - - @Inject - ProducerTemplate producerTemplate; - - @Path("/main/jshRoutesBuilderLoader") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String jshRoutesBuilder() { - final ExtendedCamelContext camelContext = main.getCamelContext().getCamelContextExtension(); - return camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH) - .findClass(JshRoutesBuilderLoader.EXTENSION).get().getName(); - } - - @Path("/main/routeBuilders") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routeBuilders() { - return main.configure().getRoutesBuilders().stream() - .map(rb -> rb.getClass().getSimpleName()) - .sorted() - .collect(Collectors.joining(",")); - } - - @Path("/main/routes") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routes() { - return main.getCamelContext().getRoutes().stream() - .map(Route::getId) - .sorted() - .collect(Collectors.joining(",")); - } - - @POST - @Path("/hello") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public String hello(String message) { - return producerTemplate.requestBody("direct:jshHello", message, String.class); - } -} diff --git a/integration-tests/jsh-dsl/src/main/resources/application.properties b/integration-tests/jsh-dsl/src/main/resources/application.properties deleted file mode 100644 index d102a9146d22..000000000000 --- a/integration-tests/jsh-dsl/src/main/resources/application.properties +++ /dev/null @@ -1,21 +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. -## --------------------------------------------------------------------------- - -# -# Main -# -camel.main.routes-include-pattern = classpath:routes/*.jsh diff --git a/integration-tests/jsh-dsl/src/main/resources/routes/MyRoute.jsh b/integration-tests/jsh-dsl/src/main/resources/routes/MyRoute.jsh deleted file mode 100644 index 89a3414d1ebc..000000000000 --- a/integration-tests/jsh-dsl/src/main/resources/routes/MyRoute.jsh +++ /dev/null @@ -1,20 +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. - */ - -builder.from("direct:jshHello") - .id("my-jsh-route") - .setBody(exchange -> "Hello " + exchange.getMessage().getBody() + " from JShell!"); diff --git a/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslIT.java b/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslIT.java deleted file mode 100644 index 347cc48db669..000000000000 --- a/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslIT.java +++ /dev/null @@ -1,24 +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.dsl.jsh; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -class JshDslIT extends JshDslTest { - -} diff --git a/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslTest.java b/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslTest.java deleted file mode 100644 index 62a3c27b91f0..000000000000 --- a/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslTest.java +++ /dev/null @@ -1,59 +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.dsl.jsh; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.apache.camel.dsl.jsh.JshRoutesBuilderLoader; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class JshDslTest { - - @Test - void jshHello() { - RestAssured.given() - .body("Brad Smith") - .post("/jsh-dsl/hello") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello Brad Smith from JShell!")); - } - - @Test - void testMainInstanceWithJavaRoutes() { - RestAssured.given() - .get("/jsh-dsl/main/jshRoutesBuilderLoader") - .then() - .statusCode(200) - .body(CoreMatchers.is(JshRoutesBuilderLoader.class.getName())); - - RestAssured.given() - .get("/jsh-dsl/main/routeBuilders") - .then() - .statusCode(200) - .body(CoreMatchers.is("")); - - RestAssured.given() - .get("/jsh-dsl/main/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is("my-jsh-route")); - } - -} diff --git a/integration-tests/kotlin-dsl/pom.xml b/integration-tests/kotlin-dsl/pom.xml deleted file mode 100644 index f53aeafd11da..000000000000 --- a/integration-tests/kotlin-dsl/pom.xml +++ /dev/null @@ -1,200 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-kotlin-dsl - Camel Quarkus :: Integration Tests :: Kotlin DSL - Integration tests for Camel Kotlin DSL extension - - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl - - - org.apache.camel.quarkus - camel-quarkus-direct - - - org.apache.camel.quarkus - camel-quarkus-jackson - - - org.apache.camel.quarkus - camel-quarkus-bean - - - org.apache.camel.quarkus - camel-quarkus-log - - - org.apache.camel.quarkus - camel-quarkus-rest - - - io.quarkus - quarkus-resteasy-jsonb - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.assertj - assertj-core - test - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-bean-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-direct-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-jackson-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-log-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-rest-deployment - ${project.version} - pom - test - - - * - * - - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - - diff --git a/integration-tests/kotlin-dsl/src/main/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslResource.java b/integration-tests/kotlin-dsl/src/main/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslResource.java deleted file mode 100644 index 9e39bb9a35bb..000000000000 --- a/integration-tests/kotlin-dsl/src/main/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslResource.java +++ /dev/null @@ -1,100 +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.dsl.kotlin; - -import java.util.Set; -import java.util.stream.Collectors; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import org.apache.camel.ExtendedCamelContext; -import org.apache.camel.ProducerTemplate; -import org.apache.camel.Route; -import org.apache.camel.component.direct.DirectEndpoint; -import org.apache.camel.dsl.kotlin.KotlinConstantsKt; -import org.apache.camel.quarkus.main.CamelMain; -import org.apache.camel.spi.RoutesBuilderLoader; - -@Path("/kotlin-dsl") -@ApplicationScoped -public class KotlinDslResource { - @Inject - CamelMain main; - - @Inject - ProducerTemplate producerTemplate; - - @Path("/main/kotlinRoutesBuilderLoader") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String kotlinRoutesBuilder() { - final ExtendedCamelContext camelContext = main.getCamelContext().getCamelContextExtension(); - return camelContext.getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH) - .findClass(KotlinConstantsKt.EXTENSION).get().getName(); - } - - @Path("/main/routeBuilders") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routeBuilders() { - return main.configure().getRoutesBuilders().stream() - .map(rb -> rb.getClass().getSimpleName()) - .sorted() - .collect(Collectors.joining(",")); - } - - @Path("/main/routes") - @GET - @Produces(MediaType.TEXT_PLAIN) - public String routes() { - return main.getCamelContext().getRoutes().stream() - .map(Route::getId) - .sorted() - .collect(Collectors.joining(",")); - } - - @GET - @Path("/main/successful/routes") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public int successfulRoutes() { - int successful = 0; - Set excluded = Set.of("my-kotlin-route", "routes-with-rest-dsl-get", "routes-with-rest-dsl-post"); - for (Route route : main.getCamelContext().getRoutes()) { - String name = route.getRouteId(); - if (route.getEndpoint() instanceof DirectEndpoint && !excluded.contains(name) - && producerTemplate.requestBody(route.getEndpoint(), "", Boolean.class) == Boolean.TRUE) { - successful++; - } - } - return successful; - } - - @POST - @Path("/hello") - @Consumes(MediaType.TEXT_PLAIN) - @Produces(MediaType.TEXT_PLAIN) - public String hello(String message) { - return producerTemplate.requestBody("direct:kotlinHello", message, String.class); - } -} diff --git a/integration-tests/kotlin-dsl/src/main/resources/application.properties b/integration-tests/kotlin-dsl/src/main/resources/application.properties deleted file mode 100644 index 3f43a525892c..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/application.properties +++ /dev/null @@ -1,22 +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. -## --------------------------------------------------------------------------- - -# -# Main -# -camel.main.routes-include-pattern = classpath:routes/*.kts - diff --git a/integration-tests/kotlin-dsl/src/main/resources/routes/my-routes.kts b/integration-tests/kotlin-dsl/src/main/resources/routes/my-routes.kts deleted file mode 100644 index 4387318c49fa..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/routes/my-routes.kts +++ /dev/null @@ -1,19 +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. - */ -from("direct:kotlinHello") - .id("my-kotlin-route") - .setBody().simple("Hello \${body} from Kotlin!") diff --git a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-components-configuration.kts b/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-components-configuration.kts deleted file mode 100644 index 45c1ac825fab..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-components-configuration.kts +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import org.apache.camel.Exchange -import org.apache.camel.component.direct.DirectComponent -import org.apache.camel.component.log.LogComponent - -camel { - components { - component("log") { - setExchangeFormatter { - e: Exchange -> "" + e.getIn().body - } - } - - component("direct") { - timeout = 1234 - } - - component("myDirect") { - timeout = 4321 - } - } -} - -from("direct:routes-with-components-configuration") - .id("routes-with-components-configuration") - .process().message { - m -> m.body = m.exchange.context.getComponent("myDirect") != null - } diff --git a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-dataformats-configuration.kts b/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-dataformats-configuration.kts deleted file mode 100644 index 055e6e20b117..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-dataformats-configuration.kts +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import org.apache.camel.component.jackson.JacksonDataFormat - -camel { - dataFormats { - dataFormat("jackson") { - unmarshalType = Map::class.java - isPrettyPrint = true - } - - dataFormat("my-jackson") { - unmarshalType = String::class.java - isPrettyPrint = false - } - } -} - -from("direct:routes-with-dataformats-configuration") - .id("routes-with-dataformats-configuration") - .process().message { - m -> m.body = m.exchange.context.getRegistry().lookupByName("my-jackson") != null - } diff --git a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-endpoint-dsl.kts b/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-endpoint-dsl.kts deleted file mode 100644 index d9466cc7b610..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-endpoint-dsl.kts +++ /dev/null @@ -1,23 +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. - */ -var d = direct("routes-with-endpoint-dsl").advanced().synchronous(true) -var t = log("info") - -from(d) - .id("routes-with-endpoint-dsl") - .setBody().constant("true") - .to(t) diff --git a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-error-handler.kts b/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-error-handler.kts deleted file mode 100644 index 2f0f327a86b1..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-error-handler.kts +++ /dev/null @@ -1,27 +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. - */ -onException(IllegalArgumentException::class.java) - .id("my-on-exception") - .to("log:exception") - -from("direct:routes-with-error-handler") - .id("routes-with-error-handler") - .process().message { - m -> m.headers["SomeHeader"] = "SomeHeaderValue" - } - .filter().simple("\${header.SomeHeader} == 'SomeHeaderValue'") - .setBody().constant("true") diff --git a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-languages-configuration.kts b/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-languages-configuration.kts deleted file mode 100644 index fa073ec5fe65..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-languages-configuration.kts +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import org.apache.camel.language.bean.BeanLanguage - -camel { - languages { - language("bean") { - isValidate = false - } - language("my-bean") { - isValidate = true - } - } -} -from("direct:routes-with-languages-configuration") - .id("routes-with-languages-configuration") - .process().message { - m -> m.body = m.exchange.context.getRegistry().lookupByName("my-bean") != null - } diff --git a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-rest.kts b/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-rest.kts deleted file mode 100644 index 256000d52104..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/routes/routes-with-rest.kts +++ /dev/null @@ -1,50 +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. - */ -rest { - configuration { - contextPath = "/root" - } - - path("/my/path") { - get("/get") { - produces("text/plain") - to("direct:get") - } - } - - post { - path("/post") - consumes("text/plain") - produces("text/plain") - to("direct:post") - } -} - -from("direct:get") - .id("routes-with-rest-dsl-get") - .transform().constant("Hello World") -from("direct:post") - .id("routes-with-rest-dsl-post") - .setBody().simple("Hello \${body}") - -from("direct:routes-with-rest") - .id("routes-with-rest") - .process().message { - m -> m.headers["AnotherHeader"] = "AnotherHeaderValue" - } - .filter().simple("\${header.AnotherHeader} == 'AnotherHeaderValue'") - .setBody().constant("true") diff --git a/integration-tests/kotlin-dsl/src/main/resources/routes/routes.kts b/integration-tests/kotlin-dsl/src/main/resources/routes/routes.kts deleted file mode 100644 index 1bf9bcd8beb9..000000000000 --- a/integration-tests/kotlin-dsl/src/main/resources/routes/routes.kts +++ /dev/null @@ -1,23 +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. - */ -from("direct:routes") - .id("routes") - .process().message { - m -> m.headers["MyHeader"] = "MyHeaderValue" - } - .filter().simple("\${header.MyHeader} == 'MyHeaderValue'") - .setBody().constant("true") diff --git a/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslIT.java b/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslIT.java deleted file mode 100644 index 7d41693a7ca9..000000000000 --- a/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslIT.java +++ /dev/null @@ -1,24 +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.dsl.kotlin; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -class KotlinDslIT extends KotlinDslTest { - -} diff --git a/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java b/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java deleted file mode 100644 index d0e11ec51e00..000000000000 --- a/integration-tests/kotlin-dsl/src/test/java/org/apache/camel/quarkus/dsl/kotlin/KotlinDslTest.java +++ /dev/null @@ -1,80 +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.dsl.kotlin; - -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import org.apache.camel.dsl.kotlin.KotlinRoutesBuilderLoader; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; - -@QuarkusTest -class KotlinDslTest { - - @Test - void kotlinHello() { - RestAssured.given() - .body("Will Smith") - .post("/kotlin-dsl/hello") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello Will Smith from Kotlin!")); - } - - @Test - void testMainInstanceWithJavaRoutes() { - RestAssured.given() - .get("/kotlin-dsl/main/kotlinRoutesBuilderLoader") - .then() - .statusCode(200) - .body(CoreMatchers.is(KotlinRoutesBuilderLoader.class.getName())); - - RestAssured.given() - .get("/kotlin-dsl/main/routeBuilders") - .then() - .statusCode(200) - .body(CoreMatchers.is("")); - - RestAssured.given() - .get("/kotlin-dsl/main/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is( - "my-kotlin-route,routes,routes-with-components-configuration,routes-with-dataformats-configuration,routes-with-endpoint-dsl,routes-with-error-handler,routes-with-languages-configuration,routes-with-rest,routes-with-rest-dsl-get,routes-with-rest-dsl-post")); - - RestAssured.given() - .get("/kotlin-dsl/main/successful/routes") - .then() - .statusCode(200) - .body(CoreMatchers.is("7")); - } - - @Test - void testRestEndpoints() { - RestAssured.given() - .get("/root/my/path/get") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello World")); - RestAssured.given() - .body("Will") - .post("/root/post") - .then() - .statusCode(200) - .body(CoreMatchers.is("Hello Will")); - } -} diff --git a/integration-tests/kotlin/pom.xml b/integration-tests/kotlin/pom.xml deleted file mode 100644 index c33a4dc9f20f..000000000000 --- a/integration-tests/kotlin/pom.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent-it - 3.17.0-SNAPSHOT - ../../poms/build-parent-it/pom.xml - - - camel-quarkus-integration-test-kotlin - Camel Quarkus :: Integration Tests :: Kotlin :: Tests - The camel integration tests - - - - org.apache.camel.quarkus - camel-quarkus-kotlin - - - org.apache.camel.quarkus - camel-quarkus-direct - - - org.apache.camel.quarkus - camel-quarkus-log - - - - io.quarkus - quarkus-jsonb - - - io.quarkus - quarkus-resteasy-jsonb - - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - org.assertj - assertj-core - test - - - org.apache.camel.quarkus - camel-quarkus-integration-test-support - test - - - - - - - org.jetbrains.kotlin - kotlin-maven-plugin - ${kotlin.version} - - - compile - - compile - - - - ${project.basedir}/src/main/kotlin - - - - - test-compile - - test-compile - - - - ${project.basedir}/src/test/kotlin - - - - - - - all-open - - - - - - - - - - org.jetbrains.kotlin - kotlin-maven-allopen - ${kotlin.version} - - - - - - - - - native - - - native - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - integration-test - verify - - - - - - - - - virtualDependencies - - - !noVirtualDependencies - - - - - - org.apache.camel.quarkus - camel-quarkus-direct-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-kotlin-deployment - ${project.version} - pom - test - - - * - * - - - - - org.apache.camel.quarkus - camel-quarkus-log-deployment - ${project.version} - pom - test - - - * - * - - - - - - - - diff --git a/integration-tests/kotlin/src/main/kotlin/org/apache/camel/quarkus/kotlin/KotlinResource.kt b/integration-tests/kotlin/src/main/kotlin/org/apache/camel/quarkus/kotlin/KotlinResource.kt deleted file mode 100644 index d1ba2d7f68f0..000000000000 --- a/integration-tests/kotlin/src/main/kotlin/org/apache/camel/quarkus/kotlin/KotlinResource.kt +++ /dev/null @@ -1,48 +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.kotlin - -import org.apache.camel.CamelContext -import org.apache.camel.Route -import java.util.stream.Collectors -import jakarta.enterprise.context.ApplicationScoped -import jakarta.inject.Inject -import jakarta.json.Json -import jakarta.json.JsonObject -import jakarta.ws.rs.GET -import jakarta.ws.rs.Path -import jakarta.ws.rs.Produces -import jakarta.ws.rs.core.MediaType - - -@Path("/test") -@ApplicationScoped -class KotlinResource { - @Inject - var context: CamelContext? = null - - @Path("/describe-context") - @GET - @Produces(MediaType.APPLICATION_JSON) - fun describeMain(): JsonObject? { - val routes = context!!.routes.stream().map { obj: Route -> obj.id }.collect(Collectors.toList()) - - return Json.createObjectBuilder() - .add("routes", Json.createArrayBuilder(routes)) - .build() - } -} \ No newline at end of file diff --git a/integration-tests/kotlin/src/main/kotlin/org/apache/camel/quarkus/kotlin/KotlinRoutes.kt b/integration-tests/kotlin/src/main/kotlin/org/apache/camel/quarkus/kotlin/KotlinRoutes.kt deleted file mode 100644 index ee9e1beabc68..000000000000 --- a/integration-tests/kotlin/src/main/kotlin/org/apache/camel/quarkus/kotlin/KotlinRoutes.kt +++ /dev/null @@ -1,39 +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.kotlin - -import org.apache.camel.builder.LambdaRouteBuilder -import jakarta.enterprise.context.ApplicationScoped -import jakarta.enterprise.inject.Produces - - -@ApplicationScoped -class KotlinRoutes { - @Produces - fun withRoutesDsl() = routes { - from("direct:dsl") - .routeId("routes-dsl") - .log("\${body}") - } - - @Produces - fun withLambda() = LambdaRouteBuilder { - it.from("direct:lambda") - .routeId("lambda-dsl") - .log("\${body}") - } -} \ No newline at end of file diff --git a/integration-tests/kotlin/src/test/kotlin/org/apache/camel/quarkus/kotlin/KotlinIT.kt b/integration-tests/kotlin/src/test/kotlin/org/apache/camel/quarkus/kotlin/KotlinIT.kt deleted file mode 100644 index d5ed517f677d..000000000000 --- a/integration-tests/kotlin/src/test/kotlin/org/apache/camel/quarkus/kotlin/KotlinIT.kt +++ /dev/null @@ -1,22 +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.kotlin - -import io.quarkus.test.junit.QuarkusIntegrationTest - -@QuarkusIntegrationTest -class KotlinIT : KotlinTest() \ No newline at end of file diff --git a/integration-tests/kotlin/src/test/kotlin/org/apache/camel/quarkus/kotlin/KotlinTest.kt b/integration-tests/kotlin/src/test/kotlin/org/apache/camel/quarkus/kotlin/KotlinTest.kt deleted file mode 100644 index 77f0c8e7c8ed..000000000000 --- a/integration-tests/kotlin/src/test/kotlin/org/apache/camel/quarkus/kotlin/KotlinTest.kt +++ /dev/null @@ -1,39 +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.kotlin - -import io.quarkus.test.junit.QuarkusTest -import io.restassured.RestAssured -import org.assertj.core.api.Assertions.assertThat -import org.junit.jupiter.api.Test -import jakarta.ws.rs.core.MediaType - -@QuarkusTest -open class KotlinTest { - @Test - fun `routes are created`() { - val p = RestAssured.given() - .accept(MediaType.APPLICATION_JSON)["/test/describe-context"] - .then() - .statusCode(200) - .extract() - .body() - .jsonPath() - - assertThat(p.getList("routes", String::class.java)).contains("routes-dsl", "lambda-dsl") - } -} diff --git a/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java b/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java index 3cc8a2bb9d0e..4145cea89791 100644 --- a/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java +++ b/integration-tests/main-command-mode/src/test/java/org/apache/camel/quarkus/main/cmd/it/CommandModeTest.java @@ -17,6 +17,7 @@ package org.apache.camel.quarkus.main.cmd.it; import java.io.IOException; +import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -91,4 +92,25 @@ void testMainStopsAfterMaxSeconds() throws IOException, InterruptedException, Ex Assertions.fail("The process should not take so long as camel.main.duration-max-seconds is set"); } } + + @Test + void startupCondition() throws Exception { + String[] jvmArgs = new String[] { + "-Dcamel.startupcondition.enabled=true", + "-Dcamel.startupcondition.environment-variable-exists=CAMEL_SPECIES", + "-Dcamel.startupcondition.timeout=100", + "-Dcamel.main.duration-max-seconds=1" + }; + + // Launch the process without the expected environment variable + ProcessResult startupConditionNotMetResult = new QuarkusProcessExecutor(jvmArgs).execute(); + assertThat(startupConditionNotMetResult.getExitValue()).isEqualTo(1); + + // Try again with the environment variable set + Map environment = Map.of("CAMEL_SPECIES", "Dromedary"); + QuarkusProcessExecutor executor = new QuarkusProcessExecutor(customizer -> customizer.environment(environment), + jvmArgs); + ProcessResult startupConditionMetResult = executor.execute(); + assertThat(startupConditionMetResult.getExitValue()).isEqualTo(0); + } } diff --git a/integration-tests/microprofile-fault-tolerance/pom.xml b/integration-tests/microprofile-fault-tolerance/pom.xml index b534e1a64ab7..589acc2fb1c0 100644 --- a/integration-tests/microprofile-fault-tolerance/pom.xml +++ b/integration-tests/microprofile-fault-tolerance/pom.xml @@ -70,7 +70,6 @@ - virtualDependencies diff --git a/integration-tests/pinecone/src/main/java/org/apache/camel/quarkus/component/pinecone/it/PineconeResource.java b/integration-tests/pinecone/src/main/java/org/apache/camel/quarkus/component/pinecone/it/PineconeResource.java index d76af776f100..9f2d7da50319 100644 --- a/integration-tests/pinecone/src/main/java/org/apache/camel/quarkus/component/pinecone/it/PineconeResource.java +++ b/integration-tests/pinecone/src/main/java/org/apache/camel/quarkus/component/pinecone/it/PineconeResource.java @@ -44,7 +44,7 @@ import org.apache.camel.component.pinecone.PineconeVectorDbConfiguration; import org.eclipse.microprofile.config.ConfigProvider; import org.jetbrains.annotations.NotNull; -import org.openapitools.client.model.IndexModel; +import org.openapitools.db_control.client.model.IndexModel; @Path("/pinecone") @ApplicationScoped diff --git a/integration-tests/pinecone/src/test/java/org/apache/camel/quarkus/component/pinecone/it/PineconeTest.java b/integration-tests/pinecone/src/test/java/org/apache/camel/quarkus/component/pinecone/it/PineconeTest.java index 90bd623236f6..3f5fc4f2f47b 100644 --- a/integration-tests/pinecone/src/test/java/org/apache/camel/quarkus/component/pinecone/it/PineconeTest.java +++ b/integration-tests/pinecone/src/test/java/org/apache/camel/quarkus/component/pinecone/it/PineconeTest.java @@ -28,7 +28,7 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.openapitools.client.model.IndexModel; +import org.openapitools.db_control.client.model.IndexModel; import static org.apache.camel.quarkus.component.pinecone.it.PineconeResource.createPineconeClient; import static org.apache.camel.quarkus.component.pinecone.it.PineconeRoutes.INDEX_NAME; @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.openapitools.client.model.IndexModelStatus.StateEnum.READY; +import static org.openapitools.db_control.client.model.IndexModelStatus.StateEnum.READY; @QuarkusTestResource(PineconeTestResource.class) @QuarkusTest diff --git a/integration-tests/pinecone/src/test/resources/mappings/indexes-6e869a73-c72a-4ebf-be81-fa920caa99df.json b/integration-tests/pinecone/src/test/resources/mappings/indexes-0cb5785f-987c-481d-b49a-51dac8cc4a5a.json similarity index 67% rename from integration-tests/pinecone/src/test/resources/mappings/indexes-6e869a73-c72a-4ebf-be81-fa920caa99df.json rename to integration-tests/pinecone/src/test/resources/mappings/indexes-0cb5785f-987c-481d-b49a-51dac8cc4a5a.json index bf7990a1ff0e..fbcfc19f225a 100644 --- a/integration-tests/pinecone/src/test/resources/mappings/indexes-6e869a73-c72a-4ebf-be81-fa920caa99df.json +++ b/integration-tests/pinecone/src/test/resources/mappings/indexes-0cb5785f-987c-481d-b49a-51dac8cc4a5a.json @@ -1,5 +1,5 @@ { - "id" : "6e869a73-c72a-4ebf-be81-fa920caa99df", + "id" : "0cb5785f-987c-481d-b49a-51dac8cc4a5a", "name" : "indexes", "request" : { "url" : "/indexes", @@ -9,19 +9,19 @@ "status" : 200, "body" : "{\"indexes\":[]}", "headers" : { - "X-Cloud-Trace-Context" : "a4b91f07ef1a9299382ac69f1b2f8e60", + "X-Cloud-Trace-Context" : "bd4d9cb6698e7373332f57eaeeea6592", "access-control-allow-origin" : "*", "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000", "Server" : "Google Frontend", "vary" : "origin,access-control-request-method,access-control-request-headers", "content-type" : "application/json", - "Date" : "Tue, 18 Jun 2024 14:46:24 GMT", + "Date" : "Fri, 22 Nov 2024 09:23:39 GMT", "Via" : "1.1 google", - "access-control-expose-headers" : "*", - "x-pinecone-api-version" : "2024-04" + "x-pinecone-api-version" : "2024-10", + "access-control-expose-headers" : "*" } }, - "uuid" : "6e869a73-c72a-4ebf-be81-fa920caa99df", + "uuid" : "0cb5785f-987c-481d-b49a-51dac8cc4a5a", "persistent" : true, "scenarioName" : "scenario-1-indexes", "requiredScenarioState" : "scenario-1-indexes-2", diff --git a/integration-tests/pinecone/src/test/resources/mappings/indexes-764a2311-1f84-43c2-a993-0412caac241b.json b/integration-tests/pinecone/src/test/resources/mappings/indexes-293cf644-849f-4860-809f-13278d509acb.json similarity index 70% rename from integration-tests/pinecone/src/test/resources/mappings/indexes-764a2311-1f84-43c2-a993-0412caac241b.json rename to integration-tests/pinecone/src/test/resources/mappings/indexes-293cf644-849f-4860-809f-13278d509acb.json index fcb10de2dacb..39aef73586db 100644 --- a/integration-tests/pinecone/src/test/resources/mappings/indexes-764a2311-1f84-43c2-a993-0412caac241b.json +++ b/integration-tests/pinecone/src/test/resources/mappings/indexes-293cf644-849f-4860-809f-13278d509acb.json @@ -1,5 +1,5 @@ { - "id" : "764a2311-1f84-43c2-a993-0412caac241b", + "id" : "293cf644-849f-4860-809f-13278d509acb", "name" : "indexes", "request" : { "url" : "/indexes", @@ -7,21 +7,21 @@ }, "response" : { "status" : 200, - "body" : "{\"indexes\":[{\"name\":\"test-index\",\"metric\":\"cosine\",\"dimension\":3,\"status\":{\"ready\":true,\"state\":\"Ready\"},\"host\":\"test-index-3ncz9x1.svc.aped-4627-b74a.pinecone.io\",\"spec\":{\"serverless\":{\"region\":\"us-east-1\",\"cloud\":\"aws\"}}}]}", + "body" : "{\"indexes\":[{\"name\":\"test-index\",\"metric\":\"cosine\",\"dimension\":3,\"status\":{\"ready\":true,\"state\":\"Ready\"},\"host\":\"test-index-3ncz9x1.svc.aped-4627-b74a.pinecone.io\",\"spec\":{\"serverless\":{\"region\":\"us-east-1\",\"cloud\":\"aws\"}},\"deletion_protection\":\"disabled\",\"tags\":null}]}", "headers" : { - "X-Cloud-Trace-Context" : "5160ad22255be98a831fb798589fb58b", + "X-Cloud-Trace-Context" : "5d76189a457047bf315cdd0913392ffe", "access-control-allow-origin" : "*", "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000", "Server" : "Google Frontend", "vary" : "origin,access-control-request-method,access-control-request-headers", "content-type" : "application/json", - "Date" : "Tue, 18 Jun 2024 14:46:23 GMT", + "Date" : "Fri, 22 Nov 2024 09:23:37 GMT", "Via" : "1.1 google", - "access-control-expose-headers" : "*", - "x-pinecone-api-version" : "2024-04" + "x-pinecone-api-version" : "2024-10", + "access-control-expose-headers" : "*" } }, - "uuid" : "764a2311-1f84-43c2-a993-0412caac241b", + "uuid" : "293cf644-849f-4860-809f-13278d509acb", "persistent" : true, "scenarioName" : "scenario-1-indexes", "requiredScenarioState" : "Started", diff --git a/integration-tests/pinecone/src/test/resources/mappings/indexes-1635ea23-b8df-42f0-90d6-d30a4fd8205b.json b/integration-tests/pinecone/src/test/resources/mappings/indexes-5854cd4f-0384-40dd-bfa5-bf36592d3a9b.json similarity index 61% rename from integration-tests/pinecone/src/test/resources/mappings/indexes-1635ea23-b8df-42f0-90d6-d30a4fd8205b.json rename to integration-tests/pinecone/src/test/resources/mappings/indexes-5854cd4f-0384-40dd-bfa5-bf36592d3a9b.json index 6c0c204f489c..6fa62e106de8 100644 --- a/integration-tests/pinecone/src/test/resources/mappings/indexes-1635ea23-b8df-42f0-90d6-d30a4fd8205b.json +++ b/integration-tests/pinecone/src/test/resources/mappings/indexes-5854cd4f-0384-40dd-bfa5-bf36592d3a9b.json @@ -1,33 +1,33 @@ { - "id" : "1635ea23-b8df-42f0-90d6-d30a4fd8205b", + "id" : "5854cd4f-0384-40dd-bfa5-bf36592d3a9b", "name" : "indexes", "request" : { "url" : "/indexes", "method" : "POST", "bodyPatterns" : [ { - "equalToJson" : "{\"name\":\"test-index\",\"dimension\":3,\"metric\":\"cosine\",\"spec\":{\"serverless\":{\"cloud\":\"aws\",\"region\":\"us-east-1\"}}}", + "equalToJson" : "{\"name\":\"test-index\",\"dimension\":3,\"metric\":\"cosine\",\"deletion_protection\":\"disabled\",\"spec\":{\"serverless\":{\"cloud\":\"aws\",\"region\":\"us-east-1\"}}}", "ignoreArrayOrder" : true, "ignoreExtraElements" : true } ] }, "response" : { "status" : 201, - "body" : "{\"name\":\"test-index\",\"metric\":\"cosine\",\"dimension\":3,\"status\":{\"ready\":false,\"state\":\"Initializing\"},\"host\":\"test-index-3ncz9x1.svc.aped-4627-b74a.pinecone.io\",\"spec\":{\"serverless\":{\"region\":\"us-east-1\",\"cloud\":\"aws\"}}}", + "body" : "{\"name\":\"test-index\",\"metric\":\"cosine\",\"dimension\":3,\"status\":{\"ready\":false,\"state\":\"Initializing\"},\"host\":\"test-index-3ncz9x1.svc.aped-4627-b74a.pinecone.io\",\"spec\":{\"serverless\":{\"region\":\"us-east-1\",\"cloud\":\"aws\"}},\"deletion_protection\":\"disabled\",\"tags\":null}", "headers" : { - "X-Cloud-Trace-Context" : "f3437adefa70c626b8ec0df59af4542c", + "X-Cloud-Trace-Context" : "7cae6b2507fa30364f1f71182f9319aa", "access-control-allow-origin" : "*", "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000", "Server" : "Google Frontend", "vary" : "origin,access-control-request-method,access-control-request-headers", "content-type" : "application/json", - "x-pinecone-operation-id" : "0da16235-9603-4f43-ab57-c6bb1ef44b7b", - "Date" : "Tue, 18 Jun 2024 14:46:21 GMT", + "x-pinecone-operation-id" : "4e23a028-63e6-430d-9c8a-bbfab9596819", + "Date" : "Fri, 22 Nov 2024 09:23:35 GMT", "Via" : "1.1 google", - "access-control-expose-headers" : "*", - "x-pinecone-api-version" : "2024-04" + "x-pinecone-api-version" : "2024-10", + "access-control-expose-headers" : "*" } }, - "uuid" : "1635ea23-b8df-42f0-90d6-d30a4fd8205b", + "uuid" : "5854cd4f-0384-40dd-bfa5-bf36592d3a9b", "persistent" : true, "insertionIndex" : 4 } \ No newline at end of file diff --git a/integration-tests/pinecone/src/test/resources/mappings/indexes_test-index-5467c4ff-7174-45cf-a3f6-09ad3fdf02d8.json b/integration-tests/pinecone/src/test/resources/mappings/indexes_test-index-92a8d520-01e3-48ae-89eb-1f51beed3276.json similarity index 63% rename from integration-tests/pinecone/src/test/resources/mappings/indexes_test-index-5467c4ff-7174-45cf-a3f6-09ad3fdf02d8.json rename to integration-tests/pinecone/src/test/resources/mappings/indexes_test-index-92a8d520-01e3-48ae-89eb-1f51beed3276.json index 11e2c1467fe4..28585d82226d 100644 --- a/integration-tests/pinecone/src/test/resources/mappings/indexes_test-index-5467c4ff-7174-45cf-a3f6-09ad3fdf02d8.json +++ b/integration-tests/pinecone/src/test/resources/mappings/indexes_test-index-92a8d520-01e3-48ae-89eb-1f51beed3276.json @@ -1,5 +1,5 @@ { - "id" : "5467c4ff-7174-45cf-a3f6-09ad3fdf02d8", + "id" : "92a8d520-01e3-48ae-89eb-1f51beed3276", "name" : "indexes_test-index", "request" : { "url" : "/indexes/test-index", @@ -8,19 +8,19 @@ "response" : { "status" : 202, "headers" : { - "X-Cloud-Trace-Context" : "2ffac0de0f46c1527e21dcd301338ad5", + "X-Cloud-Trace-Context" : "99e9c93ac1094bbc1a4df5f322b49a40", "access-control-allow-origin" : "*", "Alt-Svc" : "h3=\":443\"; ma=2592000,h3-29=\":443\"; ma=2592000", "Server" : "Google Frontend", "vary" : "origin,access-control-request-method,access-control-request-headers", - "Date" : "Tue, 18 Jun 2024 14:46:23 GMT", + "Date" : "Fri, 22 Nov 2024 09:23:37 GMT", "Via" : "1.1 google", "Content-Type" : "text/html", - "access-control-expose-headers" : "*", - "x-pinecone-api-version" : "2024-04" + "x-pinecone-api-version" : "2024-10", + "access-control-expose-headers" : "*" } }, - "uuid" : "5467c4ff-7174-45cf-a3f6-09ad3fdf02d8", + "uuid" : "92a8d520-01e3-48ae-89eb-1f51beed3276", "persistent" : true, "insertionIndex" : 2 } \ No newline at end of file diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 9fe19cc36cc1..8f6af7c01363 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -104,7 +104,6 @@ graphql grok groovy - groovy-dsl grpc hashicorp-vault hazelcast @@ -131,9 +130,7 @@ joor jpa jq - js-dsl jsch - jsh-dsl jslt json-validator jsonata @@ -148,8 +145,6 @@ kafka-ssl kamelet knative - kotlin - kotlin-dsl kubernetes kudu langchain4j 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 0fc78a3b5ca1..1871e209273a 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 @@ -22,16 +22,16 @@ import java.util.Map; import java.util.Optional; -import com.pubnub.api.PNConfiguration; -import com.pubnub.api.PubNub; import com.pubnub.api.PubNubException; import com.pubnub.api.UserId; -import com.pubnub.api.enums.PNReconnectionPolicy; +import com.pubnub.api.java.PubNub; +import com.pubnub.api.java.v2.PNConfiguration; import com.pubnub.api.models.consumer.history.PNHistoryItemResult; import com.pubnub.api.models.consumer.presence.PNGetStateResult; import com.pubnub.api.models.consumer.presence.PNHereNowResult; import com.pubnub.api.models.consumer.pubsub.PNMessageResult; import com.pubnub.api.models.consumer.pubsub.PNPresenceEventResult; +import com.pubnub.api.retry.RetryConfiguration; import jakarta.inject.Inject; import jakarta.inject.Named; import jakarta.inject.Singleton; @@ -161,18 +161,21 @@ public int herenow() throws Exception { @Singleton @Named public PubNub pubNub() throws PubNubException { - PNConfiguration configuration = new PNConfiguration(new UserId("camel-quarkus-integration-tests")); - configuration.setPublishKey(publishKey); - configuration.setSubscribeKey(subscribeKey); - configuration.setSecretKey(secretKey); + PNConfiguration.Builder configuration = PNConfiguration + .builder(new UserId("camel-quarkus-integration-tests"), subscribeKey) + .publishKey(publishKey) + .subscribeKey(subscribeKey) + .secretKey(secretKey); Optional url = ConfigProvider.getConfig().getOptionalValue("pubnub.url", String.class); if (url.isPresent()) { - configuration.setOrigin(url.get()); - configuration.setSecure(false); - configuration.setReconnectionPolicy(PNReconnectionPolicy.LINEAR); + configuration.origin(url.get()) + .secure(false) + .retryConfiguration(new RetryConfiguration.Linear( + 5, + 1000)); } - return PubNub.create(configuration); + return PubNub.create(configuration.build()); } } diff --git a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java index 241534698c42..17794d116f0b 100644 --- a/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java +++ b/integration-tests/smb/src/main/java/org/apache/camel/quarkus/component/smb/it/SmbResource.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.stream.Collectors; -import com.hierynomus.smbj.share.File; import jakarta.enterprise.context.ApplicationScoped; import jakarta.inject.Inject; import jakarta.inject.Named; @@ -35,6 +34,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.component.smb.SmbConstants; +import org.apache.camel.component.smb.SmbFile; import org.eclipse.microprofile.config.inject.ConfigProperty; @Path("/smb") @@ -88,7 +88,7 @@ public String receive(String fileName) throws Exception { String uri = String.format("smb:%s:%s/%s?username=%s&password=%s&searchPattern=%s&path=/", host, port, share, username, password, fileName); - var shareFile = consumer.receiveBody(uri, File.class); + var shareFile = consumer.receiveBody(uri, SmbFile.class); return new String(shareFile.getInputStream().readAllBytes(), "UTF-8"); } 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 a101b0b80979..e6a566520a64 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 @@ -16,12 +16,10 @@ */ package org.apache.camel.quarkus.component.smb.it; -import java.io.InputStream; import java.util.List; import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; -import com.hierynomus.smbj.share.File; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; import jakarta.inject.Inject; @@ -29,6 +27,7 @@ import jakarta.inject.Singleton; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.smb.SmbConstants; +import org.apache.camel.component.smb.SmbFile; import org.eclipse.microprofile.config.inject.ConfigProperty; @ApplicationScoped @@ -64,8 +63,8 @@ public void configure() throws Exception { from("smb:{{smb.host}}:{{smb.port}}/{{smb.share}}?username={{smb.username}}&password={{smb.password}}&path=/&searchPattern=*.tx1") .process(e -> { receivedContents.add(Map.of( - "path", e.getIn().getBody(File.class).getPath(), - "content", new String(e.getIn().getBody(InputStream.class).readAllBytes(), "UTF-8"), + "path", e.getIn().getBody(SmbFile.class).getPath(), + "content", new String(e.getIn().getBody(SmbFile.class).getInputStream().readAllBytes(), "UTF-8"), SmbConstants.SMB_FILE_PATH, e.getIn().getHeader(SmbConstants.SMB_FILE_PATH, String.class), SmbConstants.SMB_UNC_PATH, e.getIn().getHeader(SmbConstants.SMB_UNC_PATH, String.class))); }); diff --git a/pom.xml b/pom.xml index 50f86c20a1a9..b2943a8ac24d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies - 4.8.1 + 4.9.0 org.apache.camel.quarkus @@ -39,8 +39,8 @@ - 4.8 - ${camel.major.minor}.1 + 4.9 + ${camel.major.minor}.0 ${camel.major.minor}.x ${camel.docs.components.version}@components camel-${camel.major.minor}.x @@ -77,8 +77,8 @@ 3.26.3 1.11.714 ${azure-sdk-bom-version} - 1.51.0 - 1.13.2 + 1.53.0 + 1.14.0 1.0.0-beta.21 3.7.1 1.79 @@ -96,11 +96,11 @@ 2.3.33 0.6.2 1.313 - 1.24.1 + 1.29.0 ${google-oauth-client-version} - 0.226.0 - 1.132.1 - 1.132.1 + 0.231.0 + 1.134.1 + 1.134.1 23.1.2 jdk21 4.0.21 @@ -108,7 +108,7 @@ ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} - 6.3.23 + 6.4.0 5.2.3 9.4.0.5 ${icu4j-version} @@ -127,7 +127,7 @@ ${json-path-version} ${jedis-client-version} 2.5.0 - 1.0.3 + 1.1.0 3.7.1 ${kudu-version} 2.0.21 @@ -136,7 +136,7 @@ 0.36.2 ${mapstruct-version} 8.5.12 - 1.16.2 + 1.17.2 1.0.0 2.5.2.Final 3.5.16 @@ -161,10 +161,10 @@ 1.0.54 ${swagger-openapi3-java-parser-version} 0.43.1 - 1.6.9 + 1.7.0 2.7.2 ${xchange-version} - 2.9 + 2.10 ${web3j-version} ${web3j-quorum-version} ${zookeeper-version} @@ -218,7 +218,7 @@ docker.io/rmohr/activemq:5.15.9-alpine docker.io/arangodb:3.12.0 - mcr.microsoft.com/azure-storage/azurite:3.31.0 + mcr.microsoft.com/azure-storage/azurite:3.32.0 quay.io/l2x6/calculator-ws:1.2 docker.io/cassandra:4.1.3 docker.io/hashicorp/consul:1.19 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 3a92a05d7650..a96707c3f699 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -253,6 +253,10 @@ commons-logging commons-logging + + org.checkerframework + checker-qual + @@ -315,6 +319,10 @@ camel-aws2-kinesis ${camel.version} + + com.google.code.findbugs + jsr305 + commons-logging commons-logging @@ -806,6 +814,10 @@ camel-datasonnet ${camel.version} + + ch.qos.logback + logback-classic + jakarta.activation jakarta.activation-api @@ -1331,16 +1343,6 @@ camel-groovy ${camel.version} - - org.apache.camel - camel-groovy-dsl - ${camel.version} - - - org.apache.camel - camel-groovy-dsl-common - ${camel.version} - org.apache.camel camel-grpc @@ -1697,27 +1699,11 @@ - - org.apache.camel - camel-js-dsl - ${camel.version} - - - org.graalvm.js - js - - - org.apache.camel camel-jsch ${camel.version} - - org.apache.camel - camel-jsh-dsl - ${camel.version} - org.apache.camel camel-jslt @@ -1788,11 +1774,6 @@ camel-knative-http ${camel.version} - - org.apache.camel - camel-kotlin-dsl - ${camel.version} - org.apache.camel camel-kubernetes @@ -4165,16 +4146,6 @@ camel-quarkus-groovy-deployment ${camel-quarkus.version} - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl-deployment - ${camel-quarkus.version} - org.apache.camel.quarkus camel-quarkus-grpc @@ -4550,16 +4521,6 @@ camel-quarkus-jq-deployment ${camel-quarkus.version} - - org.apache.camel.quarkus - camel-quarkus-js-dsl - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-js-dsl-deployment - ${camel-quarkus.version} - org.apache.camel.quarkus camel-quarkus-jsch @@ -4570,16 +4531,6 @@ camel-quarkus-jsch-deployment ${camel-quarkus.version} - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl-deployment - ${camel-quarkus.version} - org.apache.camel.quarkus camel-quarkus-jslt @@ -4725,26 +4676,6 @@ camel-quarkus-knative-producer-deployment ${camel-quarkus.version} - - org.apache.camel.quarkus - camel-quarkus-kotlin - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-kotlin-deployment - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl-deployment - ${camel-quarkus.version} - org.apache.camel.quarkus camel-quarkus-kubernetes @@ -7262,11 +7193,6 @@ javassist ${javassist.version} - - org.jetbrains.kotlin - kotlin-script-util - ${kotlin.version} - org.jetbrains.kotlin kotlin-scripting-compiler-embeddable @@ -7277,16 +7203,6 @@ kotlin-scripting-compiler-impl-embeddable ${kotlin.version} - - org.jetbrains.kotlin - kotlin-scripting-jvm - ${kotlin.version} - - - org.jetbrains.kotlin - kotlin-scripting-jvm-host - ${kotlin.version} - org.jetbrains.kotlinx kotlinx-serialization-core-jvm diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index e3b78f882376..eafd2baa784d 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -53,32 +53,32 @@ org.apache.camel camel-activemq - 4.8.1 + 4.9.0 org.apache.camel camel-amqp - 4.8.1 + 4.9.0 org.apache.camel camel-api - 4.8.1 + 4.9.0 org.apache.camel camel-arangodb - 4.8.1 + 4.9.0 org.apache.camel camel-as2 - 4.8.1 + 4.9.0 org.apache.camel camel-as2-api - 4.8.1 + 4.9.0 commons-logging @@ -93,12 +93,12 @@ org.apache.camel camel-asn1 - 4.8.1 + 4.9.0 org.apache.camel camel-asterisk - 4.8.1 + 4.9.0 org.checkerframework @@ -109,7 +109,7 @@ org.apache.camel camel-atom - 4.8.1 + 4.9.0 commons-logging @@ -120,17 +120,17 @@ org.apache.camel camel-attachments - 4.8.1 + 4.9.0 org.apache.camel camel-avro - 4.8.1 + 4.9.0 org.apache.camel camel-aws-bedrock - 4.8.1 + 4.9.0 commons-logging @@ -141,7 +141,7 @@ org.apache.camel camel-aws-secrets-manager - 4.8.1 + 4.9.0 commons-logging @@ -152,7 +152,7 @@ org.apache.camel camel-aws-xray - 4.8.1 + 4.9.0 commons-logging @@ -163,7 +163,7 @@ org.apache.camel camel-aws2-athena - 4.8.1 + 4.9.0 commons-logging @@ -174,7 +174,7 @@ org.apache.camel camel-aws2-cw - 4.8.1 + 4.9.0 commons-logging @@ -185,18 +185,22 @@ org.apache.camel camel-aws2-ddb - 4.8.1 + 4.9.0 commons-logging commons-logging + + org.checkerframework + checker-qual + org.apache.camel camel-aws2-ec2 - 4.8.1 + 4.9.0 commons-logging @@ -207,7 +211,7 @@ org.apache.camel camel-aws2-ecs - 4.8.1 + 4.9.0 commons-logging @@ -218,7 +222,7 @@ org.apache.camel camel-aws2-eks - 4.8.1 + 4.9.0 commons-logging @@ -229,7 +233,7 @@ org.apache.camel camel-aws2-eventbridge - 4.8.1 + 4.9.0 commons-logging @@ -240,7 +244,7 @@ org.apache.camel camel-aws2-iam - 4.8.1 + 4.9.0 commons-logging @@ -251,8 +255,12 @@ org.apache.camel camel-aws2-kinesis - 4.8.1 + 4.9.0 + + com.google.code.findbugs + jsr305 + commons-logging commons-logging @@ -270,7 +278,7 @@ org.apache.camel camel-aws2-kms - 4.8.1 + 4.9.0 commons-logging @@ -281,7 +289,7 @@ org.apache.camel camel-aws2-lambda - 4.8.1 + 4.9.0 commons-logging @@ -292,7 +300,7 @@ org.apache.camel camel-aws2-mq - 4.8.1 + 4.9.0 commons-logging @@ -303,7 +311,7 @@ org.apache.camel camel-aws2-msk - 4.8.1 + 4.9.0 commons-logging @@ -314,7 +322,7 @@ org.apache.camel camel-aws2-s3 - 4.8.1 + 4.9.0 commons-logging @@ -325,7 +333,7 @@ org.apache.camel camel-aws2-ses - 4.8.1 + 4.9.0 commons-logging @@ -336,7 +344,7 @@ org.apache.camel camel-aws2-sns - 4.8.1 + 4.9.0 commons-logging @@ -347,7 +355,7 @@ org.apache.camel camel-aws2-sqs - 4.8.1 + 4.9.0 commons-logging @@ -358,7 +366,7 @@ org.apache.camel camel-aws2-sts - 4.8.1 + 4.9.0 commons-logging @@ -369,7 +377,7 @@ org.apache.camel camel-aws2-translate - 4.8.1 + 4.9.0 commons-logging @@ -380,7 +388,7 @@ org.apache.camel camel-azure-cosmosdb - 4.8.1 + 4.9.0 com.azure @@ -391,7 +399,7 @@ org.apache.camel camel-azure-eventhubs - 4.8.1 + 4.9.0 com.azure @@ -402,7 +410,7 @@ org.apache.camel camel-azure-key-vault - 4.8.1 + 4.9.0 com.azure @@ -413,7 +421,7 @@ org.apache.camel camel-azure-servicebus - 4.8.1 + 4.9.0 com.azure @@ -424,7 +432,7 @@ org.apache.camel camel-azure-storage-blob - 4.8.1 + 4.9.0 com.azure @@ -435,7 +443,7 @@ org.apache.camel camel-azure-storage-datalake - 4.8.1 + 4.9.0 com.azure @@ -446,7 +454,7 @@ org.apache.camel camel-azure-storage-queue - 4.8.1 + 4.9.0 com.azure @@ -457,37 +465,37 @@ org.apache.camel camel-barcode - 4.8.1 + 4.9.0 org.apache.camel camel-base - 4.8.1 + 4.9.0 org.apache.camel camel-base-engine - 4.8.1 + 4.9.0 org.apache.camel camel-base64 - 4.8.1 + 4.9.0 org.apache.camel camel-bean - 4.8.1 + 4.9.0 org.apache.camel camel-bean-validator - 4.8.1 + 4.9.0 org.apache.camel camel-beanio - 4.8.1 + 4.9.0 jakarta.activation @@ -502,17 +510,17 @@ org.apache.camel camel-bindy - 4.8.1 + 4.9.0 org.apache.camel camel-bonita - 4.8.1 + 4.9.0 org.apache.camel camel-box - 4.8.1 + 4.9.0 commons-logging @@ -523,27 +531,27 @@ org.apache.camel camel-box-api - 4.8.1 + 4.9.0 org.apache.camel camel-braintree - 4.8.1 + 4.9.0 org.apache.camel camel-browse - 4.8.1 + 4.9.0 org.apache.camel camel-caffeine - 4.8.1 + 4.9.0 org.apache.camel camel-cassandraql - 4.8.1 + 4.9.0 com.github.spotbugs @@ -558,47 +566,47 @@ org.apache.camel camel-catalog - 4.8.1 + 4.9.0 org.apache.camel camel-cbor - 4.8.1 + 4.9.0 org.apache.camel camel-chatscript - 4.8.1 + 4.9.0 org.apache.camel camel-chunk - 4.8.1 + 4.9.0 org.apache.camel camel-cli-connector - 4.8.1 + 4.9.0 org.apache.camel camel-cloud - 4.8.1 + 4.9.0 org.apache.camel camel-cloudevents - 4.8.1 + 4.9.0 org.apache.camel camel-cluster - 4.8.1 + 4.9.0 org.apache.camel camel-cm-sms - 4.8.1 + 4.9.0 commons-logging @@ -609,27 +617,27 @@ org.apache.camel camel-coap - 4.8.1 + 4.9.0 org.apache.camel camel-cometd - 4.8.1 + 4.9.0 org.apache.camel camel-componentdsl - 4.8.1 + 4.9.0 org.apache.camel camel-console - 4.8.1 + 4.9.0 org.apache.camel camel-consul - 4.8.1 + 4.9.0 org.checkerframework @@ -640,47 +648,47 @@ org.apache.camel camel-controlbus - 4.8.1 + 4.9.0 org.apache.camel camel-core-catalog - 4.8.1 + 4.9.0 org.apache.camel camel-core-engine - 4.8.1 + 4.9.0 org.apache.camel camel-core-languages - 4.8.1 + 4.9.0 org.apache.camel camel-core-model - 4.8.1 + 4.9.0 org.apache.camel camel-core-processor - 4.8.1 + 4.9.0 org.apache.camel camel-core-reifier - 4.8.1 + 4.9.0 org.apache.camel camel-couchbase - 4.8.1 + 4.9.0 org.apache.camel camel-couchdb - 4.8.1 + 4.9.0 commons-logging @@ -691,12 +699,12 @@ org.apache.camel camel-cron - 4.8.1 + 4.9.0 org.apache.camel camel-crypto - 4.8.1 + 4.9.0 org.bouncycastle @@ -707,43 +715,47 @@ org.apache.camel camel-crypto-pgp - 4.8.1 + 4.9.0 org.apache.camel camel-csv - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-common - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-soap - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-transport - 4.8.1 + 4.9.0 org.apache.camel camel-dataformat - 4.8.1 + 4.9.0 org.apache.camel camel-dataset - 4.8.1 + 4.9.0 org.apache.camel camel-datasonnet - 4.8.1 + 4.9.0 + + ch.qos.logback + logback-classic + jakarta.activation jakarta.activation-api @@ -769,7 +781,7 @@ org.apache.camel camel-debezium-common - 4.8.1 + 4.9.0 javax.ws.rs @@ -780,32 +792,32 @@ org.apache.camel camel-debezium-mongodb - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-mysql - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-postgres - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-sqlserver - 4.8.1 + 4.9.0 org.apache.camel camel-debug - 4.8.1 + 4.9.0 org.apache.camel camel-digitalocean - 4.8.1 + 4.9.0 commons-logging @@ -816,17 +828,17 @@ org.apache.camel camel-direct - 4.8.1 + 4.9.0 org.apache.camel camel-disruptor - 4.8.1 + 4.9.0 org.apache.camel camel-djl - 4.8.1 + 4.9.0 org.checkerframework @@ -837,12 +849,12 @@ org.apache.camel camel-dns - 4.8.1 + 4.9.0 org.apache.camel camel-drill - 4.8.1 + 4.9.0 ch.qos.logback @@ -869,7 +881,7 @@ org.apache.camel camel-dropbox - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -880,22 +892,22 @@ org.apache.camel camel-dsl-modeline - 4.8.1 + 4.9.0 org.apache.camel camel-dsl-support - 4.8.1 + 4.9.0 org.apache.camel camel-ehcache - 4.8.1 + 4.9.0 org.apache.camel camel-elasticsearch - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -910,7 +922,7 @@ org.apache.camel camel-elasticsearch-rest-client - 4.8.1 + 4.9.0 commons-logging @@ -921,7 +933,7 @@ org.apache.camel camel-endpointdsl - 4.8.1 + 4.9.0 com.sun.mail @@ -932,12 +944,12 @@ org.apache.camel camel-endpointdsl-support - 4.8.1 + 4.9.0 org.apache.camel camel-etcd3 - 4.8.1 + 4.9.0 com.google.android @@ -960,42 +972,42 @@ org.apache.camel camel-exec - 4.8.1 + 4.9.0 org.apache.camel camel-fastjson - 4.8.1 + 4.9.0 org.apache.camel camel-fhir - 4.8.1 + 4.9.0 org.apache.camel camel-fhir-api - 4.8.1 + 4.9.0 org.apache.camel camel-file - 4.8.1 + 4.9.0 org.apache.camel camel-file-watch - 4.8.1 + 4.9.0 org.apache.camel camel-flatpack - 4.8.1 + 4.9.0 org.apache.camel camel-flink - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -1006,7 +1018,7 @@ org.apache.camel camel-fop - 4.8.1 + 4.9.0 commons-logging @@ -1021,17 +1033,17 @@ org.apache.camel camel-freemarker - 4.8.1 + 4.9.0 org.apache.camel camel-ftp - 4.8.1 + 4.9.0 org.apache.camel camel-geocoder - 4.8.1 + 4.9.0 commons-logging @@ -1042,17 +1054,17 @@ org.apache.camel camel-git - 4.8.1 + 4.9.0 org.apache.camel camel-github - 4.8.1 + 4.9.0 org.apache.camel camel-google-bigquery - 4.8.1 + 4.9.0 com.google.android @@ -1079,7 +1091,7 @@ org.apache.camel camel-google-calendar - 4.8.1 + 4.9.0 commons-logging @@ -1094,7 +1106,7 @@ org.apache.camel camel-google-drive - 4.8.1 + 4.9.0 commons-logging @@ -1109,7 +1121,7 @@ org.apache.camel camel-google-functions - 4.8.1 + 4.9.0 com.google.android @@ -1136,7 +1148,7 @@ org.apache.camel camel-google-mail - 4.8.1 + 4.9.0 commons-logging @@ -1151,7 +1163,7 @@ org.apache.camel camel-google-pubsub - 4.8.1 + 4.9.0 com.google.android @@ -1178,7 +1190,7 @@ org.apache.camel camel-google-secret-manager - 4.8.1 + 4.9.0 com.google.android @@ -1209,7 +1221,7 @@ org.apache.camel camel-google-sheets - 4.8.1 + 4.9.0 commons-logging @@ -1224,7 +1236,7 @@ org.apache.camel camel-google-storage - 4.8.1 + 4.9.0 com.google.android @@ -1251,7 +1263,7 @@ org.apache.camel camel-graphql - 4.8.1 + 4.9.0 commons-logging @@ -1262,27 +1274,17 @@ org.apache.camel camel-grok - 4.8.1 + 4.9.0 org.apache.camel camel-groovy - 4.8.1 - - - org.apache.camel - camel-groovy-dsl - 4.8.1 - - - org.apache.camel - camel-groovy-dsl-common - 4.8.1 + 4.9.0 org.apache.camel camel-grpc - 4.8.1 + 4.9.0 com.google.android @@ -1313,12 +1315,12 @@ org.apache.camel camel-gson - 4.8.1 + 4.9.0 org.apache.camel camel-guava-eventbus - 4.8.1 + 4.9.0 org.checkerframework @@ -1329,7 +1331,7 @@ org.apache.camel camel-hashicorp-vault - 4.8.1 + 4.9.0 org.springframework @@ -1348,12 +1350,12 @@ org.apache.camel camel-hazelcast - 4.8.1 + 4.9.0 org.apache.camel camel-headersmap - 4.8.1 + 4.9.0 ch.qos.logback @@ -1364,17 +1366,17 @@ org.apache.camel camel-health - 4.8.1 + 4.9.0 org.apache.camel camel-hl7 - 4.8.1 + 4.9.0 org.apache.camel camel-http - 4.8.1 + 4.9.0 commons-logging @@ -1385,27 +1387,27 @@ org.apache.camel camel-http-base - 4.8.1 + 4.9.0 org.apache.camel camel-http-common - 4.8.1 + 4.9.0 org.apache.camel camel-huaweicloud-common - 4.8.1 + 4.9.0 org.apache.camel camel-huaweicloud-smn - 4.8.1 + 4.9.0 org.apache.camel camel-ical - 4.8.1 + 4.9.0 commons-logging @@ -1416,7 +1418,7 @@ org.apache.camel camel-iec60870 - 4.8.1 + 4.9.0 org.checkerframework @@ -1427,12 +1429,12 @@ org.apache.camel camel-ignite - 4.8.1 + 4.9.0 org.apache.camel camel-infinispan - 4.8.1 + 4.9.0 org.infinispan @@ -1451,57 +1453,57 @@ org.apache.camel camel-infinispan-common - 4.8.1 + 4.9.0 org.apache.camel camel-influxdb - 4.8.1 + 4.9.0 org.apache.camel camel-irc - 4.8.1 + 4.9.0 org.apache.camel camel-jackson - 4.8.1 + 4.9.0 org.apache.camel camel-jackson-avro - 4.8.1 + 4.9.0 org.apache.camel camel-jackson-protobuf - 4.8.1 + 4.9.0 org.apache.camel camel-jacksonxml - 4.8.1 + 4.9.0 org.apache.camel camel-jasypt - 4.8.1 + 4.9.0 org.apache.camel camel-java-joor-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-javascript - 4.8.1 + 4.9.0 org.apache.camel camel-jaxb - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -1512,12 +1514,12 @@ org.apache.camel camel-jcache - 4.8.1 + 4.9.0 org.apache.camel camel-jcr - 4.8.1 + 4.9.0 org.slf4j @@ -1528,27 +1530,27 @@ org.apache.camel camel-jdbc - 4.8.1 + 4.9.0 org.apache.camel camel-jfr - 4.8.1 + 4.9.0 org.apache.camel camel-jgroups - 4.8.1 + 4.9.0 org.apache.camel camel-jgroups-raft - 4.8.1 + 4.9.0 org.apache.camel camel-jira - 4.8.1 + 4.9.0 commons-logging @@ -1567,7 +1569,7 @@ org.apache.camel camel-jms - 4.8.1 + 4.9.0 org.apache.camel @@ -1586,12 +1588,12 @@ org.apache.camel camel-jolt - 4.8.1 + 4.9.0 org.apache.camel camel-jooq - 4.8.1 + 4.9.0 org.springframework @@ -1602,12 +1604,12 @@ org.apache.camel camel-joor - 4.8.1 + 4.9.0 org.apache.camel camel-jpa - 4.8.1 + 4.9.0 org.apache.camel @@ -1622,7 +1624,7 @@ org.apache.camel camel-jq - 4.8.1 + 4.9.0 net.thisptr @@ -1634,106 +1636,85 @@ - - org.apache.camel - camel-js-dsl - 4.8.1 - - - org.graalvm.js - js - - - org.apache.camel camel-jsch - 4.8.1 - - - org.apache.camel - camel-jsh-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-jslt - 4.8.1 + 4.9.0 org.apache.camel camel-json-patch - 4.8.1 + 4.9.0 org.apache.camel camel-json-validator - 4.8.1 + 4.9.0 org.apache.camel camel-jsonapi - 4.8.1 + 4.9.0 org.apache.camel camel-jsonata - 4.8.1 + 4.9.0 org.apache.camel camel-jsonb - 4.8.1 + 4.9.0 org.apache.camel camel-jsonpath - 4.8.1 + 4.9.0 org.apache.camel camel-jt400 - 4.8.1 + 4.9.0 org.apache.camel camel-jta - 4.8.1 + 4.9.0 org.apache.camel camel-kafka - 4.8.1 + 4.9.0 org.apache.camel camel-kamelet - 4.8.1 + 4.9.0 org.apache.camel camel-knative - 4.8.1 + 4.9.0 org.apache.camel camel-knative-api - 4.8.1 + 4.9.0 org.apache.camel camel-knative-http - 4.8.1 - - - org.apache.camel - camel-kotlin-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-kubernetes - 4.8.1 + 4.9.0 io.fabric8 @@ -1756,57 +1737,57 @@ org.apache.camel camel-kudu - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-chat - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-core - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-embeddings - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-tokenizer - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-tools - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-web-search - 4.8.1 + 4.9.0 org.apache.camel camel-language - 4.8.1 + 4.9.0 org.apache.camel camel-ldap - 4.8.1 + 4.9.0 org.apache.camel camel-ldif - 4.8.1 + 4.9.0 org.apache.camel camel-leveldb - 4.8.1 + 4.9.0 org.checkerframework @@ -1817,82 +1798,82 @@ org.apache.camel camel-log - 4.8.1 + 4.9.0 org.apache.camel camel-lra - 4.8.1 + 4.9.0 org.apache.camel camel-lucene - 4.8.1 + 4.9.0 org.apache.camel camel-lumberjack - 4.8.1 + 4.9.0 org.apache.camel camel-lzf - 4.8.1 + 4.9.0 org.apache.camel camel-mail - 4.8.1 + 4.9.0 org.apache.camel camel-mail-microsoft-oauth - 4.8.1 + 4.9.0 org.apache.camel camel-main - 4.8.1 + 4.9.0 org.apache.camel camel-management - 4.8.1 + 4.9.0 org.apache.camel camel-management-api - 4.8.1 + 4.9.0 org.apache.camel camel-mapstruct - 4.8.1 + 4.9.0 org.apache.camel camel-master - 4.8.1 + 4.9.0 org.apache.camel camel-micrometer - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-config - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-fault-tolerance - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-health - 4.8.1 + 4.9.0 org.eclipse.parsson @@ -1907,7 +1888,7 @@ org.apache.camel camel-milvus - 4.8.1 + 4.9.0 com.google.android @@ -1946,62 +1927,62 @@ org.apache.camel camel-minio - 4.8.1 + 4.9.0 org.apache.camel camel-mllp - 4.8.1 + 4.9.0 org.apache.camel camel-mock - 4.8.1 + 4.9.0 org.apache.camel camel-mongodb - 4.8.1 + 4.9.0 org.apache.camel camel-mongodb-gridfs - 4.8.1 + 4.9.0 org.apache.camel camel-mustache - 4.8.1 + 4.9.0 org.apache.camel camel-mvel - 4.8.1 + 4.9.0 org.apache.camel camel-mybatis - 4.8.1 + 4.9.0 org.apache.camel camel-nats - 4.8.1 + 4.9.0 org.apache.camel camel-netty - 4.8.1 + 4.9.0 org.apache.camel camel-netty-http - 4.8.1 + 4.9.0 org.apache.camel camel-nitrite - 4.8.1 + 4.9.0 javax.validation @@ -2012,7 +1993,7 @@ org.apache.camel camel-oaipmh - 4.8.1 + 4.9.0 commons-logging @@ -2023,12 +2004,12 @@ org.apache.camel camel-ognl - 4.8.1 + 4.9.0 org.apache.camel camel-olingo4 - 4.8.1 + 4.9.0 commons-logging @@ -2039,7 +2020,7 @@ org.apache.camel camel-olingo4-api - 4.8.1 + 4.9.0 commons-logging @@ -2050,7 +2031,7 @@ org.apache.camel camel-openapi-java - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2065,7 +2046,7 @@ org.apache.camel camel-opensearch - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2080,7 +2061,7 @@ org.apache.camel camel-openstack - 4.8.1 + 4.9.0 com.github.fge @@ -2095,7 +2076,7 @@ org.apache.camel camel-opentelemetry - 4.8.1 + 4.9.0 io.grpc @@ -2106,7 +2087,7 @@ org.apache.camel camel-optaplanner - 4.8.1 + 4.9.0 org.optaplanner @@ -2125,17 +2106,17 @@ org.apache.camel camel-paho - 4.8.1 + 4.9.0 org.apache.camel camel-paho-mqtt5 - 4.8.1 + 4.9.0 org.apache.camel camel-pdf - 4.8.1 + 4.9.0 commons-logging @@ -2146,12 +2127,12 @@ org.apache.camel camel-pg-replication-slot - 4.8.1 + 4.9.0 org.apache.camel camel-pgevent - 4.8.1 + 4.9.0 org.testcontainers @@ -2162,7 +2143,7 @@ org.apache.camel camel-pinecone - 4.8.1 + 4.9.0 com.google.android @@ -2185,22 +2166,22 @@ org.apache.camel camel-platform-http - 4.8.1 + 4.9.0 org.apache.camel camel-platform-http-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-printer - 4.8.1 + 4.9.0 org.apache.camel camel-protobuf - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2211,12 +2192,12 @@ org.apache.camel camel-pubnub - 4.8.1 + 4.9.0 org.apache.camel camel-pulsar - 4.8.1 + 4.9.0 com.sun.activation @@ -2251,7 +2232,7 @@ org.apache.camel camel-qdrant - 4.8.1 + 4.9.0 com.google.android @@ -2274,7 +2255,7 @@ org.apache.camel camel-quartz - 4.8.1 + 4.9.0 jakarta.activation @@ -2297,37 +2278,37 @@ org.apache.camel camel-quickfix - 4.8.1 + 4.9.0 org.apache.camel camel-reactive-executor-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-reactive-streams - 4.8.1 + 4.9.0 org.apache.camel camel-redis - 4.8.1 + 4.9.0 org.apache.camel camel-ref - 4.8.1 + 4.9.0 org.apache.camel camel-rest - 4.8.1 + 4.9.0 org.apache.camel camel-rest-openapi - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2342,22 +2323,22 @@ org.apache.camel camel-robotframework - 4.8.1 + 4.9.0 org.apache.camel camel-rss - 4.8.1 + 4.9.0 org.apache.camel camel-saga - 4.8.1 + 4.9.0 org.apache.camel camel-salesforce - 4.8.1 + 4.9.0 com.google.android @@ -2384,12 +2365,12 @@ org.apache.camel camel-sap-netweaver - 4.8.1 + 4.9.0 org.apache.camel camel-saxon - 4.8.1 + 4.9.0 xml-apis @@ -2400,12 +2381,12 @@ org.apache.camel camel-scheduler - 4.8.1 + 4.9.0 org.apache.camel camel-schematron - 4.8.1 + 4.9.0 xml-apis @@ -2416,42 +2397,42 @@ org.apache.camel camel-seda - 4.8.1 + 4.9.0 org.apache.camel camel-servicenow - 4.8.1 + 4.9.0 org.apache.camel camel-servlet - 4.8.1 + 4.9.0 org.apache.camel camel-shiro - 4.8.1 + 4.9.0 org.apache.camel camel-sjms - 4.8.1 + 4.9.0 org.apache.camel camel-sjms2 - 4.8.1 + 4.9.0 org.apache.camel camel-slack - 4.8.1 + 4.9.0 org.apache.camel camel-smb - 4.8.1 + 4.9.0 junit @@ -2462,22 +2443,22 @@ org.apache.camel camel-smpp - 4.8.1 + 4.9.0 org.apache.camel camel-snakeyaml - 4.8.1 + 4.9.0 org.apache.camel camel-snmp - 4.8.1 + 4.9.0 org.apache.camel camel-soap - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2492,12 +2473,12 @@ org.apache.camel camel-splunk - 4.8.1 + 4.9.0 org.apache.camel camel-splunk-hec - 4.8.1 + 4.9.0 commons-logging @@ -2508,7 +2489,7 @@ org.apache.camel camel-spring-rabbitmq - 4.8.1 + 4.9.0 org.springframework @@ -2523,17 +2504,17 @@ org.apache.camel camel-spring-redis - 4.8.1 + 4.9.0 org.apache.camel camel-sql - 4.8.1 + 4.9.0 org.apache.camel camel-ssh - 4.8.1 + 4.9.0 org.slf4j @@ -2544,42 +2525,42 @@ org.apache.camel camel-stax - 4.8.1 + 4.9.0 org.apache.camel camel-stitch - 4.8.1 + 4.9.0 org.apache.camel camel-stomp - 4.8.1 + 4.9.0 org.apache.camel camel-stream - 4.8.1 + 4.9.0 org.apache.camel camel-stringtemplate - 4.8.1 + 4.9.0 org.apache.camel camel-stub - 4.8.1 + 4.9.0 org.apache.camel camel-support - 4.8.1 + 4.9.0 org.apache.camel camel-swift - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2590,22 +2571,22 @@ org.apache.camel camel-syslog - 4.8.1 + 4.9.0 org.apache.camel camel-tarfile - 4.8.1 + 4.9.0 org.apache.camel camel-telegram - 4.8.1 + 4.9.0 org.apache.camel camel-test-junit5 - 4.8.1 + 4.9.0 org.apache.camel @@ -2616,17 +2597,17 @@ org.apache.camel camel-threadpoolfactory-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-thrift - 4.8.1 + 4.9.0 org.apache.camel camel-tika - 4.8.1 + 4.9.0 org.apache.tika @@ -2637,27 +2618,27 @@ org.apache.camel camel-timer - 4.8.1 + 4.9.0 org.apache.camel camel-tooling-model - 4.8.1 + 4.9.0 org.apache.camel camel-tooling-util - 4.8.1 + 4.9.0 org.apache.camel camel-tracing - 4.8.1 + 4.9.0 org.apache.camel camel-twilio - 4.8.1 + 4.9.0 commons-logging @@ -2676,62 +2657,62 @@ org.apache.camel camel-twitter - 4.8.1 + 4.9.0 org.apache.camel camel-univocity-parsers - 4.8.1 + 4.9.0 org.apache.camel camel-util - 4.8.1 + 4.9.0 org.apache.camel camel-util-json - 4.8.1 + 4.9.0 org.apache.camel camel-validator - 4.8.1 + 4.9.0 org.apache.camel camel-velocity - 4.8.1 + 4.9.0 org.apache.camel camel-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-common - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-http - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-websocket - 4.8.1 + 4.9.0 org.apache.camel camel-wasm - 4.8.1 + 4.9.0 org.apache.camel camel-weather - 4.8.1 + 4.9.0 commons-logging @@ -2742,17 +2723,17 @@ org.apache.camel camel-web3j - 4.8.1 + 4.9.0 org.apache.camel camel-webhook - 4.8.1 + 4.9.0 org.apache.camel camel-wordpress - 4.8.1 + 4.9.0 org.checkerframework @@ -2763,7 +2744,7 @@ org.apache.camel camel-workday - 4.8.1 + 4.9.0 commons-logging @@ -2774,7 +2755,7 @@ org.apache.camel camel-xchange - 4.8.1 + 4.9.0 org.checkerframework @@ -2785,27 +2766,27 @@ org.apache.camel camel-xj - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io-util - 4.8.1 + 4.9.0 org.apache.camel camel-xml-jaxb - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2820,37 +2801,37 @@ org.apache.camel camel-xml-jaxp - 4.8.1 + 4.9.0 org.apache.camel camel-xml-jaxp-util - 4.8.1 + 4.9.0 org.apache.camel camel-xmlsecurity - 4.8.1 + 4.9.0 org.apache.camel camel-xmpp - 4.8.1 + 4.9.0 org.apache.camel camel-xpath - 4.8.1 + 4.9.0 org.apache.camel camel-xslt - 4.8.1 + 4.9.0 org.apache.camel camel-xslt-saxon - 4.8.1 + 4.9.0 xml-apis @@ -2861,42 +2842,42 @@ org.apache.camel camel-yaml-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-dsl-common - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-dsl-deserializers - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-io - 4.8.1 + 4.9.0 org.apache.camel camel-zendesk - 4.8.1 + 4.9.0 org.apache.camel camel-zip-deflater - 4.8.1 + 4.9.0 org.apache.camel camel-zipfile - 4.8.1 + 4.9.0 org.apache.camel camel-zookeeper - 4.8.1 + 4.9.0 org.checkerframework @@ -2907,7 +2888,7 @@ org.apache.camel camel-zookeeper-master - 4.8.1 + 4.9.0 org.checkerframework @@ -4090,16 +4071,6 @@ camel-quarkus-groovy-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-grpc @@ -4475,16 +4446,6 @@ camel-quarkus-jq-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-js-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-js-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-jsch @@ -4495,16 +4456,6 @@ camel-quarkus-jsch-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-jslt @@ -4650,26 +4601,6 @@ camel-quarkus-knative-producer-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-kotlin - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-deployment - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-kubernetes @@ -6393,7 +6324,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 7.4.0 + 7.6.0 com.google.code.findbugs @@ -6412,12 +6343,12 @@ ca.uhn.hapi.fhir hapi-fhir-client - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 7.4.0 + 7.6.0 junit @@ -6432,52 +6363,52 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu2 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu2016may - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu3 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.r4 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.r5 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.utilities - 6.3.23 + 6.4.0 com.azure @@ -6523,12 +6454,12 @@ com.google.auth google-auth-library-credentials - 1.24.1 + 1.29.0 com.google.auth google-auth-library-oauth2-http - 1.24.1 + 1.29.0 com.google.code.findbugs @@ -6539,7 +6470,7 @@ com.google.cloud google-cloud-pubsub - 1.132.1 + 1.134.1 com.google.android @@ -6590,7 +6521,7 @@ com.ibm.icu icu4j - 75.1 + 76.1 com.ibm.mq @@ -6610,7 +6541,7 @@ com.microsoft.azure msal4j - 1.16.2 + 1.17.2 com.github.stephenc.jcip @@ -6621,7 +6552,7 @@ com.orbitz.consul consul-client - 1.4.1 + 1.4.2 com.google.code.findbugs @@ -6728,12 +6659,12 @@ io.dropwizard.metrics dropwizard-core - 4.2.27 + 4.2.29 io.dropwizard.metrics metrics-jmx - 4.2.27 + 4.2.29 io.minio @@ -6775,7 +6706,7 @@ io.projectreactor.netty reactor-netty - 1.1.22 + 1.2.0 io.quarkiverse.freemarker @@ -6961,7 +6892,7 @@ io.swagger.parser.v3 swagger-parser - 2.1.22 + 2.1.24 com.google.code.findbugs @@ -6998,7 +6929,7 @@ joda-time joda-time - 2.12.7 + 2.13.0 net.i2p.crypto @@ -7100,7 +7031,7 @@ org.apache.xmlgraphics xmlgraphics-commons - 2.9 + 2.10 commons-logging @@ -7116,7 +7047,7 @@ org.apache.zookeeper zookeeper - 3.9.2 + 3.9.3 ch.qos.logback @@ -7131,7 +7062,7 @@ org.apache.zookeeper zookeeper-jute - 3.9.2 + 3.9.3 org.asynchttpclient @@ -7184,11 +7115,6 @@ javassist 3.30.2-GA - - org.jetbrains.kotlin - kotlin-script-util - 2.0.21 - org.jetbrains.kotlin kotlin-scripting-compiler-embeddable @@ -7199,16 +7125,6 @@ kotlin-scripting-compiler-impl-embeddable 2.0.21 - - org.jetbrains.kotlin - kotlin-scripting-jvm - 2.0.21 - - - org.jetbrains.kotlin - kotlin-scripting-jvm-host - 2.0.21 - org.jetbrains.kotlinx kotlinx-serialization-core-jvm @@ -7222,22 +7138,22 @@ org.jxmpp jxmpp-core - 1.0.3 + 1.1.0 org.jxmpp jxmpp-jid - 1.0.3 + 1.1.0 org.jxmpp jxmpp-util-cache - 1.0.3 + 1.1.0 org.kiwiproject consul-client - 1.4.1 + 1.4.2 com.google.code.findbugs @@ -7252,7 +7168,7 @@ org.mapstruct mapstruct-processor - 1.6.0 + 1.6.3 org.mvel @@ -7267,7 +7183,7 @@ org.opensearch.client opensearch-rest-client - 2.16.0 + 2.18.0 org.optaplanner @@ -7292,12 +7208,12 @@ org.snakeyaml snakeyaml-engine - 2.7 + 2.8 org.springframework spring-aop - 6.1.12 + 6.2.0 org.springframework @@ -7312,7 +7228,7 @@ org.springframework spring-expression - 6.1.12 + 6.2.0 org.springframework @@ -7323,7 +7239,7 @@ org.springframework spring-jdbc - 6.1.12 + 6.2.0 org.springframework @@ -7338,7 +7254,7 @@ org.springframework spring-jms - 6.1.12 + 6.2.0 org.springframework @@ -7353,7 +7269,7 @@ org.springframework spring-messaging - 6.1.12 + 6.2.0 org.springframework @@ -7368,7 +7284,7 @@ org.springframework spring-orm - 6.1.12 + 6.2.0 org.springframework @@ -7383,7 +7299,7 @@ org.springframework spring-tx - 6.1.12 + 6.2.0 org.springframework @@ -7398,7 +7314,7 @@ org.springframework spring-web - 6.1.12 + 6.2.0 org.springframework @@ -7417,7 +7333,7 @@ org.springframework.data spring-data-redis - 3.3.3 + 3.4.0 org.springframework @@ -7444,7 +7360,7 @@ org.threeten threetenbp - 1.6.9 + 1.7.0 org.web3j @@ -7469,7 +7385,7 @@ redis.clients jedis - 5.1.5 + 5.2.0 software.amazon.awssdk @@ -22067,6 +21983,16 @@ kotlin-scripting-ide-services 2.0.10 + + org.jetbrains.kotlin + kotlin-scripting-jvm-host + 2.0.10 + + + org.jetbrains.kotlin + kotlin-scripting-jvm + 2.0.10 + org.jetbrains.kotlin kotlin-stdlib-common @@ -23328,609 +23254,624 @@ 2.2 - org.eclipse.jetty - jetty-alpn-client - 12.0.12 + org.eclipse.jetty + jetty-alpn-client + 12.0.15 + + + org.eclipse.jetty + jetty-alpn-conscrypt-client + 12.0.15 + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + 12.0.15 - org.eclipse.jetty - jetty-alpn-conscrypt-client - 12.0.12 + org.eclipse.jetty + jetty-alpn-java-client + 12.0.15 - org.eclipse.jetty - jetty-alpn-conscrypt-server - 12.0.12 + org.eclipse.jetty + jetty-alpn-java-server + 12.0.15 - org.eclipse.jetty - jetty-alpn-java-client - 12.0.12 + org.eclipse.jetty + jetty-alpn-server + 12.0.15 - org.eclipse.jetty - jetty-alpn-java-server - 12.0.12 + org.eclipse.jetty + jetty-client + 12.0.15 - org.eclipse.jetty - jetty-alpn-server - 12.0.12 + org.eclipse.jetty + jetty-deploy + 12.0.15 - org.eclipse.jetty - jetty-client - 12.0.12 + org.eclipse.jetty + jetty-http + 12.0.15 - org.eclipse.jetty - jetty-deploy - 12.0.12 + org.eclipse.jetty + jetty-http-spi + 12.0.15 - org.eclipse.jetty - jetty-http - 12.0.12 + org.eclipse.jetty + jetty-http-tools + 12.0.15 - org.eclipse.jetty - jetty-http-spi - 12.0.12 + org.eclipse.jetty + jetty-io + 12.0.15 - org.eclipse.jetty - jetty-http-tools - 12.0.12 + org.eclipse.jetty + jetty-jmx + 12.0.15 - org.eclipse.jetty - jetty-io - 12.0.12 + org.eclipse.jetty + jetty-jndi + 12.0.15 - org.eclipse.jetty - jetty-jmx - 12.0.12 + org.eclipse.jetty + jetty-keystore + 12.0.15 - org.eclipse.jetty - jetty-jndi - 12.0.12 + org.eclipse.jetty + jetty-openid + 12.0.15 - org.eclipse.jetty - jetty-keystore - 12.0.12 + org.eclipse.jetty + jetty-osgi + 12.0.15 - org.eclipse.jetty - jetty-openid - 12.0.12 + org.eclipse.jetty + jetty-plus + 12.0.15 - org.eclipse.jetty - jetty-osgi - 12.0.12 + org.eclipse.jetty + jetty-proxy + 12.0.15 - org.eclipse.jetty - jetty-plus - 12.0.12 + org.eclipse.jetty + jetty-rewrite + 12.0.15 - org.eclipse.jetty - jetty-proxy - 12.0.12 + org.eclipse.jetty + jetty-security + 12.0.15 - org.eclipse.jetty - jetty-rewrite - 12.0.12 + org.eclipse.jetty + jetty-server + 12.0.15 - org.eclipse.jetty - jetty-security - 12.0.12 + org.eclipse.jetty + jetty-session + 12.0.15 - org.eclipse.jetty - jetty-server - 12.0.12 + org.eclipse.jetty + jetty-slf4j-impl + 12.0.15 - org.eclipse.jetty - jetty-session - 12.0.12 + org.eclipse.jetty + jetty-start + 12.0.15 - org.eclipse.jetty - jetty-slf4j-impl - 12.0.12 + org.eclipse.jetty + jetty-unixdomain-server + 12.0.15 - org.eclipse.jetty - jetty-start - 12.0.12 + org.eclipse.jetty + jetty-util + 12.0.15 - org.eclipse.jetty - jetty-unixdomain-server - 12.0.12 + org.eclipse.jetty + jetty-util-ajax + 12.0.15 - org.eclipse.jetty - jetty-util - 12.0.12 + org.eclipse.jetty + jetty-xml + 12.0.15 - org.eclipse.jetty - jetty-util-ajax - 12.0.12 + org.eclipse.jetty.demos + jetty-demo-handler + 12.0.15 - org.eclipse.jetty - jetty-xml - 12.0.12 + org.eclipse.jetty.fcgi + jetty-fcgi-client + 12.0.15 - org.eclipse.jetty.demos - jetty-demo-handler - 12.0.12 + org.eclipse.jetty.fcgi + jetty-fcgi-proxy + 12.0.15 - org.eclipse.jetty.fcgi - jetty-fcgi-client - 12.0.12 + org.eclipse.jetty.fcgi + jetty-fcgi-server + 12.0.15 - org.eclipse.jetty.fcgi - jetty-fcgi-proxy - 12.0.12 + org.eclipse.jetty.http2 + jetty-http2-client + 12.0.15 - org.eclipse.jetty.fcgi - jetty-fcgi-server - 12.0.12 + org.eclipse.jetty.http2 + jetty-http2-client-transport + 12.0.15 - org.eclipse.jetty.http2 - jetty-http2-client - 12.0.12 + org.eclipse.jetty.http2 + jetty-http2-common + 12.0.15 - org.eclipse.jetty.http2 - jetty-http2-client-transport - 12.0.12 + org.eclipse.jetty.http2 + jetty-http2-hpack + 12.0.15 - org.eclipse.jetty.http2 - jetty-http2-common - 12.0.12 + org.eclipse.jetty.http2 + jetty-http2-server + 12.0.15 - org.eclipse.jetty.http2 - jetty-http2-hpack - 12.0.12 + org.eclipse.jetty.http3 + jetty-http3-client + 12.0.15 - org.eclipse.jetty.http2 - jetty-http2-server - 12.0.12 + org.eclipse.jetty.http3 + jetty-http3-client-transport + 12.0.15 - org.eclipse.jetty.http3 - jetty-http3-client - 12.0.12 + org.eclipse.jetty.http3 + jetty-http3-common + 12.0.15 - org.eclipse.jetty.http3 - jetty-http3-client-transport - 12.0.12 + org.eclipse.jetty.http3 + jetty-http3-qpack + 12.0.15 - org.eclipse.jetty.http3 - jetty-http3-common - 12.0.12 + org.eclipse.jetty.http3 + jetty-http3-server + 12.0.15 - org.eclipse.jetty.http3 - jetty-http3-qpack - 12.0.12 + org.eclipse.jetty.quic + jetty-quic-client + 12.0.15 - org.eclipse.jetty.http3 - jetty-http3-server - 12.0.12 + org.eclipse.jetty.quic + jetty-quic-common + 12.0.15 - org.eclipse.jetty.quic - jetty-quic-client - 12.0.12 + org.eclipse.jetty.quic + jetty-quic-quiche-common + 12.0.15 - org.eclipse.jetty.quic - jetty-quic-common - 12.0.12 + org.eclipse.jetty.quic + jetty-quic-quiche-foreign + 12.0.15 - org.eclipse.jetty.quic - jetty-quic-quiche-common - 12.0.12 + org.eclipse.jetty.quic + jetty-quic-quiche-jna + 12.0.15 - org.eclipse.jetty.quic - jetty-quic-quiche-foreign - 12.0.12 + org.eclipse.jetty.quic + jetty-quic-server + 12.0.15 - org.eclipse.jetty.quic - jetty-quic-quiche-jna - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-core-client + 12.0.15 - org.eclipse.jetty.quic - jetty-quic-server - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-core-common + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-core-client - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-core-server + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-core-common - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-core-server - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-jetty-client + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-jetty-common + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-jetty-client - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-jetty-common - 12.0.12 + com.azure + azure-ai-contentsafety + 1.0.8 - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - 12.0.12 + com.azure + azure-ai-formrecognizer + 4.1.11 - com.azure - azure-ai-contentsafety - 1.0.6 + com.azure + azure-ai-metricsadvisor + 1.2.3 - com.azure - azure-ai-formrecognizer - 4.1.10 + com.azure + azure-ai-textanalytics + 5.5.3 - com.azure - azure-ai-metricsadvisor - 1.2.1 + com.azure + azure-ai-translation-text + 1.0.0 - com.azure - azure-ai-textanalytics - 5.5.1 + com.azure + azure-communication-callautomation + 1.2.6 - com.azure - azure-ai-translation-text - 1.0.0 + com.azure + azure-communication-chat + 1.5.6 - com.azure - azure-communication-callautomation - 1.2.4 + com.azure + azure-communication-common + 1.3.8 - com.azure - azure-communication-chat - 1.5.4 + com.azure + azure-communication-email + 1.0.18 - com.azure - azure-communication-common - 1.3.6 + com.azure + azure-communication-identity + 1.6.1 - com.azure - azure-communication-email - 1.0.16 + com.azure + azure-communication-jobrouter + 1.1.9 - com.azure - azure-communication-identity - 1.5.8 + com.azure + azure-communication-messages + 1.1.0 - com.azure - azure-communication-jobrouter - 1.1.7 + com.azure + azure-communication-phonenumbers + 1.1.18 - com.azure - azure-communication-messages - 1.0.6 + com.azure + azure-communication-rooms + 1.1.7 - com.azure - azure-communication-phonenumbers - 1.1.16 + com.azure + azure-communication-sms + 1.1.29 - com.azure - azure-communication-rooms - 1.1.5 + com.azure + azure-containers-containerregistry + 1.2.13 - com.azure - azure-communication-sms - 1.1.27 + com.azure + azure-core + 1.53.0 - com.azure - azure-containers-containerregistry - 1.2.11 + com.azure + azure-core-amqp + 2.9.10 - com.azure - azure-core - 1.51.0 + com.azure + azure-core-http-netty + 1.15.5 - com.azure - azure-core-amqp - 2.9.8 + com.azure + azure-core-http-okhttp + 1.12.4 - com.azure - azure-core-http-netty - 1.15.3 + com.azure + azure-core-management + 1.15.4 - com.azure - azure-core-http-okhttp - 1.12.2 + com.azure + azure-core-serializer-json-gson + 1.3.2 - com.azure - azure-core-management - 1.15.2 + com.azure + azure-core-serializer-json-jackson + 1.5.2 - com.azure - azure-core-serializer-json-gson - 1.3.0 + com.azure + azure-cosmos + 4.64.0 - com.azure - azure-core-serializer-json-jackson - 1.5.0 + com.azure + azure-cosmos-encryption + 2.15.0 - com.azure - azure-cosmos - 4.63.2 + com.azure + azure-data-appconfiguration + 1.7.2 - com.azure - azure-cosmos-encryption - 2.14.0 + com.azure + azure-data-schemaregistry + 1.5.1 - com.azure - azure-data-appconfiguration - 1.7.0 + com.azure + azure-data-schemaregistry-apacheavro + 1.1.22 - com.azure - azure-data-schemaregistry - 1.4.9 + com.azure + azure-data-schemaregistry-jsonschema + 1.0.0 - com.azure - azure-data-schemaregistry-apacheavro - 1.1.20 + com.azure + azure-data-tables + 12.4.6 - com.azure - azure-data-tables - 12.4.4 + com.azure + azure-developer-devcenter + 1.0.5 - com.azure - azure-developer-devcenter - 1.0.3 + com.azure + azure-developer-loadtesting + 1.0.18 - com.azure - azure-developer-loadtesting - 1.0.16 + com.azure + azure-digitaltwins-core + 1.3.25 - com.azure - azure-digitaltwins-core - 1.3.23 + com.azure + azure-health-deidentification + 1.0.0 - com.azure - azure-identity - 1.13.2 + com.azure + azure-identity + 1.14.0 - com.azure - azure-identity-broker - 1.1.4 + com.azure + azure-identity-broker + 1.1.6 - com.azure - azure-identity-extensions - 1.1.19 + com.azure + azure-identity-extensions + 1.1.21 - com.azure - azure-iot-deviceupdate - 1.0.21 + com.azure + azure-iot-deviceupdate + 1.0.23 - com.azure - azure-json - 1.2.0 + com.azure + azure-json + 1.3.0 - com.azure - azure-messaging-eventgrid - 4.24.0 + com.azure + azure-messaging-eventgrid + 4.26.0 - com.azure - azure-messaging-eventgrid-namespaces - 1.0.1 + com.azure + azure-messaging-eventgrid-namespaces + 1.1.0 - com.azure - azure-messaging-eventhubs - 5.18.7 + com.azure + azure-messaging-eventhubs + 5.19.1 - com.azure - azure-messaging-eventhubs-checkpointstore-blob - 1.19.7 + com.azure + azure-messaging-eventhubs-checkpointstore-blob + 1.20.1 - com.azure - azure-messaging-servicebus - 7.17.3 + com.azure + azure-messaging-servicebus + 7.17.5 - com.azure - azure-messaging-webpubsub - 1.3.0 + com.azure + azure-messaging-webpubsub + 1.3.2 - com.azure - azure-messaging-webpubsub-client - 1.0.6 + com.azure + azure-messaging-webpubsub-client + 1.0.8 - com.azure - azure-mixedreality-authentication - 1.2.27 + com.azure + azure-mixedreality-authentication + 1.2.29 - com.azure - azure-mixedreality-remoterendering - 1.1.32 + com.azure + azure-mixedreality-remoterendering + 1.1.34 - com.azure - azure-monitor-ingestion - 1.2.4 + com.azure + azure-monitor-ingestion + 1.2.6 - com.azure - azure-monitor-query - 1.5.1 + com.azure + azure-monitor-query + 1.5.3 - com.azure - azure-search-documents - 11.7.1 + com.azure + azure-search-documents + 11.7.3 - com.azure - azure-security-attestation - 1.1.27 + com.azure + azure-security-attestation + 1.1.29 - com.azure - azure-security-confidentialledger - 1.0.23 + com.azure + azure-security-confidentialledger + 1.0.25 - com.azure - azure-security-keyvault-administration - 4.5.7 + com.azure + azure-security-keyvault-administration + 4.6.0 - com.azure - azure-security-keyvault-certificates - 4.6.6 + com.azure + azure-security-keyvault-certificates + 4.7.0 - com.azure - azure-security-keyvault-jca - 2.8.2 + com.azure + azure-security-keyvault-jca + 2.9.0 - com.azure - azure-security-keyvault-keys - 4.8.7 + com.azure + azure-security-keyvault-keys + 4.9.0 - com.azure - azure-security-keyvault-secrets - 4.8.6 + com.azure + azure-security-keyvault-secrets + 4.9.0 - com.azure - azure-storage-blob - 12.27.1 + com.azure + azure-storage-blob + 12.28.1 - com.azure - azure-storage-blob-batch - 12.23.1 + com.azure + azure-storage-blob-batch + 12.24.0 - com.azure - azure-storage-blob-cryptography - 12.26.1 + com.azure + azure-storage-blob-cryptography + 12.27.1 - com.azure - azure-storage-common - 12.26.1 + com.azure + azure-storage-common + 12.27.1 - com.azure - azure-storage-file-datalake - 12.20.1 + com.azure + azure-storage-file-datalake + 12.21.0 - com.azure - azure-storage-file-share - 12.23.1 + com.azure + azure-storage-file-share + 12.24.0 - com.azure - azure-storage-internal-avro - 12.12.1 + com.azure + azure-storage-internal-avro + 12.13.0 - com.azure - azure-storage-queue - 12.22.1 + com.azure + azure-storage-queue + 12.23.0 - com.azure - azure-xml - 1.1.0 + com.azure + azure-xml + 1.1.0 + + + com.azure + azure-ai-vision-imageanalysis + 1.0.0 com.datastax.oss @@ -24964,6 +24905,11 @@ resteasy-context-propagation 6.2.1.Final + + org.jetbrains.kotlin + kotlin-script-util + 1.8.10 + org.jetbrains.kotlin kotlin-stdlib-js diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 96c532a96399..571848ab4fa6 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -53,32 +53,32 @@ org.apache.camel camel-activemq - 4.8.1 + 4.9.0 org.apache.camel camel-amqp - 4.8.1 + 4.9.0 org.apache.camel camel-api - 4.8.1 + 4.9.0 org.apache.camel camel-arangodb - 4.8.1 + 4.9.0 org.apache.camel camel-as2 - 4.8.1 + 4.9.0 org.apache.camel camel-as2-api - 4.8.1 + 4.9.0 commons-logging @@ -93,12 +93,12 @@ org.apache.camel camel-asn1 - 4.8.1 + 4.9.0 org.apache.camel camel-asterisk - 4.8.1 + 4.9.0 org.checkerframework @@ -109,7 +109,7 @@ org.apache.camel camel-atom - 4.8.1 + 4.9.0 commons-logging @@ -120,17 +120,17 @@ org.apache.camel camel-attachments - 4.8.1 + 4.9.0 org.apache.camel camel-avro - 4.8.1 + 4.9.0 org.apache.camel camel-aws-bedrock - 4.8.1 + 4.9.0 commons-logging @@ -141,7 +141,7 @@ org.apache.camel camel-aws-secrets-manager - 4.8.1 + 4.9.0 commons-logging @@ -152,7 +152,7 @@ org.apache.camel camel-aws-xray - 4.8.1 + 4.9.0 commons-logging @@ -163,7 +163,7 @@ org.apache.camel camel-aws2-athena - 4.8.1 + 4.9.0 commons-logging @@ -174,7 +174,7 @@ org.apache.camel camel-aws2-cw - 4.8.1 + 4.9.0 commons-logging @@ -185,18 +185,22 @@ org.apache.camel camel-aws2-ddb - 4.8.1 + 4.9.0 commons-logging commons-logging + + org.checkerframework + checker-qual + org.apache.camel camel-aws2-ec2 - 4.8.1 + 4.9.0 commons-logging @@ -207,7 +211,7 @@ org.apache.camel camel-aws2-ecs - 4.8.1 + 4.9.0 commons-logging @@ -218,7 +222,7 @@ org.apache.camel camel-aws2-eks - 4.8.1 + 4.9.0 commons-logging @@ -229,7 +233,7 @@ org.apache.camel camel-aws2-eventbridge - 4.8.1 + 4.9.0 commons-logging @@ -240,7 +244,7 @@ org.apache.camel camel-aws2-iam - 4.8.1 + 4.9.0 commons-logging @@ -251,8 +255,12 @@ org.apache.camel camel-aws2-kinesis - 4.8.1 + 4.9.0 + + com.google.code.findbugs + jsr305 + commons-logging commons-logging @@ -270,7 +278,7 @@ org.apache.camel camel-aws2-kms - 4.8.1 + 4.9.0 commons-logging @@ -281,7 +289,7 @@ org.apache.camel camel-aws2-lambda - 4.8.1 + 4.9.0 commons-logging @@ -292,7 +300,7 @@ org.apache.camel camel-aws2-mq - 4.8.1 + 4.9.0 commons-logging @@ -303,7 +311,7 @@ org.apache.camel camel-aws2-msk - 4.8.1 + 4.9.0 commons-logging @@ -314,7 +322,7 @@ org.apache.camel camel-aws2-s3 - 4.8.1 + 4.9.0 commons-logging @@ -325,7 +333,7 @@ org.apache.camel camel-aws2-ses - 4.8.1 + 4.9.0 commons-logging @@ -336,7 +344,7 @@ org.apache.camel camel-aws2-sns - 4.8.1 + 4.9.0 commons-logging @@ -347,7 +355,7 @@ org.apache.camel camel-aws2-sqs - 4.8.1 + 4.9.0 commons-logging @@ -358,7 +366,7 @@ org.apache.camel camel-aws2-sts - 4.8.1 + 4.9.0 commons-logging @@ -369,7 +377,7 @@ org.apache.camel camel-aws2-translate - 4.8.1 + 4.9.0 commons-logging @@ -380,7 +388,7 @@ org.apache.camel camel-azure-cosmosdb - 4.8.1 + 4.9.0 com.azure @@ -391,7 +399,7 @@ org.apache.camel camel-azure-eventhubs - 4.8.1 + 4.9.0 com.azure @@ -402,7 +410,7 @@ org.apache.camel camel-azure-key-vault - 4.8.1 + 4.9.0 com.azure @@ -413,7 +421,7 @@ org.apache.camel camel-azure-servicebus - 4.8.1 + 4.9.0 com.azure @@ -424,7 +432,7 @@ org.apache.camel camel-azure-storage-blob - 4.8.1 + 4.9.0 com.azure @@ -435,7 +443,7 @@ org.apache.camel camel-azure-storage-datalake - 4.8.1 + 4.9.0 com.azure @@ -446,7 +454,7 @@ org.apache.camel camel-azure-storage-queue - 4.8.1 + 4.9.0 com.azure @@ -457,37 +465,37 @@ org.apache.camel camel-barcode - 4.8.1 + 4.9.0 org.apache.camel camel-base - 4.8.1 + 4.9.0 org.apache.camel camel-base-engine - 4.8.1 + 4.9.0 org.apache.camel camel-base64 - 4.8.1 + 4.9.0 org.apache.camel camel-bean - 4.8.1 + 4.9.0 org.apache.camel camel-bean-validator - 4.8.1 + 4.9.0 org.apache.camel camel-beanio - 4.8.1 + 4.9.0 jakarta.activation @@ -502,17 +510,17 @@ org.apache.camel camel-bindy - 4.8.1 + 4.9.0 org.apache.camel camel-bonita - 4.8.1 + 4.9.0 org.apache.camel camel-box - 4.8.1 + 4.9.0 commons-logging @@ -523,27 +531,27 @@ org.apache.camel camel-box-api - 4.8.1 + 4.9.0 org.apache.camel camel-braintree - 4.8.1 + 4.9.0 org.apache.camel camel-browse - 4.8.1 + 4.9.0 org.apache.camel camel-caffeine - 4.8.1 + 4.9.0 org.apache.camel camel-cassandraql - 4.8.1 + 4.9.0 com.github.spotbugs @@ -558,47 +566,47 @@ org.apache.camel camel-catalog - 4.8.1 + 4.9.0 org.apache.camel camel-cbor - 4.8.1 + 4.9.0 org.apache.camel camel-chatscript - 4.8.1 + 4.9.0 org.apache.camel camel-chunk - 4.8.1 + 4.9.0 org.apache.camel camel-cli-connector - 4.8.1 + 4.9.0 org.apache.camel camel-cloud - 4.8.1 + 4.9.0 org.apache.camel camel-cloudevents - 4.8.1 + 4.9.0 org.apache.camel camel-cluster - 4.8.1 + 4.9.0 org.apache.camel camel-cm-sms - 4.8.1 + 4.9.0 commons-logging @@ -609,27 +617,27 @@ org.apache.camel camel-coap - 4.8.1 + 4.9.0 org.apache.camel camel-cometd - 4.8.1 + 4.9.0 org.apache.camel camel-componentdsl - 4.8.1 + 4.9.0 org.apache.camel camel-console - 4.8.1 + 4.9.0 org.apache.camel camel-consul - 4.8.1 + 4.9.0 org.checkerframework @@ -640,47 +648,47 @@ org.apache.camel camel-controlbus - 4.8.1 + 4.9.0 org.apache.camel camel-core-catalog - 4.8.1 + 4.9.0 org.apache.camel camel-core-engine - 4.8.1 + 4.9.0 org.apache.camel camel-core-languages - 4.8.1 + 4.9.0 org.apache.camel camel-core-model - 4.8.1 + 4.9.0 org.apache.camel camel-core-processor - 4.8.1 + 4.9.0 org.apache.camel camel-core-reifier - 4.8.1 + 4.9.0 org.apache.camel camel-couchbase - 4.8.1 + 4.9.0 org.apache.camel camel-couchdb - 4.8.1 + 4.9.0 commons-logging @@ -691,12 +699,12 @@ org.apache.camel camel-cron - 4.8.1 + 4.9.0 org.apache.camel camel-crypto - 4.8.1 + 4.9.0 org.bouncycastle @@ -707,43 +715,47 @@ org.apache.camel camel-crypto-pgp - 4.8.1 + 4.9.0 org.apache.camel camel-csv - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-common - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-soap - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-transport - 4.8.1 + 4.9.0 org.apache.camel camel-dataformat - 4.8.1 + 4.9.0 org.apache.camel camel-dataset - 4.8.1 + 4.9.0 org.apache.camel camel-datasonnet - 4.8.1 + 4.9.0 + + ch.qos.logback + logback-classic + jakarta.activation jakarta.activation-api @@ -769,7 +781,7 @@ org.apache.camel camel-debezium-common - 4.8.1 + 4.9.0 javax.ws.rs @@ -780,32 +792,32 @@ org.apache.camel camel-debezium-mongodb - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-mysql - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-postgres - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-sqlserver - 4.8.1 + 4.9.0 org.apache.camel camel-debug - 4.8.1 + 4.9.0 org.apache.camel camel-digitalocean - 4.8.1 + 4.9.0 commons-logging @@ -816,17 +828,17 @@ org.apache.camel camel-direct - 4.8.1 + 4.9.0 org.apache.camel camel-disruptor - 4.8.1 + 4.9.0 org.apache.camel camel-djl - 4.8.1 + 4.9.0 org.checkerframework @@ -837,12 +849,12 @@ org.apache.camel camel-dns - 4.8.1 + 4.9.0 org.apache.camel camel-drill - 4.8.1 + 4.9.0 ch.qos.logback @@ -869,7 +881,7 @@ org.apache.camel camel-dropbox - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -880,22 +892,22 @@ org.apache.camel camel-dsl-modeline - 4.8.1 + 4.9.0 org.apache.camel camel-dsl-support - 4.8.1 + 4.9.0 org.apache.camel camel-ehcache - 4.8.1 + 4.9.0 org.apache.camel camel-elasticsearch - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -910,7 +922,7 @@ org.apache.camel camel-elasticsearch-rest-client - 4.8.1 + 4.9.0 commons-logging @@ -921,7 +933,7 @@ org.apache.camel camel-endpointdsl - 4.8.1 + 4.9.0 com.sun.mail @@ -929,15 +941,10 @@ - - org.apache.camel - camel-endpointdsl-support - 4.8.1 - org.apache.camel camel-etcd3 - 4.8.1 + 4.9.0 com.google.android @@ -960,42 +967,42 @@ org.apache.camel camel-exec - 4.8.1 + 4.9.0 org.apache.camel camel-fastjson - 4.8.1 + 4.9.0 org.apache.camel camel-fhir - 4.8.1 + 4.9.0 org.apache.camel camel-fhir-api - 4.8.1 + 4.9.0 org.apache.camel camel-file - 4.8.1 + 4.9.0 org.apache.camel camel-file-watch - 4.8.1 + 4.9.0 org.apache.camel camel-flatpack - 4.8.1 + 4.9.0 org.apache.camel camel-flink - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -1006,7 +1013,7 @@ org.apache.camel camel-fop - 4.8.1 + 4.9.0 commons-logging @@ -1021,17 +1028,17 @@ org.apache.camel camel-freemarker - 4.8.1 + 4.9.0 org.apache.camel camel-ftp - 4.8.1 + 4.9.0 org.apache.camel camel-geocoder - 4.8.1 + 4.9.0 commons-logging @@ -1042,17 +1049,17 @@ org.apache.camel camel-git - 4.8.1 + 4.9.0 org.apache.camel camel-github - 4.8.1 + 4.9.0 org.apache.camel camel-google-bigquery - 4.8.1 + 4.9.0 com.google.android @@ -1079,7 +1086,7 @@ org.apache.camel camel-google-calendar - 4.8.1 + 4.9.0 commons-logging @@ -1094,7 +1101,7 @@ org.apache.camel camel-google-drive - 4.8.1 + 4.9.0 commons-logging @@ -1109,7 +1116,7 @@ org.apache.camel camel-google-functions - 4.8.1 + 4.9.0 com.google.android @@ -1136,7 +1143,7 @@ org.apache.camel camel-google-mail - 4.8.1 + 4.9.0 commons-logging @@ -1151,7 +1158,7 @@ org.apache.camel camel-google-pubsub - 4.8.1 + 4.9.0 com.google.android @@ -1178,7 +1185,7 @@ org.apache.camel camel-google-secret-manager - 4.8.1 + 4.9.0 com.google.android @@ -1209,7 +1216,7 @@ org.apache.camel camel-google-sheets - 4.8.1 + 4.9.0 commons-logging @@ -1224,7 +1231,7 @@ org.apache.camel camel-google-storage - 4.8.1 + 4.9.0 com.google.android @@ -1251,7 +1258,7 @@ org.apache.camel camel-graphql - 4.8.1 + 4.9.0 commons-logging @@ -1262,27 +1269,17 @@ org.apache.camel camel-grok - 4.8.1 + 4.9.0 org.apache.camel camel-groovy - 4.8.1 - - - org.apache.camel - camel-groovy-dsl - 4.8.1 - - - org.apache.camel - camel-groovy-dsl-common - 4.8.1 + 4.9.0 org.apache.camel camel-grpc - 4.8.1 + 4.9.0 com.google.android @@ -1313,12 +1310,12 @@ org.apache.camel camel-gson - 4.8.1 + 4.9.0 org.apache.camel camel-guava-eventbus - 4.8.1 + 4.9.0 org.checkerframework @@ -1329,7 +1326,7 @@ org.apache.camel camel-hashicorp-vault - 4.8.1 + 4.9.0 org.springframework @@ -1348,12 +1345,12 @@ org.apache.camel camel-hazelcast - 4.8.1 + 4.9.0 org.apache.camel camel-headersmap - 4.8.1 + 4.9.0 ch.qos.logback @@ -1364,17 +1361,17 @@ org.apache.camel camel-health - 4.8.1 + 4.9.0 org.apache.camel camel-hl7 - 4.8.1 + 4.9.0 org.apache.camel camel-http - 4.8.1 + 4.9.0 commons-logging @@ -1385,27 +1382,27 @@ org.apache.camel camel-http-base - 4.8.1 + 4.9.0 org.apache.camel camel-http-common - 4.8.1 + 4.9.0 org.apache.camel camel-huaweicloud-common - 4.8.1 + 4.9.0 org.apache.camel camel-huaweicloud-smn - 4.8.1 + 4.9.0 org.apache.camel camel-ical - 4.8.1 + 4.9.0 commons-logging @@ -1416,7 +1413,7 @@ org.apache.camel camel-iec60870 - 4.8.1 + 4.9.0 org.checkerframework @@ -1427,12 +1424,12 @@ org.apache.camel camel-ignite - 4.8.1 + 4.9.0 org.apache.camel camel-infinispan - 4.8.1 + 4.9.0 org.infinispan @@ -1451,57 +1448,57 @@ org.apache.camel camel-infinispan-common - 4.8.1 + 4.9.0 org.apache.camel camel-influxdb - 4.8.1 + 4.9.0 org.apache.camel camel-irc - 4.8.1 + 4.9.0 org.apache.camel camel-jackson - 4.8.1 + 4.9.0 org.apache.camel camel-jackson-avro - 4.8.1 + 4.9.0 org.apache.camel camel-jackson-protobuf - 4.8.1 + 4.9.0 org.apache.camel camel-jacksonxml - 4.8.1 + 4.9.0 org.apache.camel camel-jasypt - 4.8.1 + 4.9.0 org.apache.camel camel-java-joor-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-javascript - 4.8.1 + 4.9.0 org.apache.camel camel-jaxb - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -1512,12 +1509,12 @@ org.apache.camel camel-jcache - 4.8.1 + 4.9.0 org.apache.camel camel-jcr - 4.8.1 + 4.9.0 org.slf4j @@ -1528,27 +1525,27 @@ org.apache.camel camel-jdbc - 4.8.1 + 4.9.0 org.apache.camel camel-jfr - 4.8.1 + 4.9.0 org.apache.camel camel-jgroups - 4.8.1 + 4.9.0 org.apache.camel camel-jgroups-raft - 4.8.1 + 4.9.0 org.apache.camel camel-jira - 4.8.1 + 4.9.0 commons-logging @@ -1567,7 +1564,7 @@ org.apache.camel camel-jms - 4.8.1 + 4.9.0 org.apache.camel @@ -1586,12 +1583,12 @@ org.apache.camel camel-jolt - 4.8.1 + 4.9.0 org.apache.camel camel-jooq - 4.8.1 + 4.9.0 org.springframework @@ -1602,12 +1599,12 @@ org.apache.camel camel-joor - 4.8.1 + 4.9.0 org.apache.camel camel-jpa - 4.8.1 + 4.9.0 org.apache.camel @@ -1622,7 +1619,7 @@ org.apache.camel camel-jq - 4.8.1 + 4.9.0 net.thisptr @@ -1634,106 +1631,85 @@ - - org.apache.camel - camel-js-dsl - 4.8.1 - - - org.graalvm.js - js - - - org.apache.camel camel-jsch - 4.8.1 - - - org.apache.camel - camel-jsh-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-jslt - 4.8.1 + 4.9.0 org.apache.camel camel-json-patch - 4.8.1 + 4.9.0 org.apache.camel camel-json-validator - 4.8.1 + 4.9.0 org.apache.camel camel-jsonapi - 4.8.1 + 4.9.0 org.apache.camel camel-jsonata - 4.8.1 + 4.9.0 org.apache.camel camel-jsonb - 4.8.1 + 4.9.0 org.apache.camel camel-jsonpath - 4.8.1 + 4.9.0 org.apache.camel camel-jt400 - 4.8.1 + 4.9.0 org.apache.camel camel-jta - 4.8.1 + 4.9.0 org.apache.camel camel-kafka - 4.8.1 + 4.9.0 org.apache.camel camel-kamelet - 4.8.1 + 4.9.0 org.apache.camel camel-knative - 4.8.1 + 4.9.0 org.apache.camel camel-knative-api - 4.8.1 + 4.9.0 org.apache.camel camel-knative-http - 4.8.1 - - - org.apache.camel - camel-kotlin-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-kubernetes - 4.8.1 + 4.9.0 io.fabric8 @@ -1756,57 +1732,57 @@ org.apache.camel camel-kudu - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-chat - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-core - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-embeddings - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-tokenizer - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-tools - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-web-search - 4.8.1 + 4.9.0 org.apache.camel camel-language - 4.8.1 + 4.9.0 org.apache.camel camel-ldap - 4.8.1 + 4.9.0 org.apache.camel camel-ldif - 4.8.1 + 4.9.0 org.apache.camel camel-leveldb - 4.8.1 + 4.9.0 org.checkerframework @@ -1817,82 +1793,82 @@ org.apache.camel camel-log - 4.8.1 + 4.9.0 org.apache.camel camel-lra - 4.8.1 + 4.9.0 org.apache.camel camel-lucene - 4.8.1 + 4.9.0 org.apache.camel camel-lumberjack - 4.8.1 + 4.9.0 org.apache.camel camel-lzf - 4.8.1 + 4.9.0 org.apache.camel camel-mail - 4.8.1 + 4.9.0 org.apache.camel camel-mail-microsoft-oauth - 4.8.1 + 4.9.0 org.apache.camel camel-main - 4.8.1 + 4.9.0 org.apache.camel camel-management - 4.8.1 + 4.9.0 org.apache.camel camel-management-api - 4.8.1 + 4.9.0 org.apache.camel camel-mapstruct - 4.8.1 + 4.9.0 org.apache.camel camel-master - 4.8.1 + 4.9.0 org.apache.camel camel-micrometer - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-config - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-fault-tolerance - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-health - 4.8.1 + 4.9.0 org.eclipse.parsson @@ -1907,7 +1883,7 @@ org.apache.camel camel-milvus - 4.8.1 + 4.9.0 com.google.android @@ -1946,62 +1922,62 @@ org.apache.camel camel-minio - 4.8.1 + 4.9.0 org.apache.camel camel-mllp - 4.8.1 + 4.9.0 org.apache.camel camel-mock - 4.8.1 + 4.9.0 org.apache.camel camel-mongodb - 4.8.1 + 4.9.0 org.apache.camel camel-mongodb-gridfs - 4.8.1 + 4.9.0 org.apache.camel camel-mustache - 4.8.1 + 4.9.0 org.apache.camel camel-mvel - 4.8.1 + 4.9.0 org.apache.camel camel-mybatis - 4.8.1 + 4.9.0 org.apache.camel camel-nats - 4.8.1 + 4.9.0 org.apache.camel camel-netty - 4.8.1 + 4.9.0 org.apache.camel camel-netty-http - 4.8.1 + 4.9.0 org.apache.camel camel-nitrite - 4.8.1 + 4.9.0 javax.validation @@ -2012,7 +1988,7 @@ org.apache.camel camel-oaipmh - 4.8.1 + 4.9.0 commons-logging @@ -2023,12 +1999,12 @@ org.apache.camel camel-ognl - 4.8.1 + 4.9.0 org.apache.camel camel-olingo4 - 4.8.1 + 4.9.0 commons-logging @@ -2039,7 +2015,7 @@ org.apache.camel camel-olingo4-api - 4.8.1 + 4.9.0 commons-logging @@ -2050,7 +2026,7 @@ org.apache.camel camel-openapi-java - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2065,7 +2041,7 @@ org.apache.camel camel-opensearch - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2080,7 +2056,7 @@ org.apache.camel camel-openstack - 4.8.1 + 4.9.0 com.github.fge @@ -2095,7 +2071,7 @@ org.apache.camel camel-opentelemetry - 4.8.1 + 4.9.0 io.grpc @@ -2106,7 +2082,7 @@ org.apache.camel camel-optaplanner - 4.8.1 + 4.9.0 org.optaplanner @@ -2125,17 +2101,17 @@ org.apache.camel camel-paho - 4.8.1 + 4.9.0 org.apache.camel camel-paho-mqtt5 - 4.8.1 + 4.9.0 org.apache.camel camel-pdf - 4.8.1 + 4.9.0 commons-logging @@ -2146,12 +2122,12 @@ org.apache.camel camel-pg-replication-slot - 4.8.1 + 4.9.0 org.apache.camel camel-pgevent - 4.8.1 + 4.9.0 org.testcontainers @@ -2162,7 +2138,7 @@ org.apache.camel camel-pinecone - 4.8.1 + 4.9.0 com.google.android @@ -2185,22 +2161,22 @@ org.apache.camel camel-platform-http - 4.8.1 + 4.9.0 org.apache.camel camel-platform-http-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-printer - 4.8.1 + 4.9.0 org.apache.camel camel-protobuf - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2211,12 +2187,12 @@ org.apache.camel camel-pubnub - 4.8.1 + 4.9.0 org.apache.camel camel-pulsar - 4.8.1 + 4.9.0 com.sun.activation @@ -2251,7 +2227,7 @@ org.apache.camel camel-qdrant - 4.8.1 + 4.9.0 com.google.android @@ -2274,7 +2250,7 @@ org.apache.camel camel-quartz - 4.8.1 + 4.9.0 jakarta.activation @@ -2297,37 +2273,37 @@ org.apache.camel camel-quickfix - 4.8.1 + 4.9.0 org.apache.camel camel-reactive-executor-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-reactive-streams - 4.8.1 + 4.9.0 org.apache.camel camel-redis - 4.8.1 + 4.9.0 org.apache.camel camel-ref - 4.8.1 + 4.9.0 org.apache.camel camel-rest - 4.8.1 + 4.9.0 org.apache.camel camel-rest-openapi - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2342,22 +2318,22 @@ org.apache.camel camel-robotframework - 4.8.1 + 4.9.0 org.apache.camel camel-rss - 4.8.1 + 4.9.0 org.apache.camel camel-saga - 4.8.1 + 4.9.0 org.apache.camel camel-salesforce - 4.8.1 + 4.9.0 com.google.android @@ -2384,12 +2360,12 @@ org.apache.camel camel-sap-netweaver - 4.8.1 + 4.9.0 org.apache.camel camel-saxon - 4.8.1 + 4.9.0 xml-apis @@ -2400,12 +2376,12 @@ org.apache.camel camel-scheduler - 4.8.1 + 4.9.0 org.apache.camel camel-schematron - 4.8.1 + 4.9.0 xml-apis @@ -2416,42 +2392,42 @@ org.apache.camel camel-seda - 4.8.1 + 4.9.0 org.apache.camel camel-servicenow - 4.8.1 + 4.9.0 org.apache.camel camel-servlet - 4.8.1 + 4.9.0 org.apache.camel camel-shiro - 4.8.1 + 4.9.0 org.apache.camel camel-sjms - 4.8.1 + 4.9.0 org.apache.camel camel-sjms2 - 4.8.1 + 4.9.0 org.apache.camel camel-slack - 4.8.1 + 4.9.0 org.apache.camel camel-smb - 4.8.1 + 4.9.0 junit @@ -2462,22 +2438,22 @@ org.apache.camel camel-smpp - 4.8.1 + 4.9.0 org.apache.camel camel-snakeyaml - 4.8.1 + 4.9.0 org.apache.camel camel-snmp - 4.8.1 + 4.9.0 org.apache.camel camel-soap - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2492,12 +2468,12 @@ org.apache.camel camel-splunk - 4.8.1 + 4.9.0 org.apache.camel camel-splunk-hec - 4.8.1 + 4.9.0 commons-logging @@ -2508,7 +2484,7 @@ org.apache.camel camel-spring-rabbitmq - 4.8.1 + 4.9.0 org.springframework @@ -2523,17 +2499,17 @@ org.apache.camel camel-spring-redis - 4.8.1 + 4.9.0 org.apache.camel camel-sql - 4.8.1 + 4.9.0 org.apache.camel camel-ssh - 4.8.1 + 4.9.0 org.slf4j @@ -2544,42 +2520,42 @@ org.apache.camel camel-stax - 4.8.1 + 4.9.0 org.apache.camel camel-stitch - 4.8.1 + 4.9.0 org.apache.camel camel-stomp - 4.8.1 + 4.9.0 org.apache.camel camel-stream - 4.8.1 + 4.9.0 org.apache.camel camel-stringtemplate - 4.8.1 + 4.9.0 org.apache.camel camel-stub - 4.8.1 + 4.9.0 org.apache.camel camel-support - 4.8.1 + 4.9.0 org.apache.camel camel-swift - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2590,22 +2566,22 @@ org.apache.camel camel-syslog - 4.8.1 + 4.9.0 org.apache.camel camel-tarfile - 4.8.1 + 4.9.0 org.apache.camel camel-telegram - 4.8.1 + 4.9.0 org.apache.camel camel-test-junit5 - 4.8.1 + 4.9.0 org.apache.camel @@ -2616,17 +2592,17 @@ org.apache.camel camel-threadpoolfactory-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-thrift - 4.8.1 + 4.9.0 org.apache.camel camel-tika - 4.8.1 + 4.9.0 org.apache.tika @@ -2637,27 +2613,27 @@ org.apache.camel camel-timer - 4.8.1 + 4.9.0 org.apache.camel camel-tooling-model - 4.8.1 + 4.9.0 org.apache.camel camel-tooling-util - 4.8.1 + 4.9.0 org.apache.camel camel-tracing - 4.8.1 + 4.9.0 org.apache.camel camel-twilio - 4.8.1 + 4.9.0 commons-logging @@ -2676,62 +2652,62 @@ org.apache.camel camel-twitter - 4.8.1 + 4.9.0 org.apache.camel camel-univocity-parsers - 4.8.1 + 4.9.0 org.apache.camel camel-util - 4.8.1 + 4.9.0 org.apache.camel camel-util-json - 4.8.1 + 4.9.0 org.apache.camel camel-validator - 4.8.1 + 4.9.0 org.apache.camel camel-velocity - 4.8.1 + 4.9.0 org.apache.camel camel-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-common - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-http - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-websocket - 4.8.1 + 4.9.0 org.apache.camel camel-wasm - 4.8.1 + 4.9.0 org.apache.camel camel-weather - 4.8.1 + 4.9.0 commons-logging @@ -2742,17 +2718,17 @@ org.apache.camel camel-web3j - 4.8.1 + 4.9.0 org.apache.camel camel-webhook - 4.8.1 + 4.9.0 org.apache.camel camel-wordpress - 4.8.1 + 4.9.0 org.checkerframework @@ -2763,7 +2739,7 @@ org.apache.camel camel-workday - 4.8.1 + 4.9.0 commons-logging @@ -2774,7 +2750,7 @@ org.apache.camel camel-xchange - 4.8.1 + 4.9.0 org.checkerframework @@ -2785,27 +2761,27 @@ org.apache.camel camel-xj - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io-util - 4.8.1 + 4.9.0 org.apache.camel camel-xml-jaxb - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2820,37 +2796,37 @@ org.apache.camel camel-xml-jaxp - 4.8.1 + 4.9.0 org.apache.camel camel-xml-jaxp-util - 4.8.1 + 4.9.0 org.apache.camel camel-xmlsecurity - 4.8.1 + 4.9.0 org.apache.camel camel-xmpp - 4.8.1 + 4.9.0 org.apache.camel camel-xpath - 4.8.1 + 4.9.0 org.apache.camel camel-xslt - 4.8.1 + 4.9.0 org.apache.camel camel-xslt-saxon - 4.8.1 + 4.9.0 xml-apis @@ -2861,42 +2837,42 @@ org.apache.camel camel-yaml-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-dsl-common - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-dsl-deserializers - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-io - 4.8.1 + 4.9.0 org.apache.camel camel-zendesk - 4.8.1 + 4.9.0 org.apache.camel camel-zip-deflater - 4.8.1 + 4.9.0 org.apache.camel camel-zipfile - 4.8.1 + 4.9.0 org.apache.camel camel-zookeeper - 4.8.1 + 4.9.0 org.checkerframework @@ -2907,7 +2883,7 @@ org.apache.camel camel-zookeeper-master - 4.8.1 + 4.9.0 org.checkerframework @@ -4090,16 +4066,6 @@ camel-quarkus-groovy-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-grpc @@ -4475,16 +4441,6 @@ camel-quarkus-jq-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-js-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-js-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-jsch @@ -4495,16 +4451,6 @@ camel-quarkus-jsch-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-jslt @@ -4650,26 +4596,6 @@ camel-quarkus-knative-producer-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-kotlin - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-deployment - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-kubernetes @@ -6393,7 +6319,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 7.4.0 + 7.6.0 com.google.code.findbugs @@ -6412,12 +6338,12 @@ ca.uhn.hapi.fhir hapi-fhir-client - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 7.4.0 + 7.6.0 junit @@ -6432,52 +6358,52 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu2 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu2016may - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu3 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.r4 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.r5 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.utilities - 6.3.23 + 6.4.0 com.azure @@ -6523,12 +6449,12 @@ com.google.auth google-auth-library-credentials - 1.24.1 + 1.29.0 com.google.auth google-auth-library-oauth2-http - 1.24.1 + 1.29.0 com.google.code.findbugs @@ -6539,7 +6465,7 @@ com.google.cloud google-cloud-pubsub - 1.132.1 + 1.134.1 com.google.android @@ -6590,7 +6516,7 @@ com.ibm.icu icu4j - 75.1 + 76.1 com.ibm.mq @@ -6610,7 +6536,7 @@ com.microsoft.azure msal4j - 1.16.2 + 1.17.2 com.github.stephenc.jcip @@ -6750,7 +6676,7 @@ io.projectreactor.netty reactor-netty - 1.1.22 + 1.2.0 io.quarkiverse.freemarker @@ -6926,7 +6852,7 @@ io.swagger.parser.v3 swagger-parser - 2.1.22 + 2.1.24 com.google.code.findbugs @@ -6958,7 +6884,7 @@ joda-time joda-time - 2.12.7 + 2.13.0 net.i2p.crypto @@ -7050,7 +6976,7 @@ org.apache.xmlgraphics xmlgraphics-commons - 2.9 + 2.10 commons-logging @@ -7066,7 +6992,7 @@ org.apache.zookeeper zookeeper - 3.9.2 + 3.9.3 ch.qos.logback @@ -7081,7 +7007,7 @@ org.apache.zookeeper zookeeper-jute - 3.9.2 + 3.9.3 org.asynchttpclient @@ -7139,16 +7065,6 @@ kotlin-scripting-compiler-impl-embeddable 2.0.21 - - org.jetbrains.kotlin - kotlin-scripting-jvm - 2.0.21 - - - org.jetbrains.kotlin - kotlin-scripting-jvm-host - 2.0.21 - org.jetbrains.kotlinx kotlinx-serialization-core-jvm @@ -7162,22 +7078,22 @@ org.jxmpp jxmpp-core - 1.0.3 + 1.1.0 org.jxmpp jxmpp-jid - 1.0.3 + 1.1.0 org.jxmpp jxmpp-util-cache - 1.0.3 + 1.1.0 org.kiwiproject consul-client - 1.4.1 + 1.4.2 com.google.code.findbugs @@ -7192,7 +7108,7 @@ org.mapstruct mapstruct-processor - 1.6.0 + 1.6.3 org.mvel @@ -7207,7 +7123,7 @@ org.opensearch.client opensearch-rest-client - 2.16.0 + 2.18.0 org.optaplanner @@ -7232,12 +7148,12 @@ org.snakeyaml snakeyaml-engine - 2.7 + 2.8 org.springframework spring-aop - 6.1.12 + 6.2.0 org.springframework @@ -7252,7 +7168,7 @@ org.springframework spring-expression - 6.1.12 + 6.2.0 org.springframework @@ -7263,7 +7179,7 @@ org.springframework spring-jdbc - 6.1.12 + 6.2.0 org.springframework @@ -7278,7 +7194,7 @@ org.springframework spring-jms - 6.1.12 + 6.2.0 org.springframework @@ -7293,7 +7209,7 @@ org.springframework spring-messaging - 6.1.12 + 6.2.0 org.springframework @@ -7308,7 +7224,7 @@ org.springframework spring-tx - 6.1.12 + 6.2.0 org.springframework @@ -7323,7 +7239,7 @@ org.springframework spring-web - 6.1.12 + 6.2.0 org.springframework @@ -7342,7 +7258,7 @@ org.springframework.data spring-data-redis - 3.3.3 + 3.4.0 org.springframework @@ -7369,7 +7285,7 @@ org.threeten threetenbp - 1.6.9 + 1.7.0 org.web3j @@ -7394,7 +7310,7 @@ redis.clients jedis - 5.1.5 + 5.2.0 software.amazon.awssdk @@ -8229,142 +8145,142 @@ org.eclipse.jetty jetty-alpn-client - 12.0.12 + 12.0.15 org.eclipse.jetty jetty-client - 12.0.12 + 12.0.15 org.eclipse.jetty jetty-http - 12.0.12 + 12.0.15 org.eclipse.jetty jetty-io - 12.0.12 + 12.0.15 org.eclipse.jetty jetty-security - 12.0.12 + 12.0.15 org.eclipse.jetty jetty-server - 12.0.12 + 12.0.15 org.eclipse.jetty jetty-session - 12.0.12 + 12.0.15 org.eclipse.jetty jetty-util - 12.0.12 + 12.0.15 org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.15 org.eclipse.jetty.websocket jetty-websocket-core-common - 12.0.12 + 12.0.15 org.eclipse.jetty.websocket jetty-websocket-core-server - 12.0.12 + 12.0.15 org.eclipse.jetty.websocket jetty-websocket-jetty-api - 12.0.12 + 12.0.15 org.eclipse.jetty.websocket jetty-websocket-jetty-common - 12.0.12 + 12.0.15 org.eclipse.jetty.websocket jetty-websocket-jetty-server - 12.0.12 + 12.0.15 com.azure azure-core - 1.51.0 + 1.53.0 com.azure azure-core-amqp - 2.9.8 + 2.9.10 com.azure azure-cosmos - 4.63.2 + 4.64.0 com.azure azure-identity - 1.13.2 + 1.14.0 com.azure azure-json - 1.2.0 + 1.3.0 com.azure azure-messaging-eventhubs - 5.18.7 + 5.19.1 com.azure azure-messaging-eventhubs-checkpointstore-blob - 1.19.7 + 1.20.1 com.azure azure-messaging-servicebus - 7.17.3 + 7.17.5 com.azure azure-security-keyvault-secrets - 4.8.6 + 4.9.0 com.azure azure-storage-blob - 12.27.1 + 12.28.1 com.azure azure-storage-common - 12.26.1 + 12.27.1 com.azure azure-storage-file-datalake - 12.20.1 + 12.21.0 com.azure azure-storage-internal-avro - 12.12.1 + 12.13.0 com.azure azure-storage-queue - 12.22.1 + 12.23.0 com.azure 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 6e838029de74..2740750d3ed2 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -53,32 +53,32 @@ org.apache.camel camel-activemq - 4.8.1 + 4.9.0 org.apache.camel camel-amqp - 4.8.1 + 4.9.0 org.apache.camel camel-api - 4.8.1 + 4.9.0 org.apache.camel camel-arangodb - 4.8.1 + 4.9.0 org.apache.camel camel-as2 - 4.8.1 + 4.9.0 org.apache.camel camel-as2-api - 4.8.1 + 4.9.0 commons-logging @@ -93,12 +93,12 @@ org.apache.camel camel-asn1 - 4.8.1 + 4.9.0 org.apache.camel camel-asterisk - 4.8.1 + 4.9.0 org.checkerframework @@ -109,7 +109,7 @@ org.apache.camel camel-atom - 4.8.1 + 4.9.0 commons-logging @@ -120,17 +120,17 @@ org.apache.camel camel-attachments - 4.8.1 + 4.9.0 org.apache.camel camel-avro - 4.8.1 + 4.9.0 org.apache.camel camel-aws-bedrock - 4.8.1 + 4.9.0 commons-logging @@ -141,7 +141,7 @@ org.apache.camel camel-aws-secrets-manager - 4.8.1 + 4.9.0 commons-logging @@ -152,7 +152,7 @@ org.apache.camel camel-aws-xray - 4.8.1 + 4.9.0 commons-logging @@ -163,7 +163,7 @@ org.apache.camel camel-aws2-athena - 4.8.1 + 4.9.0 commons-logging @@ -174,7 +174,7 @@ org.apache.camel camel-aws2-cw - 4.8.1 + 4.9.0 commons-logging @@ -185,18 +185,22 @@ org.apache.camel camel-aws2-ddb - 4.8.1 + 4.9.0 commons-logging commons-logging + + org.checkerframework + checker-qual + org.apache.camel camel-aws2-ec2 - 4.8.1 + 4.9.0 commons-logging @@ -207,7 +211,7 @@ org.apache.camel camel-aws2-ecs - 4.8.1 + 4.9.0 commons-logging @@ -218,7 +222,7 @@ org.apache.camel camel-aws2-eks - 4.8.1 + 4.9.0 commons-logging @@ -229,7 +233,7 @@ org.apache.camel camel-aws2-eventbridge - 4.8.1 + 4.9.0 commons-logging @@ -240,7 +244,7 @@ org.apache.camel camel-aws2-iam - 4.8.1 + 4.9.0 commons-logging @@ -251,8 +255,12 @@ org.apache.camel camel-aws2-kinesis - 4.8.1 + 4.9.0 + + com.google.code.findbugs + jsr305 + commons-logging commons-logging @@ -270,7 +278,7 @@ org.apache.camel camel-aws2-kms - 4.8.1 + 4.9.0 commons-logging @@ -281,7 +289,7 @@ org.apache.camel camel-aws2-lambda - 4.8.1 + 4.9.0 commons-logging @@ -292,7 +300,7 @@ org.apache.camel camel-aws2-mq - 4.8.1 + 4.9.0 commons-logging @@ -303,7 +311,7 @@ org.apache.camel camel-aws2-msk - 4.8.1 + 4.9.0 commons-logging @@ -314,7 +322,7 @@ org.apache.camel camel-aws2-s3 - 4.8.1 + 4.9.0 commons-logging @@ -325,7 +333,7 @@ org.apache.camel camel-aws2-ses - 4.8.1 + 4.9.0 commons-logging @@ -336,7 +344,7 @@ org.apache.camel camel-aws2-sns - 4.8.1 + 4.9.0 commons-logging @@ -347,7 +355,7 @@ org.apache.camel camel-aws2-sqs - 4.8.1 + 4.9.0 commons-logging @@ -358,7 +366,7 @@ org.apache.camel camel-aws2-sts - 4.8.1 + 4.9.0 commons-logging @@ -369,7 +377,7 @@ org.apache.camel camel-aws2-translate - 4.8.1 + 4.9.0 commons-logging @@ -380,7 +388,7 @@ org.apache.camel camel-azure-cosmosdb - 4.8.1 + 4.9.0 com.azure @@ -391,7 +399,7 @@ org.apache.camel camel-azure-eventhubs - 4.8.1 + 4.9.0 com.azure @@ -402,7 +410,7 @@ org.apache.camel camel-azure-key-vault - 4.8.1 + 4.9.0 com.azure @@ -413,7 +421,7 @@ org.apache.camel camel-azure-servicebus - 4.8.1 + 4.9.0 com.azure @@ -424,7 +432,7 @@ org.apache.camel camel-azure-storage-blob - 4.8.1 + 4.9.0 com.azure @@ -435,7 +443,7 @@ org.apache.camel camel-azure-storage-datalake - 4.8.1 + 4.9.0 com.azure @@ -446,7 +454,7 @@ org.apache.camel camel-azure-storage-queue - 4.8.1 + 4.9.0 com.azure @@ -457,37 +465,37 @@ org.apache.camel camel-barcode - 4.8.1 + 4.9.0 org.apache.camel camel-base - 4.8.1 + 4.9.0 org.apache.camel camel-base-engine - 4.8.1 + 4.9.0 org.apache.camel camel-base64 - 4.8.1 + 4.9.0 org.apache.camel camel-bean - 4.8.1 + 4.9.0 org.apache.camel camel-bean-validator - 4.8.1 + 4.9.0 org.apache.camel camel-beanio - 4.8.1 + 4.9.0 jakarta.activation @@ -502,17 +510,17 @@ org.apache.camel camel-bindy - 4.8.1 + 4.9.0 org.apache.camel camel-bonita - 4.8.1 + 4.9.0 org.apache.camel camel-box - 4.8.1 + 4.9.0 commons-logging @@ -523,27 +531,27 @@ org.apache.camel camel-box-api - 4.8.1 + 4.9.0 org.apache.camel camel-braintree - 4.8.1 + 4.9.0 org.apache.camel camel-browse - 4.8.1 + 4.9.0 org.apache.camel camel-caffeine - 4.8.1 + 4.9.0 org.apache.camel camel-cassandraql - 4.8.1 + 4.9.0 com.github.spotbugs @@ -558,47 +566,47 @@ org.apache.camel camel-catalog - 4.8.1 + 4.9.0 org.apache.camel camel-cbor - 4.8.1 + 4.9.0 org.apache.camel camel-chatscript - 4.8.1 + 4.9.0 org.apache.camel camel-chunk - 4.8.1 + 4.9.0 org.apache.camel camel-cli-connector - 4.8.1 + 4.9.0 org.apache.camel camel-cloud - 4.8.1 + 4.9.0 org.apache.camel camel-cloudevents - 4.8.1 + 4.9.0 org.apache.camel camel-cluster - 4.8.1 + 4.9.0 org.apache.camel camel-cm-sms - 4.8.1 + 4.9.0 commons-logging @@ -609,27 +617,27 @@ org.apache.camel camel-coap - 4.8.1 + 4.9.0 org.apache.camel camel-cometd - 4.8.1 + 4.9.0 org.apache.camel camel-componentdsl - 4.8.1 + 4.9.0 org.apache.camel camel-console - 4.8.1 + 4.9.0 org.apache.camel camel-consul - 4.8.1 + 4.9.0 org.checkerframework @@ -640,47 +648,47 @@ org.apache.camel camel-controlbus - 4.8.1 + 4.9.0 org.apache.camel camel-core-catalog - 4.8.1 + 4.9.0 org.apache.camel camel-core-engine - 4.8.1 + 4.9.0 org.apache.camel camel-core-languages - 4.8.1 + 4.9.0 org.apache.camel camel-core-model - 4.8.1 + 4.9.0 org.apache.camel camel-core-processor - 4.8.1 + 4.9.0 org.apache.camel camel-core-reifier - 4.8.1 + 4.9.0 org.apache.camel camel-couchbase - 4.8.1 + 4.9.0 org.apache.camel camel-couchdb - 4.8.1 + 4.9.0 commons-logging @@ -691,12 +699,12 @@ org.apache.camel camel-cron - 4.8.1 + 4.9.0 org.apache.camel camel-crypto - 4.8.1 + 4.9.0 org.bouncycastle @@ -707,43 +715,47 @@ org.apache.camel camel-crypto-pgp - 4.8.1 + 4.9.0 org.apache.camel camel-csv - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-common - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-soap - 4.8.1 + 4.9.0 org.apache.camel camel-cxf-transport - 4.8.1 + 4.9.0 org.apache.camel camel-dataformat - 4.8.1 + 4.9.0 org.apache.camel camel-dataset - 4.8.1 + 4.9.0 org.apache.camel camel-datasonnet - 4.8.1 + 4.9.0 + + ch.qos.logback + logback-classic + jakarta.activation jakarta.activation-api @@ -769,7 +781,7 @@ org.apache.camel camel-debezium-common - 4.8.1 + 4.9.0 javax.ws.rs @@ -780,32 +792,32 @@ org.apache.camel camel-debezium-mongodb - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-mysql - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-postgres - 4.8.1 + 4.9.0 org.apache.camel camel-debezium-sqlserver - 4.8.1 + 4.9.0 org.apache.camel camel-debug - 4.8.1 + 4.9.0 org.apache.camel camel-digitalocean - 4.8.1 + 4.9.0 commons-logging @@ -816,17 +828,17 @@ org.apache.camel camel-direct - 4.8.1 + 4.9.0 org.apache.camel camel-disruptor - 4.8.1 + 4.9.0 org.apache.camel camel-djl - 4.8.1 + 4.9.0 org.checkerframework @@ -837,12 +849,12 @@ org.apache.camel camel-dns - 4.8.1 + 4.9.0 org.apache.camel camel-drill - 4.8.1 + 4.9.0 ch.qos.logback @@ -869,7 +881,7 @@ org.apache.camel camel-dropbox - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -880,22 +892,22 @@ org.apache.camel camel-dsl-modeline - 4.8.1 + 4.9.0 org.apache.camel camel-dsl-support - 4.8.1 + 4.9.0 org.apache.camel camel-ehcache - 4.8.1 + 4.9.0 org.apache.camel camel-elasticsearch - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -910,7 +922,7 @@ org.apache.camel camel-elasticsearch-rest-client - 4.8.1 + 4.9.0 commons-logging @@ -921,7 +933,7 @@ org.apache.camel camel-endpointdsl - 4.8.1 + 4.9.0 com.sun.mail @@ -929,15 +941,10 @@ - - org.apache.camel - camel-endpointdsl-support - 4.8.1 - org.apache.camel camel-etcd3 - 4.8.1 + 4.9.0 com.google.android @@ -960,42 +967,42 @@ org.apache.camel camel-exec - 4.8.1 + 4.9.0 org.apache.camel camel-fastjson - 4.8.1 + 4.9.0 org.apache.camel camel-fhir - 4.8.1 + 4.9.0 org.apache.camel camel-fhir-api - 4.8.1 + 4.9.0 org.apache.camel camel-file - 4.8.1 + 4.9.0 org.apache.camel camel-file-watch - 4.8.1 + 4.9.0 org.apache.camel camel-flatpack - 4.8.1 + 4.9.0 org.apache.camel camel-flink - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -1006,7 +1013,7 @@ org.apache.camel camel-fop - 4.8.1 + 4.9.0 commons-logging @@ -1021,17 +1028,17 @@ org.apache.camel camel-freemarker - 4.8.1 + 4.9.0 org.apache.camel camel-ftp - 4.8.1 + 4.9.0 org.apache.camel camel-geocoder - 4.8.1 + 4.9.0 commons-logging @@ -1042,17 +1049,17 @@ org.apache.camel camel-git - 4.8.1 + 4.9.0 org.apache.camel camel-github - 4.8.1 + 4.9.0 org.apache.camel camel-google-bigquery - 4.8.1 + 4.9.0 com.google.android @@ -1079,7 +1086,7 @@ org.apache.camel camel-google-calendar - 4.8.1 + 4.9.0 commons-logging @@ -1094,7 +1101,7 @@ org.apache.camel camel-google-drive - 4.8.1 + 4.9.0 commons-logging @@ -1109,7 +1116,7 @@ org.apache.camel camel-google-functions - 4.8.1 + 4.9.0 com.google.android @@ -1136,7 +1143,7 @@ org.apache.camel camel-google-mail - 4.8.1 + 4.9.0 commons-logging @@ -1151,7 +1158,7 @@ org.apache.camel camel-google-pubsub - 4.8.1 + 4.9.0 com.google.android @@ -1178,7 +1185,7 @@ org.apache.camel camel-google-secret-manager - 4.8.1 + 4.9.0 com.google.android @@ -1209,7 +1216,7 @@ org.apache.camel camel-google-sheets - 4.8.1 + 4.9.0 commons-logging @@ -1224,7 +1231,7 @@ org.apache.camel camel-google-storage - 4.8.1 + 4.9.0 com.google.android @@ -1251,7 +1258,7 @@ org.apache.camel camel-graphql - 4.8.1 + 4.9.0 commons-logging @@ -1262,27 +1269,17 @@ org.apache.camel camel-grok - 4.8.1 + 4.9.0 org.apache.camel camel-groovy - 4.8.1 - - - org.apache.camel - camel-groovy-dsl - 4.8.1 - - - org.apache.camel - camel-groovy-dsl-common - 4.8.1 + 4.9.0 org.apache.camel camel-grpc - 4.8.1 + 4.9.0 com.google.android @@ -1313,12 +1310,12 @@ org.apache.camel camel-gson - 4.8.1 + 4.9.0 org.apache.camel camel-guava-eventbus - 4.8.1 + 4.9.0 org.checkerframework @@ -1329,7 +1326,7 @@ org.apache.camel camel-hashicorp-vault - 4.8.1 + 4.9.0 org.springframework @@ -1348,12 +1345,12 @@ org.apache.camel camel-hazelcast - 4.8.1 + 4.9.0 org.apache.camel camel-headersmap - 4.8.1 + 4.9.0 ch.qos.logback @@ -1364,17 +1361,17 @@ org.apache.camel camel-health - 4.8.1 + 4.9.0 org.apache.camel camel-hl7 - 4.8.1 + 4.9.0 org.apache.camel camel-http - 4.8.1 + 4.9.0 commons-logging @@ -1385,27 +1382,27 @@ org.apache.camel camel-http-base - 4.8.1 + 4.9.0 org.apache.camel camel-http-common - 4.8.1 + 4.9.0 org.apache.camel camel-huaweicloud-common - 4.8.1 + 4.9.0 org.apache.camel camel-huaweicloud-smn - 4.8.1 + 4.9.0 org.apache.camel camel-ical - 4.8.1 + 4.9.0 commons-logging @@ -1416,7 +1413,7 @@ org.apache.camel camel-iec60870 - 4.8.1 + 4.9.0 org.checkerframework @@ -1427,12 +1424,12 @@ org.apache.camel camel-ignite - 4.8.1 + 4.9.0 org.apache.camel camel-infinispan - 4.8.1 + 4.9.0 org.infinispan @@ -1451,57 +1448,57 @@ org.apache.camel camel-infinispan-common - 4.8.1 + 4.9.0 org.apache.camel camel-influxdb - 4.8.1 + 4.9.0 org.apache.camel camel-irc - 4.8.1 + 4.9.0 org.apache.camel camel-jackson - 4.8.1 + 4.9.0 org.apache.camel camel-jackson-avro - 4.8.1 + 4.9.0 org.apache.camel camel-jackson-protobuf - 4.8.1 + 4.9.0 org.apache.camel camel-jacksonxml - 4.8.1 + 4.9.0 org.apache.camel camel-jasypt - 4.8.1 + 4.9.0 org.apache.camel camel-java-joor-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-javascript - 4.8.1 + 4.9.0 org.apache.camel camel-jaxb - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -1512,12 +1509,12 @@ org.apache.camel camel-jcache - 4.8.1 + 4.9.0 org.apache.camel camel-jcr - 4.8.1 + 4.9.0 org.slf4j @@ -1528,27 +1525,27 @@ org.apache.camel camel-jdbc - 4.8.1 + 4.9.0 org.apache.camel camel-jfr - 4.8.1 + 4.9.0 org.apache.camel camel-jgroups - 4.8.1 + 4.9.0 org.apache.camel camel-jgroups-raft - 4.8.1 + 4.9.0 org.apache.camel camel-jira - 4.8.1 + 4.9.0 commons-logging @@ -1567,7 +1564,7 @@ org.apache.camel camel-jms - 4.8.1 + 4.9.0 org.apache.camel @@ -1586,12 +1583,12 @@ org.apache.camel camel-jolt - 4.8.1 + 4.9.0 org.apache.camel camel-jooq - 4.8.1 + 4.9.0 org.springframework @@ -1602,12 +1599,12 @@ org.apache.camel camel-joor - 4.8.1 + 4.9.0 org.apache.camel camel-jpa - 4.8.1 + 4.9.0 org.apache.camel @@ -1622,7 +1619,7 @@ org.apache.camel camel-jq - 4.8.1 + 4.9.0 net.thisptr @@ -1634,106 +1631,85 @@ - - org.apache.camel - camel-js-dsl - 4.8.1 - - - org.graalvm.js - js - - - org.apache.camel camel-jsch - 4.8.1 - - - org.apache.camel - camel-jsh-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-jslt - 4.8.1 + 4.9.0 org.apache.camel camel-json-patch - 4.8.1 + 4.9.0 org.apache.camel camel-json-validator - 4.8.1 + 4.9.0 org.apache.camel camel-jsonapi - 4.8.1 + 4.9.0 org.apache.camel camel-jsonata - 4.8.1 + 4.9.0 org.apache.camel camel-jsonb - 4.8.1 + 4.9.0 org.apache.camel camel-jsonpath - 4.8.1 + 4.9.0 org.apache.camel camel-jt400 - 4.8.1 + 4.9.0 org.apache.camel camel-jta - 4.8.1 + 4.9.0 org.apache.camel camel-kafka - 4.8.1 + 4.9.0 org.apache.camel camel-kamelet - 4.8.1 + 4.9.0 org.apache.camel camel-knative - 4.8.1 + 4.9.0 org.apache.camel camel-knative-api - 4.8.1 + 4.9.0 org.apache.camel camel-knative-http - 4.8.1 - - - org.apache.camel - camel-kotlin-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-kubernetes - 4.8.1 + 4.9.0 io.fabric8 @@ -1756,57 +1732,57 @@ org.apache.camel camel-kudu - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-chat - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-core - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-embeddings - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-tokenizer - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-tools - 4.8.1 + 4.9.0 org.apache.camel camel-langchain4j-web-search - 4.8.1 + 4.9.0 org.apache.camel camel-language - 4.8.1 + 4.9.0 org.apache.camel camel-ldap - 4.8.1 + 4.9.0 org.apache.camel camel-ldif - 4.8.1 + 4.9.0 org.apache.camel camel-leveldb - 4.8.1 + 4.9.0 org.checkerframework @@ -1817,82 +1793,82 @@ org.apache.camel camel-log - 4.8.1 + 4.9.0 org.apache.camel camel-lra - 4.8.1 + 4.9.0 org.apache.camel camel-lucene - 4.8.1 + 4.9.0 org.apache.camel camel-lumberjack - 4.8.1 + 4.9.0 org.apache.camel camel-lzf - 4.8.1 + 4.9.0 org.apache.camel camel-mail - 4.8.1 + 4.9.0 org.apache.camel camel-mail-microsoft-oauth - 4.8.1 + 4.9.0 org.apache.camel camel-main - 4.8.1 + 4.9.0 org.apache.camel camel-management - 4.8.1 + 4.9.0 org.apache.camel camel-management-api - 4.8.1 + 4.9.0 org.apache.camel camel-mapstruct - 4.8.1 + 4.9.0 org.apache.camel camel-master - 4.8.1 + 4.9.0 org.apache.camel camel-micrometer - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-config - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-fault-tolerance - 4.8.1 + 4.9.0 org.apache.camel camel-microprofile-health - 4.8.1 + 4.9.0 org.eclipse.parsson @@ -1907,7 +1883,7 @@ org.apache.camel camel-milvus - 4.8.1 + 4.9.0 com.google.android @@ -1946,62 +1922,62 @@ org.apache.camel camel-minio - 4.8.1 + 4.9.0 org.apache.camel camel-mllp - 4.8.1 + 4.9.0 org.apache.camel camel-mock - 4.8.1 + 4.9.0 org.apache.camel camel-mongodb - 4.8.1 + 4.9.0 org.apache.camel camel-mongodb-gridfs - 4.8.1 + 4.9.0 org.apache.camel camel-mustache - 4.8.1 + 4.9.0 org.apache.camel camel-mvel - 4.8.1 + 4.9.0 org.apache.camel camel-mybatis - 4.8.1 + 4.9.0 org.apache.camel camel-nats - 4.8.1 + 4.9.0 org.apache.camel camel-netty - 4.8.1 + 4.9.0 org.apache.camel camel-netty-http - 4.8.1 + 4.9.0 org.apache.camel camel-nitrite - 4.8.1 + 4.9.0 javax.validation @@ -2012,7 +1988,7 @@ org.apache.camel camel-oaipmh - 4.8.1 + 4.9.0 commons-logging @@ -2023,12 +1999,12 @@ org.apache.camel camel-ognl - 4.8.1 + 4.9.0 org.apache.camel camel-olingo4 - 4.8.1 + 4.9.0 commons-logging @@ -2039,7 +2015,7 @@ org.apache.camel camel-olingo4-api - 4.8.1 + 4.9.0 commons-logging @@ -2050,7 +2026,7 @@ org.apache.camel camel-openapi-java - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2065,7 +2041,7 @@ org.apache.camel camel-opensearch - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2080,7 +2056,7 @@ org.apache.camel camel-openstack - 4.8.1 + 4.9.0 com.github.fge @@ -2095,7 +2071,7 @@ org.apache.camel camel-opentelemetry - 4.8.1 + 4.9.0 io.grpc @@ -2106,7 +2082,7 @@ org.apache.camel camel-optaplanner - 4.8.1 + 4.9.0 org.optaplanner @@ -2125,17 +2101,17 @@ org.apache.camel camel-paho - 4.8.1 + 4.9.0 org.apache.camel camel-paho-mqtt5 - 4.8.1 + 4.9.0 org.apache.camel camel-pdf - 4.8.1 + 4.9.0 commons-logging @@ -2146,12 +2122,12 @@ org.apache.camel camel-pg-replication-slot - 4.8.1 + 4.9.0 org.apache.camel camel-pgevent - 4.8.1 + 4.9.0 org.testcontainers @@ -2162,7 +2138,7 @@ org.apache.camel camel-pinecone - 4.8.1 + 4.9.0 com.google.android @@ -2185,22 +2161,22 @@ org.apache.camel camel-platform-http - 4.8.1 + 4.9.0 org.apache.camel camel-platform-http-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-printer - 4.8.1 + 4.9.0 org.apache.camel camel-protobuf - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2211,12 +2187,12 @@ org.apache.camel camel-pubnub - 4.8.1 + 4.9.0 org.apache.camel camel-pulsar - 4.8.1 + 4.9.0 com.sun.activation @@ -2251,7 +2227,7 @@ org.apache.camel camel-qdrant - 4.8.1 + 4.9.0 com.google.android @@ -2274,7 +2250,7 @@ org.apache.camel camel-quartz - 4.8.1 + 4.9.0 jakarta.activation @@ -2297,37 +2273,37 @@ org.apache.camel camel-quickfix - 4.8.1 + 4.9.0 org.apache.camel camel-reactive-executor-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-reactive-streams - 4.8.1 + 4.9.0 org.apache.camel camel-redis - 4.8.1 + 4.9.0 org.apache.camel camel-ref - 4.8.1 + 4.9.0 org.apache.camel camel-rest - 4.8.1 + 4.9.0 org.apache.camel camel-rest-openapi - 4.8.1 + 4.9.0 com.google.code.findbugs @@ -2342,22 +2318,22 @@ org.apache.camel camel-robotframework - 4.8.1 + 4.9.0 org.apache.camel camel-rss - 4.8.1 + 4.9.0 org.apache.camel camel-saga - 4.8.1 + 4.9.0 org.apache.camel camel-salesforce - 4.8.1 + 4.9.0 com.google.android @@ -2384,12 +2360,12 @@ org.apache.camel camel-sap-netweaver - 4.8.1 + 4.9.0 org.apache.camel camel-saxon - 4.8.1 + 4.9.0 xml-apis @@ -2400,12 +2376,12 @@ org.apache.camel camel-scheduler - 4.8.1 + 4.9.0 org.apache.camel camel-schematron - 4.8.1 + 4.9.0 xml-apis @@ -2416,42 +2392,42 @@ org.apache.camel camel-seda - 4.8.1 + 4.9.0 org.apache.camel camel-servicenow - 4.8.1 + 4.9.0 org.apache.camel camel-servlet - 4.8.1 + 4.9.0 org.apache.camel camel-shiro - 4.8.1 + 4.9.0 org.apache.camel camel-sjms - 4.8.1 + 4.9.0 org.apache.camel camel-sjms2 - 4.8.1 + 4.9.0 org.apache.camel camel-slack - 4.8.1 + 4.9.0 org.apache.camel camel-smb - 4.8.1 + 4.9.0 junit @@ -2462,22 +2438,22 @@ org.apache.camel camel-smpp - 4.8.1 + 4.9.0 org.apache.camel camel-snakeyaml - 4.8.1 + 4.9.0 org.apache.camel camel-snmp - 4.8.1 + 4.9.0 org.apache.camel camel-soap - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2492,12 +2468,12 @@ org.apache.camel camel-splunk - 4.8.1 + 4.9.0 org.apache.camel camel-splunk-hec - 4.8.1 + 4.9.0 commons-logging @@ -2508,7 +2484,7 @@ org.apache.camel camel-spring-rabbitmq - 4.8.1 + 4.9.0 org.springframework @@ -2523,17 +2499,17 @@ org.apache.camel camel-spring-redis - 4.8.1 + 4.9.0 org.apache.camel camel-sql - 4.8.1 + 4.9.0 org.apache.camel camel-ssh - 4.8.1 + 4.9.0 org.slf4j @@ -2544,42 +2520,42 @@ org.apache.camel camel-stax - 4.8.1 + 4.9.0 org.apache.camel camel-stitch - 4.8.1 + 4.9.0 org.apache.camel camel-stomp - 4.8.1 + 4.9.0 org.apache.camel camel-stream - 4.8.1 + 4.9.0 org.apache.camel camel-stringtemplate - 4.8.1 + 4.9.0 org.apache.camel camel-stub - 4.8.1 + 4.9.0 org.apache.camel camel-support - 4.8.1 + 4.9.0 org.apache.camel camel-swift - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2590,22 +2566,22 @@ org.apache.camel camel-syslog - 4.8.1 + 4.9.0 org.apache.camel camel-tarfile - 4.8.1 + 4.9.0 org.apache.camel camel-telegram - 4.8.1 + 4.9.0 org.apache.camel camel-test-junit5 - 4.8.1 + 4.9.0 org.apache.camel @@ -2616,17 +2592,17 @@ org.apache.camel camel-threadpoolfactory-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-thrift - 4.8.1 + 4.9.0 org.apache.camel camel-tika - 4.8.1 + 4.9.0 org.apache.tika @@ -2637,27 +2613,27 @@ org.apache.camel camel-timer - 4.8.1 + 4.9.0 org.apache.camel camel-tooling-model - 4.8.1 + 4.9.0 org.apache.camel camel-tooling-util - 4.8.1 + 4.9.0 org.apache.camel camel-tracing - 4.8.1 + 4.9.0 org.apache.camel camel-twilio - 4.8.1 + 4.9.0 commons-logging @@ -2676,62 +2652,62 @@ org.apache.camel camel-twitter - 4.8.1 + 4.9.0 org.apache.camel camel-univocity-parsers - 4.8.1 + 4.9.0 org.apache.camel camel-util - 4.8.1 + 4.9.0 org.apache.camel camel-util-json - 4.8.1 + 4.9.0 org.apache.camel camel-validator - 4.8.1 + 4.9.0 org.apache.camel camel-velocity - 4.8.1 + 4.9.0 org.apache.camel camel-vertx - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-common - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-http - 4.8.1 + 4.9.0 org.apache.camel camel-vertx-websocket - 4.8.1 + 4.9.0 org.apache.camel camel-wasm - 4.8.1 + 4.9.0 org.apache.camel camel-weather - 4.8.1 + 4.9.0 commons-logging @@ -2742,17 +2718,17 @@ org.apache.camel camel-web3j - 4.8.1 + 4.9.0 org.apache.camel camel-webhook - 4.8.1 + 4.9.0 org.apache.camel camel-wordpress - 4.8.1 + 4.9.0 org.checkerframework @@ -2763,7 +2739,7 @@ org.apache.camel camel-workday - 4.8.1 + 4.9.0 commons-logging @@ -2774,7 +2750,7 @@ org.apache.camel camel-xchange - 4.8.1 + 4.9.0 org.checkerframework @@ -2785,27 +2761,27 @@ org.apache.camel camel-xj - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-xml-io-util - 4.8.1 + 4.9.0 org.apache.camel camel-xml-jaxb - 4.8.1 + 4.9.0 com.sun.xml.bind @@ -2820,37 +2796,37 @@ org.apache.camel camel-xml-jaxp - 4.8.1 + 4.9.0 org.apache.camel camel-xml-jaxp-util - 4.8.1 + 4.9.0 org.apache.camel camel-xmlsecurity - 4.8.1 + 4.9.0 org.apache.camel camel-xmpp - 4.8.1 + 4.9.0 org.apache.camel camel-xpath - 4.8.1 + 4.9.0 org.apache.camel camel-xslt - 4.8.1 + 4.9.0 org.apache.camel camel-xslt-saxon - 4.8.1 + 4.9.0 xml-apis @@ -2861,42 +2837,42 @@ org.apache.camel camel-yaml-dsl - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-dsl-common - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-dsl-deserializers - 4.8.1 + 4.9.0 org.apache.camel camel-yaml-io - 4.8.1 + 4.9.0 org.apache.camel camel-zendesk - 4.8.1 + 4.9.0 org.apache.camel camel-zip-deflater - 4.8.1 + 4.9.0 org.apache.camel camel-zipfile - 4.8.1 + 4.9.0 org.apache.camel camel-zookeeper - 4.8.1 + 4.9.0 org.checkerframework @@ -2907,7 +2883,7 @@ org.apache.camel camel-zookeeper-master - 4.8.1 + 4.9.0 org.checkerframework @@ -4090,16 +4066,6 @@ camel-quarkus-groovy-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-groovy-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-grpc @@ -4475,16 +4441,6 @@ camel-quarkus-jq-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-js-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-js-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-jsch @@ -4495,16 +4451,6 @@ camel-quarkus-jsch-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-jsh-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-jslt @@ -4650,26 +4596,6 @@ camel-quarkus-knative-producer-deployment 3.17.0-SNAPSHOT - - org.apache.camel.quarkus - camel-quarkus-kotlin - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-deployment - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl - 3.17.0-SNAPSHOT - - - org.apache.camel.quarkus - camel-quarkus-kotlin-dsl-deployment - 3.17.0-SNAPSHOT - org.apache.camel.quarkus camel-quarkus-kubernetes @@ -6393,7 +6319,7 @@ ca.uhn.hapi.fhir hapi-fhir-base - 7.4.0 + 7.6.0 com.google.code.findbugs @@ -6412,12 +6338,12 @@ ca.uhn.hapi.fhir hapi-fhir-client - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-dstu2.1 - 7.4.0 + 7.6.0 junit @@ -6432,52 +6358,52 @@ ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-hl7org-dstu2 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-r4 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir hapi-fhir-structures-r5 - 7.4.0 + 7.6.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu2 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu2016may - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.dstu3 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.r4 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.r5 - 6.3.23 + 6.4.0 ca.uhn.hapi.fhir org.hl7.fhir.utilities - 6.3.23 + 6.4.0 com.azure @@ -6523,12 +6449,12 @@ com.google.auth google-auth-library-credentials - 1.24.1 + 1.29.0 com.google.auth google-auth-library-oauth2-http - 1.24.1 + 1.29.0 com.google.code.findbugs @@ -6539,7 +6465,7 @@ com.google.cloud google-cloud-pubsub - 1.132.1 + 1.134.1 com.google.android @@ -6590,7 +6516,7 @@ com.ibm.icu icu4j - 75.1 + 76.1 com.ibm.mq @@ -6610,7 +6536,7 @@ com.microsoft.azure msal4j - 1.16.2 + 1.17.2 com.github.stephenc.jcip @@ -6750,7 +6676,7 @@ io.projectreactor.netty reactor-netty - 1.1.22 + 1.2.0 io.quarkiverse.freemarker @@ -6926,7 +6852,7 @@ io.swagger.parser.v3 swagger-parser - 2.1.22 + 2.1.24 com.google.code.findbugs @@ -6958,7 +6884,7 @@ joda-time joda-time - 2.12.7 + 2.13.0 net.i2p.crypto @@ -7050,7 +6976,7 @@ org.apache.xmlgraphics xmlgraphics-commons - 2.9 + 2.10 commons-logging @@ -7066,7 +6992,7 @@ org.apache.zookeeper zookeeper - 3.9.2 + 3.9.3 ch.qos.logback @@ -7081,7 +7007,7 @@ org.apache.zookeeper zookeeper-jute - 3.9.2 + 3.9.3 org.asynchttpclient @@ -7139,16 +7065,6 @@ kotlin-scripting-compiler-impl-embeddable 2.0.21 - - org.jetbrains.kotlin - kotlin-scripting-jvm - 2.0.21 - - - org.jetbrains.kotlin - kotlin-scripting-jvm-host - 2.0.21 - org.jetbrains.kotlinx kotlinx-serialization-core-jvm @@ -7162,22 +7078,22 @@ org.jxmpp jxmpp-core - 1.0.3 + 1.1.0 org.jxmpp jxmpp-jid - 1.0.3 + 1.1.0 org.jxmpp jxmpp-util-cache - 1.0.3 + 1.1.0 org.kiwiproject consul-client - 1.4.1 + 1.4.2 com.google.code.findbugs @@ -7192,7 +7108,7 @@ org.mapstruct mapstruct-processor - 1.6.0 + 1.6.3 org.mvel @@ -7207,7 +7123,7 @@ org.opensearch.client opensearch-rest-client - 2.16.0 + 2.18.0 org.optaplanner @@ -7232,12 +7148,12 @@ org.snakeyaml snakeyaml-engine - 2.7 + 2.8 org.springframework spring-aop - 6.1.12 + 6.2.0 org.springframework @@ -7252,7 +7168,7 @@ org.springframework spring-expression - 6.1.12 + 6.2.0 org.springframework @@ -7263,7 +7179,7 @@ org.springframework spring-jdbc - 6.1.12 + 6.2.0 org.springframework @@ -7278,7 +7194,7 @@ org.springframework spring-jms - 6.1.12 + 6.2.0 org.springframework @@ -7293,7 +7209,7 @@ org.springframework spring-messaging - 6.1.12 + 6.2.0 org.springframework @@ -7308,7 +7224,7 @@ org.springframework spring-tx - 6.1.12 + 6.2.0 org.springframework @@ -7323,7 +7239,7 @@ org.springframework spring-web - 6.1.12 + 6.2.0 org.springframework @@ -7342,7 +7258,7 @@ org.springframework.data spring-data-redis - 3.3.3 + 3.4.0 org.springframework @@ -7369,7 +7285,7 @@ org.threeten threetenbp - 1.6.9 + 1.7.0 org.web3j @@ -7394,7 +7310,7 @@ redis.clients jedis - 5.1.5 + 5.2.0 software.amazon.awssdk @@ -8227,149 +8143,149 @@ 2.7.1 - org.eclipse.jetty - jetty-alpn-client - 12.0.12 + org.eclipse.jetty + jetty-alpn-client + 12.0.15 - org.eclipse.jetty - jetty-client - 12.0.12 + org.eclipse.jetty + jetty-client + 12.0.15 - org.eclipse.jetty - jetty-http - 12.0.12 + org.eclipse.jetty + jetty-http + 12.0.15 - org.eclipse.jetty - jetty-io - 12.0.12 + org.eclipse.jetty + jetty-io + 12.0.15 - org.eclipse.jetty - jetty-security - 12.0.12 + org.eclipse.jetty + jetty-security + 12.0.15 - org.eclipse.jetty - jetty-server - 12.0.12 + org.eclipse.jetty + jetty-server + 12.0.15 - org.eclipse.jetty - jetty-session - 12.0.12 + org.eclipse.jetty + jetty-session + 12.0.15 - org.eclipse.jetty - jetty-util - 12.0.12 + org.eclipse.jetty + jetty-util + 12.0.15 - org.eclipse.jetty - jetty-util-ajax - 12.0.12 + org.eclipse.jetty + jetty-util-ajax + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-core-common - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-core-common + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-core-server - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-core-server + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-jetty-api - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-jetty-api + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-jetty-common - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-jetty-common + 12.0.15 - org.eclipse.jetty.websocket - jetty-websocket-jetty-server - 12.0.12 + org.eclipse.jetty.websocket + jetty-websocket-jetty-server + 12.0.15 - com.azure - azure-core - 1.51.0 + com.azure + azure-core + 1.53.0 - com.azure - azure-core-amqp - 2.9.8 + com.azure + azure-core-amqp + 2.9.10 - com.azure - azure-cosmos - 4.63.2 + com.azure + azure-cosmos + 4.64.0 - com.azure - azure-identity - 1.13.2 + com.azure + azure-identity + 1.14.0 - com.azure - azure-json - 1.2.0 + com.azure + azure-json + 1.3.0 - com.azure - azure-messaging-eventhubs - 5.18.7 + com.azure + azure-messaging-eventhubs + 5.19.1 - com.azure - azure-messaging-eventhubs-checkpointstore-blob - 1.19.7 + com.azure + azure-messaging-eventhubs-checkpointstore-blob + 1.20.1 - com.azure - azure-messaging-servicebus - 7.17.3 + com.azure + azure-messaging-servicebus + 7.17.5 - com.azure - azure-security-keyvault-secrets - 4.8.6 + com.azure + azure-security-keyvault-secrets + 4.9.0 - com.azure - azure-storage-blob - 12.27.1 + com.azure + azure-storage-blob + 12.28.1 - com.azure - azure-storage-common - 12.26.1 + com.azure + azure-storage-common + 12.27.1 - com.azure - azure-storage-file-datalake - 12.20.1 + com.azure + azure-storage-file-datalake + 12.21.0 - com.azure - azure-storage-internal-avro - 12.12.1 + com.azure + azure-storage-internal-avro + 12.13.0 - com.azure - azure-storage-queue - 12.22.1 + com.azure + azure-storage-queue + 12.23.0 - com.azure - azure-xml - 1.1.0 + com.azure + azure-xml + 1.1.0 com.datastax.oss diff --git a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/DoubleRoutesPerClassTest.java b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/DoubleRoutesPerClassTest.java index 77baa4a27886..ec1dc7b29392 100644 --- a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/DoubleRoutesPerClassTest.java +++ b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/doubeRouteBuilderPerClass/DoubleRoutesPerClassTest.java @@ -24,12 +24,14 @@ import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; /** * Test for https://github.com/apache/camel-quarkus/issues/4560 */ +@Disabled //https://github.com/apache/camel-quarkus/issues/6492 public class DoubleRoutesPerClassTest { @RegisterExtension 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 20f62ddc6f9d..01d8af84d413 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 @@ -39,9 +39,11 @@ 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.CamelContextConfiguration; 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.TestExecutionConfiguration; import org.apache.camel.test.junit5.TestSupport; import org.apache.camel.test.junit5.util.ExtensionHelper; import org.apache.camel.test.junit5.util.RouteCoverageDumperExtension; @@ -503,7 +505,17 @@ Set getCreatedRoutes() { private void assertTestClassCamelContextMatchesAppCamelContext() { // Test classes must use the same CamelContext as the application under test - Assertions.assertEquals(context, super.context, + Assertions.assertEquals(context, contextManager.context(), "CamelQuarkusTestSupport uses a different CamelContext compared to the application under test"); } + + @Override + public void configureContext(CamelContextConfiguration camelContextConfiguration) { + //to be overridden of child, if needed + } + + @Override + public void configureTest(TestExecutionConfiguration testExecutionConfiguration) { + //to be overridden of child, if needed + } } diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java index d4084480117e..2c386d798390 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/UpdateExtensionDocPageMojo.java @@ -237,10 +237,6 @@ private String camelBitLink(ArtifactModel model) { xrefPrefix = "xref:manual::"; name = "camel-console"; } - // TODO: https://github.com/apache/camel-quarkus/issues/6448 - if (name.equals("kotlin-dsl")) { - return ""; - } return xrefPrefix + name + (!"other".equals(kind) ? "-" + kind : "") + ".adoc"; } }); diff --git a/tooling/scripts/test-categories.yaml b/tooling/scripts/test-categories.yaml index c95b679ad1c0..6293e9be7696 100644 --- a/tooling/scripts/test-categories.yaml +++ b/tooling/scripts/test-categories.yaml @@ -56,7 +56,6 @@ group-03: - freemarker - github - google - - jsh-dsl - json-validator - main - main-collector @@ -175,7 +174,6 @@ group-10: - fop - groovy - joor - - kotlin - mail - main-unknown-args-fail - main-unknown-args-ignore @@ -217,13 +215,10 @@ group-12: group-13: - fhir - google-bigquery - - groovy-dsl - jasypt - jira - java-joor-dsl - jdbc-grouped - - js-dsl - - kotlin-dsl - kubernetes - salesforce - sap-netweaver