From 20beea15b79129053185c7b2f5d3c1476cced710 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 12:35:10 +0200 Subject: [PATCH] Remove camel-quarkus-componentdsl and camel-quarkus-endpointdsl extensions #2354 --- catalog/pom.xml | 26 ---- docs/modules/ROOT/nav.adoc | 2 - .../reference/extensions/componentdsl.adoc | 34 ------ .../reference/extensions/endpointdsl.adoc | 34 ------ extensions/componentdsl/deployment/pom.xml | 61 ---------- .../deployment/ComponentDSLProcessor.java | 35 ------ extensions/componentdsl/pom.xml | 37 ------ extensions/componentdsl/runtime/pom.xml | 111 ------------------ .../resources/META-INF/quarkus-extension.yaml | 32 ----- extensions/endpointdsl/deployment/pom.xml | 61 ---------- .../deployment/EndpointDSLProcessor.java | 34 ------ extensions/endpointdsl/pom.xml | 37 ------ extensions/endpointdsl/runtime/pom.xml | 111 ------------------ .../resources/META-INF/quarkus-extension.yaml | 32 ----- extensions/pom.xml | 2 - integration-tests/http/pom.xml | 17 --- integration-tests/main/pom.xml | 34 ------ poms/bom/pom.xml | 20 ---- 18 files changed, 720 deletions(-) delete mode 100644 docs/modules/ROOT/pages/reference/extensions/componentdsl.adoc delete mode 100644 docs/modules/ROOT/pages/reference/extensions/endpointdsl.adoc delete mode 100644 extensions/componentdsl/deployment/pom.xml delete mode 100644 extensions/componentdsl/deployment/src/main/java/org/apache/camel/quarkus/componentdsl/deployment/ComponentDSLProcessor.java delete mode 100644 extensions/componentdsl/pom.xml delete mode 100644 extensions/componentdsl/runtime/pom.xml delete mode 100644 extensions/componentdsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/endpointdsl/deployment/pom.xml delete mode 100644 extensions/endpointdsl/deployment/src/main/java/org/apache/camel/quarkus/endpointdsl/deployment/EndpointDSLProcessor.java delete mode 100644 extensions/endpointdsl/pom.xml delete mode 100644 extensions/endpointdsl/runtime/pom.xml delete mode 100644 extensions/endpointdsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/catalog/pom.xml b/catalog/pom.xml index fb5e2fcf776f..73e4b1750bae 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -884,19 +884,6 @@ - - org.apache.camel.quarkus - camel-quarkus-componentdsl - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-consul @@ -1248,19 +1235,6 @@ - - org.apache.camel.quarkus - camel-quarkus-endpointdsl - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-etcd diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 971bb6aaaa34..80e517daf033 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -87,7 +87,6 @@ *** xref:reference/extensions/core-cloud.adoc[Cloud] *** xref:reference/extensions/coap.adoc[CoAP] *** xref:reference/extensions/cometd.adoc[CometD] -*** xref:reference/extensions/componentdsl.adoc[Component DSL] *** xref:reference/extensions/consul.adoc[Consul] *** xref:reference/extensions/controlbus.adoc[Control Bus] *** xref:reference/extensions/corda.adoc[Corda] @@ -112,7 +111,6 @@ *** xref:reference/extensions/ehcache.adoc[Ehcache] *** xref:reference/extensions/elsql.adoc[ElSQL] *** xref:reference/extensions/elasticsearch-rest.adoc[Elasticsearch Rest] -*** xref:reference/extensions/endpointdsl.adoc[Endpoint DSL] *** xref:reference/extensions/etcd.adoc[Etcd Keys] *** xref:reference/extensions/etcd3.adoc[Etcd3] *** xref:reference/extensions/exec.adoc[Exec] diff --git a/docs/modules/ROOT/pages/reference/extensions/componentdsl.adoc b/docs/modules/ROOT/pages/reference/extensions/componentdsl.adoc deleted file mode 100644 index 469268f4cd2b..000000000000 --- a/docs/modules/ROOT/pages/reference/extensions/componentdsl.adoc +++ /dev/null @@ -1,34 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -= Component DSL -:page-aliases: extensions/componentdsl.adoc -:linkattrs: -:cq-artifact-id: camel-quarkus-componentdsl -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable -:cq-description: Create Camel components with a fluent Java DSL -:cq-deprecated: false -:cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 - -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## - -Create Camel components with a fluent Java DSL - -== Maven coordinates - -https://code.quarkus.io/?extension-search=camel-quarkus-componentdsl[Create a new project with this extension on code.quarkus.io, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- - - org.apache.camel.quarkus - camel-quarkus-componentdsl - ----- - -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. diff --git a/docs/modules/ROOT/pages/reference/extensions/endpointdsl.adoc b/docs/modules/ROOT/pages/reference/extensions/endpointdsl.adoc deleted file mode 100644 index 97cad080978c..000000000000 --- a/docs/modules/ROOT/pages/reference/extensions/endpointdsl.adoc +++ /dev/null @@ -1,34 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -= Endpoint DSL -:page-aliases: extensions/endpointdsl.adoc -:linkattrs: -:cq-artifact-id: camel-quarkus-endpointdsl -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable -:cq-description: Code Camel endpoint URI using Java DSL instead of plain strings -:cq-deprecated: false -:cq-jvm-since: 1.0.0 -:cq-native-since: 1.0.0 - -[.badges] -[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## - -Code Camel endpoint URI using Java DSL instead of plain strings - -== Maven coordinates - -https://code.quarkus.io/?extension-search=camel-quarkus-endpointdsl[Create a new project with this extension on code.quarkus.io, window="_blank"] - -Or add the coordinates to your existing project: - -[source,xml] ----- - - org.apache.camel.quarkus - camel-quarkus-endpointdsl - ----- - -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. diff --git a/extensions/componentdsl/deployment/pom.xml b/extensions/componentdsl/deployment/pom.xml deleted file mode 100644 index f99b3da41450..000000000000 --- a/extensions/componentdsl/deployment/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-componentdsl-parent - 2.0.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-componentdsl-deployment - Camel Quarkus :: Component DSL :: Deployment - - - - org.apache.camel.quarkus - camel-quarkus-core-deployment - - - org.apache.camel.quarkus - camel-quarkus-componentdsl - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - diff --git a/extensions/componentdsl/deployment/src/main/java/org/apache/camel/quarkus/componentdsl/deployment/ComponentDSLProcessor.java b/extensions/componentdsl/deployment/src/main/java/org/apache/camel/quarkus/componentdsl/deployment/ComponentDSLProcessor.java deleted file mode 100644 index b3fab9f3aa09..000000000000 --- a/extensions/componentdsl/deployment/src/main/java/org/apache/camel/quarkus/componentdsl/deployment/ComponentDSLProcessor.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.componentdsl.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import org.jboss.logging.Logger; - -class ComponentDSLProcessor { - private static final Logger LOG = Logger.getLogger(ComponentDSLProcessor.class); - - private static final String FEATURE = "camel-componentdsl"; - - @BuildStep - FeatureBuildItem feature() { - // see https://github.com/apache/camel-quarkus/issues/2354 - LOG.warnf( - "camel-quarkus-componentdsl is deprecated and will be removed in the future; use camel-quarkus-core instead"); - return new FeatureBuildItem(FEATURE); - } -} diff --git a/extensions/componentdsl/pom.xml b/extensions/componentdsl/pom.xml deleted file mode 100644 index 5e625e78a6c5..000000000000 --- a/extensions/componentdsl/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent - 2.0.0-SNAPSHOT - ../../poms/build-parent/pom.xml - - - camel-quarkus-componentdsl-parent - Camel Quarkus :: Component DSL - pom - - - deployment - runtime - - diff --git a/extensions/componentdsl/runtime/pom.xml b/extensions/componentdsl/runtime/pom.xml deleted file mode 100644 index cadf344d7613..000000000000 --- a/extensions/componentdsl/runtime/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-componentdsl-parent - 2.0.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-componentdsl - Camel Quarkus :: Component DSL :: Runtime - Create Camel components with a fluent Java DSL - - - 1.0.0 - 1.0.0 - true - - - - - - org.apache.camel.quarkus - camel-quarkus-bom - ${project.version} - pom - import - - - - - - - org.apache.camel.quarkus - camel-quarkus-core - - - org.apache.camel - camel-componentdsl - - - - - - - io.quarkus - quarkus-bootstrap-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - - - full - - - !quickly - - - - - - org.apache.camel.quarkus - camel-quarkus-maven-plugin - - - update-extension-doc-page - - update-extension-doc-page - - process-classes - - - - - - - - diff --git a/extensions/componentdsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/componentdsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index b968b502a116..000000000000 --- a/extensions/componentdsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /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. -# - -# 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 Component DSL" -description: "Create Camel components with a fluent Java DSL" -metadata: - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/componentdsl.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/endpointdsl/deployment/pom.xml b/extensions/endpointdsl/deployment/pom.xml deleted file mode 100644 index 59e41df2b2ae..000000000000 --- a/extensions/endpointdsl/deployment/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-endpointdsl-parent - 2.0.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-endpointdsl-deployment - Camel Quarkus :: Endpoint DSL :: Deployment - - - - org.apache.camel.quarkus - camel-quarkus-core-deployment - - - org.apache.camel.quarkus - camel-quarkus-endpointdsl - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - diff --git a/extensions/endpointdsl/deployment/src/main/java/org/apache/camel/quarkus/endpointdsl/deployment/EndpointDSLProcessor.java b/extensions/endpointdsl/deployment/src/main/java/org/apache/camel/quarkus/endpointdsl/deployment/EndpointDSLProcessor.java deleted file mode 100644 index 499dd6c68cbe..000000000000 --- a/extensions/endpointdsl/deployment/src/main/java/org/apache/camel/quarkus/endpointdsl/deployment/EndpointDSLProcessor.java +++ /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. - */ -package org.apache.camel.quarkus.endpointdsl.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import org.jboss.logging.Logger; - -class EndpointDSLProcessor { - private static final Logger LOG = Logger.getLogger(EndpointDSLProcessor.class); - private static final String FEATURE = "camel-endpointdsl"; - - @BuildStep - FeatureBuildItem feature() { - // see https://github.com/apache/camel-quarkus/issues/2354 - LOG.warnf( - "camel-quarkus-endpointdsl is deprecated and will be removed in the future; use camel-quarkus-core instead"); - return new FeatureBuildItem(FEATURE); - } -} diff --git a/extensions/endpointdsl/pom.xml b/extensions/endpointdsl/pom.xml deleted file mode 100644 index 0db6425af1fd..000000000000 --- a/extensions/endpointdsl/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-build-parent - 2.0.0-SNAPSHOT - ../../poms/build-parent/pom.xml - - - camel-quarkus-endpointdsl-parent - Camel Quarkus :: Endpoint DSL - pom - - - deployment - runtime - - diff --git a/extensions/endpointdsl/runtime/pom.xml b/extensions/endpointdsl/runtime/pom.xml deleted file mode 100644 index 544208cca555..000000000000 --- a/extensions/endpointdsl/runtime/pom.xml +++ /dev/null @@ -1,111 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-endpointdsl-parent - 2.0.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-endpointdsl - Camel Quarkus :: Endpoint DSL :: Runtime - Code Camel endpoint URI using Java DSL instead of plain strings - - - 1.0.0 - 1.0.0 - true - - - - - - org.apache.camel.quarkus - camel-quarkus-bom - ${project.version} - pom - import - - - - - - - org.apache.camel.quarkus - camel-quarkus-core - - - org.apache.camel - camel-endpointdsl - - - - - - - io.quarkus - quarkus-bootstrap-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - - - full - - - !quickly - - - - - - org.apache.camel.quarkus - camel-quarkus-maven-plugin - - - update-extension-doc-page - - update-extension-doc-page - - process-classes - - - - - - - - diff --git a/extensions/endpointdsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/endpointdsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index 907f0be3a654..000000000000 --- a/extensions/endpointdsl/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /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. -# - -# 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 Endpoint DSL" -description: "Code Camel endpoint URI using Java DSL instead of plain strings" -metadata: - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/endpointdsl.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions/pom.xml b/extensions/pom.xml index 858ea1c2458c..e26234fc6585 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -76,7 +76,6 @@ caffeine cassandraql cbor - componentdsl consul controlbus couchdb @@ -95,7 +94,6 @@ dozer dropbox elasticsearch-rest - endpointdsl exec fhir file diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml index 0795e88c91c6..762a8c8d91b4 100644 --- a/integration-tests/http/pom.xml +++ b/integration-tests/http/pom.xml @@ -46,10 +46,6 @@ org.apache.camel.quarkus camel-quarkus-direct - - org.apache.camel.quarkus - camel-quarkus-endpointdsl - org.apache.camel.quarkus camel-quarkus-netty-http @@ -130,19 +126,6 @@ - - org.apache.camel.quarkus - camel-quarkus-endpointdsl-deployment - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-http-deployment diff --git a/integration-tests/main/pom.xml b/integration-tests/main/pom.xml index fb9e0b92e163..628d69a42b1d 100644 --- a/integration-tests/main/pom.xml +++ b/integration-tests/main/pom.xml @@ -30,14 +30,6 @@ The camel integration tests - - org.apache.camel.quarkus - camel-quarkus-endpointdsl - - - org.apache.camel.quarkus - camel-quarkus-componentdsl - org.apache.camel.quarkus camel-quarkus-reactive-executor @@ -103,19 +95,6 @@ - - org.apache.camel.quarkus - camel-quarkus-componentdsl-deployment - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-direct-deployment @@ -129,19 +108,6 @@ - - org.apache.camel.quarkus - camel-quarkus-endpointdsl-deployment - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-log-deployment diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index a960886e649a..e476be60b496 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -2865,16 +2865,6 @@ camel-quarkus-cometd-deployment ${camel-quarkus.version} - - org.apache.camel.quarkus - camel-quarkus-componentdsl - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-componentdsl-deployment - ${camel-quarkus.version} - org.apache.camel.quarkus camel-quarkus-consul @@ -3145,16 +3135,6 @@ camel-quarkus-elsql-deployment ${camel-quarkus.version} - - org.apache.camel.quarkus - camel-quarkus-endpointdsl - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-endpointdsl-deployment - ${camel-quarkus.version} - org.apache.camel.quarkus camel-quarkus-etcd