This is an automated email from the ASF dual-hosted git repository. github-actions[bot] pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 82803e3c79b026a657cb05105ad7a84ef5d9c91c Author: Jiri Ondrusek <[email protected]> AuthorDate: Tue Sep 1 11:56:50 2026 +0200 Remove reactive-executor extension The camel-reactive-executor-vertx (and camel-reactive-executor-tomcat) components were removed from Camel main (apache/camel@64a4351, apache/camel@05d8c5b); Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> --- catalog/pom.xml | 13 ---- docs/modules/ROOT/nav.adoc | 1 - .../pages/reference/extensions/mcp-server.adoc | 2 +- .../reference/extensions/reactive-executor.adoc | 39 ----------- .../quarkus/core/deployment/CamelProcessor.java | 6 -- extensions-core/pom.xml | 1 - .../reactive-executor/deployment/pom.xml | 65 ------------------ .../executor/deployment/BuildProcessor.java | 32 --------- .../reactive/executor/deployment/Feature.java | 29 -------- extensions-core/reactive-executor/pom.xml | 40 ----------- extensions-core/reactive-executor/runtime/pom.xml | 78 ---------------------- .../executor/ReactiveExecutorRecorder.java | 39 ----------- .../main/resources/META-INF/quarkus-extension.yaml | 36 ---------- integration-tests/main/pom.xml | 17 ----- .../camel/quarkus/main/CoreMainResource.java | 6 -- .../apache/camel/quarkus/main/CoreMainTest.java | 5 +- poms/bom/pom.xml | 15 ----- poms/bom/src/main/generated/flattened-full-pom.xml | 19 +----- .../src/main/generated/flattened-reduced-pom.xml | 19 +----- .../generated/flattened-reduced-verbose-pom.xml | 19 +----- .../org/apache/camel/quarkus/maven/CqCatalog.java | 4 -- 21 files changed, 9 insertions(+), 476 deletions(-) diff --git a/catalog/pom.xml b/catalog/pom.xml index ebe62398e4..e2e5daa095 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -3412,19 +3412,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-reactive-streams</artifactId> diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index d7b68b84d6..7eea7a2475 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -280,7 +280,6 @@ *** xref:reference/extensions/qute.adoc[Qute] *** xref:reference/extensions/rest-openapi.adoc[REST OpenApi] *** xref:reference/extensions/rss.adoc[RSS] -*** xref:reference/extensions/reactive-executor.adoc[Reactive Executor] *** xref:reference/extensions/reactive-streams.adoc[Reactive Streams] *** xref:reference/extensions/redis.adoc[Redis] *** xref:reference/extensions/ref.adoc[Ref] diff --git a/docs/modules/ROOT/pages/reference/extensions/mcp-server.adoc b/docs/modules/ROOT/pages/reference/extensions/mcp-server.adoc index 080044d97d..21935ece3e 100644 --- a/docs/modules/ROOT/pages/reference/extensions/mcp-server.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/mcp-server.adoc @@ -7,7 +7,7 @@ :cq-native-supported: true :cq-status: Preview :cq-status-deprecation: Preview -:cq-description: Expose ai-tool routes as MCP tools over streamable HTTP +:cq-description: Expose ai-tool routes as MCP tools and ai-resource routes as MCP resources over streamable HTTP :cq-deprecated: false :cq-jvm-since: 3.39.0 :cq-native-since: 3.39.0 diff --git a/docs/modules/ROOT/pages/reference/extensions/reactive-executor.adoc b/docs/modules/ROOT/pages/reference/extensions/reactive-executor.adoc deleted file mode 100644 index 9986edbb49..0000000000 --- a/docs/modules/ROOT/pages/reference/extensions/reactive-executor.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-reactive-executor"] -= Reactive Executor -:page-aliases: extensions/reactive-executor.adoc -:linkattrs: -:cq-artifact-id: camel-quarkus-reactive-executor -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable -:cq-description: Reactive Executor for camel-core using Vert.x -:cq-deprecated: false -:cq-jvm-since: 0.3.0 -:cq-native-since: 0.3.0 - -ifeval::[{doc-show-badges} == true] -[.badges] -[.badge-key]##JVM since##[.badge-supported]##0.3.0## [.badge-key]##Native since##[.badge-supported]##0.3.0## -endif::[] - -Reactive Executor for camel-core using Vert.x - -[id="extensions-reactive-executor-maven-coordinates"] -== Maven coordinates - -https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-reactive-executor[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor</artifactId> -</dependency> ----- -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/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java index 5e535cfbd8..c92025393a 100644 --- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java +++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java @@ -144,12 +144,6 @@ class CamelProcessor { void coreServiceFilter(BuildProducer<CamelServiceFilterBuildItem> filterBuildItems) { filterBuildItems.produce( new CamelServiceFilterBuildItem(CamelServiceFilter.forService("properties-component-factory"))); - - // The reactive executor is programmatically configured by an extension or - // a default implementation is provided by this processor thus we can safely - // prevent loading of this service. - filterBuildItems.produce( - new CamelServiceFilterBuildItem(CamelServiceFilter.forService("reactive-executor"))); } @BuildStep diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml index ead97e4b0a..ca6a40e061 100644 --- a/extensions-core/pom.xml +++ b/extensions-core/pom.xml @@ -35,7 +35,6 @@ <modules> <module>core</module> <module>http-common</module> - <module>reactive-executor</module> <module>xml-io-dsl</module> <module>xml-jaxb</module> <module>xml-jaxp</module> diff --git a/extensions-core/reactive-executor/deployment/pom.xml b/extensions-core/reactive-executor/deployment/pom.xml deleted file mode 100644 index 2351d996d7..0000000000 --- a/extensions-core/reactive-executor/deployment/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor-parent</artifactId> - <version>3.40.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-reactive-executor-deployment</artifactId> - <name>Camel Quarkus :: Core :: Reactive Executor :: Deployment</name> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-vertx-deployment</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> - -</project> diff --git a/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java b/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java deleted file mode 100644 index 12002969d2..0000000000 --- a/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/BuildProcessor.java +++ /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. - */ -package org.apache.camel.quarkus.reactive.executor.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Record; -import io.quarkus.vertx.deployment.VertxBuildItem; -import org.apache.camel.quarkus.core.deployment.spi.RuntimeCamelContextCustomizerBuildItem; -import org.apache.camel.quarkus.reactive.executor.ReactiveExecutorRecorder; - -public class BuildProcessor { - @Record(value = ExecutionTime.RUNTIME_INIT, optional = true) - @BuildStep - RuntimeCamelContextCustomizerBuildItem reactiveExecutorCustomizer(ReactiveExecutorRecorder recorder, VertxBuildItem vertx) { - return new RuntimeCamelContextCustomizerBuildItem(recorder.createReactiveExecutorCustomizer(vertx.getVertx())); - } -} diff --git a/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/Feature.java b/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/Feature.java deleted file mode 100644 index ae24845dac..0000000000 --- a/extensions-core/reactive-executor/deployment/src/main/java/org/apache/camel/quarkus/reactive/executor/deployment/Feature.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.reactive.executor.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -public class Feature { - private static final String FEATURE = "camel-reactive-executor"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } -} diff --git a/extensions-core/reactive-executor/pom.xml b/extensions-core/reactive-executor/pom.xml deleted file mode 100644 index 8c47a283ad..0000000000 --- a/extensions-core/reactive-executor/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-extensions-core</artifactId> - <version>3.40.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - - <artifactId>camel-quarkus-reactive-executor-parent</artifactId> - <name>Camel Quarkus :: Core :: Reactive Executor</name> - <packaging>pom</packaging> - - <modules> - <module>deployment</module> - <module>runtime</module> - </modules> - -</project> diff --git a/extensions-core/reactive-executor/runtime/pom.xml b/extensions-core/reactive-executor/runtime/pom.xml deleted file mode 100644 index 127460665a..0000000000 --- a/extensions-core/reactive-executor/runtime/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. - ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor-parent</artifactId> - <version>3.40.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>camel-quarkus-reactive-executor</artifactId> - <name>Camel Quarkus :: Core :: Reactive Executor :: Runtime</name> - <description>Reactive Executor for camel-core using Vert.x</description> - - <properties> - <camel.quarkus.jvmSince>0.3.0</camel.quarkus.jvmSince> - <camel.quarkus.nativeSince>0.3.0</camel.quarkus.nativeSince> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - - <!-- camel --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-reactive-executor-vertx</artifactId> - </dependency> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-vertx</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <annotationProcessorPaths> - <path> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-extension-processor</artifactId> - <version>${quarkus.version}</version> - </path> - </annotationProcessorPaths> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/extensions-core/reactive-executor/runtime/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java b/extensions-core/reactive-executor/runtime/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java deleted file mode 100644 index 27a2db77c8..0000000000 --- a/extensions-core/reactive-executor/runtime/src/main/java/org/apache/camel/quarkus/reactive/executor/ReactiveExecutorRecorder.java +++ /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.reactive.executor; - -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.reactive.vertx.VertXReactiveExecutor; -import org.apache.camel.spi.CamelContextCustomizer; - -@Recorder -public class ReactiveExecutorRecorder { - public RuntimeValue<CamelContextCustomizer> createReactiveExecutorCustomizer(RuntimeValue<Vertx> vertx) { - return new RuntimeValue<>(new CamelContextCustomizer() { - @Override - public void configure(CamelContext context) { - VertXReactiveExecutor executor = new VertXReactiveExecutor(); - executor.setVertx(vertx.getValue()); - - context.getCamelContextExtension().setReactiveExecutor(executor); - } - }); - } -} diff --git a/extensions-core/reactive-executor/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/reactive-executor/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index 4080b83138..0000000000 --- a/extensions-core/reactive-executor/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /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. -# - -# 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 Reactive Executor" -description: "Reactive Executor for camel-core using Vert.x" -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/reactive-executor.html"; - categories: - - "integration" - status: "stable" - integrates: - - name: "Camel" - artifact: "org.apache.camel:camel-base" - version: "${camel.version}" \ No newline at end of file diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml index 09ab44dc36..8a601d1135 100644 --- a/integration-tests/main/pom.xml +++ b/integration-tests/main/pom.xml @@ -31,10 +31,6 @@ <description>The camel integration tests</description> <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor</artifactId> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-direct</artifactId> @@ -170,19 +166,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor-deployment</artifactId> - <version>${project.version}</version> - <type>pom</type> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>*</groupId> - <artifactId>*</artifactId> - </exclusion> - </exclusions> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-timer-deployment</artifactId> diff --git a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java index c14c82afc5..832e0d4974 100644 --- a/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java +++ b/integration-tests/main/src/main/java/org/apache/camel/quarkus/main/CoreMainResource.java @@ -46,7 +46,6 @@ import org.apache.camel.model.ModelCamelContext; import org.apache.camel.quarkus.core.CamelRuntime; import org.apache.camel.quarkus.core.FastFactoryFinderResolver; import org.apache.camel.quarkus.it.support.typeconverter.MyPair; -import org.apache.camel.reactive.vertx.VertXReactiveExecutor; import org.apache.camel.spi.BeanRepository; import org.apache.camel.spi.ContextReloadStrategy; import org.apache.camel.spi.DataFormat; @@ -179,11 +178,6 @@ public class CoreMainResource { JsonObjectBuilder builder = Json.createObjectBuilder(); builder.add("class", executor.getClass().getName()); - if (executor instanceof VertXReactiveExecutor) { - builder.add("configured", ((VertXReactiveExecutor) executor).getVertx() != null); - - } - return builder.build(); } diff --git a/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java b/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java index 55dedfd1a0..e570a92a10 100644 --- a/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java +++ b/integration-tests/main/src/test/java/org/apache/camel/quarkus/main/CoreMainTest.java @@ -26,10 +26,10 @@ import io.restassured.path.json.JsonPath; import io.restassured.response.Response; import jakarta.ws.rs.core.MediaType; import org.apache.camel.ServiceStatus; +import org.apache.camel.impl.engine.DefaultReactiveExecutor; import org.apache.camel.quarkus.core.DisabledModelToXMLDumper; import org.apache.camel.quarkus.core.RegistryRoutesLoaders; import org.apache.camel.quarkus.test.DisabledOnQuarkusPlatform; -import org.apache.camel.reactive.vertx.VertXReactiveExecutor; import org.apache.camel.support.DefaultLRUCacheFactory; import org.junit.jupiter.api.Test; @@ -155,8 +155,7 @@ public class CoreMainTest { .body() .jsonPath(); - assertThat(executor.getString("class")).isEqualTo(VertXReactiveExecutor.class.getName()); - assertThat(executor.getBoolean("configured")).isTrue(); + assertThat(executor.getString("class")).isEqualTo(DefaultReactiveExecutor.class.getName()); } @Test diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index a219a177ea..0b35a17531 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2807,11 +2807,6 @@ <artifactId>camel-quickfix</artifactId> <version>${camel.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-reactive-executor-vertx</artifactId> - <version>${camel.version}</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-reactive-streams</artifactId> @@ -6070,16 +6065,6 @@ <artifactId>camel-quarkus-qute-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor-deployment</artifactId> - <version>${camel-quarkus.version}</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-reactive-streams</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b23a4c6c47..38a5db8714 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -2704,11 +2704,6 @@ <artifactId>camel-quickfix</artifactId> <version>4.23.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-reactive-executor-vertx</artifactId> - <version>4.23.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-reactive-streams</artifactId> @@ -5955,16 +5950,6 @@ <artifactId>camel-quarkus-qute-deployment</artifactId> <version>3.40.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor</artifactId> - <version>3.40.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor-deployment</artifactId> - <version>3.40.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-reactive-streams</artifactId> @@ -7574,12 +7559,12 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>4.2.39</version> + <version>4.2.40</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-jmx</artifactId> - <version>4.2.39</version> + <version>4.2.40</version> </dependency> <dependency> <groupId>io.micrometer</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index bf102961f5..55357eaad4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -887,7 +887,7 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>4.2.39</version> + <version>4.2.40</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> @@ -897,7 +897,7 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-jmx</artifactId> - <version>4.2.39</version> + <version>4.2.40</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> @@ -4047,11 +4047,6 @@ <artifactId>camel-quickfix</artifactId> <version>4.23.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-reactive-executor-vertx</artifactId> - <version>4.23.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-reactive-streams</artifactId> @@ -7303,16 +7298,6 @@ <artifactId>camel-quarkus-qute-deployment</artifactId> <version>3.40.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor</artifactId> - <version>3.40.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor-deployment</artifactId> - <version>3.40.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-reactive-streams</artifactId> 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 6f12d4864f..1edc216fad 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -887,7 +887,7 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-core</artifactId> - <version>4.2.39</version> + <version>4.2.40</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> @@ -897,7 +897,7 @@ <dependency> <groupId>io.dropwizard.metrics</groupId> <artifactId>metrics-jmx</artifactId> - <version>4.2.39</version> + <version>4.2.40</version> </dependency> <dependency> <groupId>io.dropwizard.metrics</groupId> @@ -4047,11 +4047,6 @@ <artifactId>camel-quickfix</artifactId> <version>4.23.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-reactive-executor-vertx</artifactId> - <version>4.23.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-reactive-streams</artifactId> @@ -7303,16 +7298,6 @@ <artifactId>camel-quarkus-qute-deployment</artifactId> <version>3.40.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor</artifactId> - <version>3.40.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-reactive-executor-deployment</artifactId> - <version>3.40.0-SNAPSHOT</version> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-reactive-streams</artifactId> diff --git a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java index 0551dcb013..9c425ee82f 100644 --- a/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java +++ b/tooling/maven-plugin/src/main/java/org/apache/camel/quarkus/maven/CqCatalog.java @@ -132,8 +132,6 @@ public class CqCatalog { public static String toCamelComponentArtifactIdBase(String cqArtifactIdBase) { if ("core".equals(cqArtifactIdBase)) { return "base"; - } else if ("reactive-executor".equals(cqArtifactIdBase)) { - return "reactive-executor-vertx"; } else { return cqArtifactIdBase; } @@ -146,8 +144,6 @@ public class CqCatalog { if ("core".equals(cqArtifactIdBase)) { filter = model -> "camel-base".equals(model.getArtifactId()) || "camel-core-languages".equals(model.getArtifactId()); - } else if ("reactive-executor".equals(cqArtifactIdBase)) { - filter = model -> "camel-reactive-executor-vertx".equals(model.getArtifactId()); } else if ("qute".equals(cqArtifactIdBase)) { filter = model -> "camel-quarkus-qute-component".equals(model.getArtifactId()); } else {
![https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"](https://raw.githubusercontent.com/apache/camel-website/main/antora-ui-camel/src/img/logo-d.svg"){kind=link}