From 4382c73a5f87435fea9d407d63d7e1b8f56ffeec Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 11:36:30 +0200 Subject: [PATCH 01/16] Upgrade to minio 8.2.1 in Camel 3.10 breaks Quarkiverse Minio and MinioClientProducer in our test #2503 --- .../quarkus/component/minio/it/MinioClientProducer.java | 7 +++---- .../quarkus/component/minio/it/MinioTestResource.java | 3 +-- pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java b/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java index 2975beb26708..1f7a8324410f 100644 --- a/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java +++ b/integration-tests/minio/src/main/java/org/apache/camel/quarkus/component/minio/it/MinioClientProducer.java @@ -16,9 +16,9 @@ */ package org.apache.camel.quarkus.component.minio.it; -import javax.enterprise.context.ApplicationScoped; import javax.enterprise.inject.Produces; import javax.inject.Named; +import javax.inject.Singleton; import io.minio.MinioClient; import org.eclipse.microprofile.config.ConfigProvider; @@ -26,12 +26,11 @@ public class MinioClientProducer { @Produces - @ApplicationScoped + @Singleton @Named("minioClient") public MinioClient produceMinioClient() { return MinioClient.builder() - .endpoint("http://" + ConfigProvider.getConfig().getValue("minio.server.host", String.class), - ConfigProvider.getConfig().getValue("minio.server.port", Integer.class), false) + .endpoint(ConfigProvider.getConfig().getValue("quarkus.minio.url", String.class)) .credentials(MinioResource.SERVER_ACCESS_KEY, MinioResource.SERVER_SECRET_KEY) .build(); } diff --git a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java index 443169ac5521..e53e6116d1bd 100644 --- a/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java +++ b/integration-tests/minio/src/test/java/org/apache/camel/quarkus/component/minio/it/MinioTestResource.java @@ -49,8 +49,7 @@ public Map start() { String host = minioServer.getHost(); return CollectionHelper.mapOf( - "minio.server.host", host, - "minio.server.port", port); + "quarkus.minio.url", String.format("http://%s:%s", host, port)); } @Override diff --git a/pom.xml b/pom.xml index f5a2ceb728b9..0040b8fd9d43 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 1.0.1 0.2.7 - 0.2.2 + 0.2.3 2.0.0.CR2 0.6.0 1.2.0 @@ -101,7 +101,7 @@ ${kudu-version} 1.4.32 ${netty3-version} - 8.1.0 + ${minio-version} ${mvel-version} 4.41.1 ${squareup-okhttp-version} From d0a5cb2fe98068577985b3802c6885d7b7fd32b8 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 12:15:40 +0200 Subject: [PATCH 02/16] Remove camel-quarkus-xml-io #2436 --- catalog/pom.xml | 13 --- docs/modules/ROOT/nav.adoc | 1 - .../pages/reference/extensions/xml-io.adoc | 30 ----- .../pages/reference/extensions/xml-jaxb.adoc | 4 +- .../core/DisabledModelToXMLDumper.java | 3 +- .../DisabledPredicateValidatorReifier.java | 3 +- .../quarkus/core/DisabledValidateReifier.java | 3 +- .../DisabledXMLRoutesDefinitionLoader.java | 6 +- extensions-core/pom.xml | 1 - extensions-core/xml-io/deployment/pom.xml | 61 ---------- .../xml/io/deployment/XmlIoProcessor.java | 30 ----- extensions-core/xml-io/pom.xml | 37 ------ extensions-core/xml-io/runtime/pom.xml | 108 ------------------ .../resources/META-INF/quarkus-extension.yaml | 33 ------ extensions-core/xml-jaxb/runtime/pom.xml | 2 +- .../resources/META-INF/quarkus-extension.yaml | 2 +- integration-tests/csimple/pom.xml | 4 +- poms/bom/pom.xml | 10 -- 18 files changed, 15 insertions(+), 336 deletions(-) delete mode 100644 docs/modules/ROOT/pages/reference/extensions/xml-io.adoc delete mode 100644 extensions-core/xml-io/deployment/pom.xml delete mode 100644 extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java delete mode 100644 extensions-core/xml-io/pom.xml delete mode 100644 extensions-core/xml-io/runtime/pom.xml delete mode 100644 extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/catalog/pom.xml b/catalog/pom.xml index 2f0f8a5270ad..fb5e2fcf776f 100644 --- a/catalog/pom.xml +++ b/catalog/pom.xml @@ -4264,19 +4264,6 @@ - - org.apache.camel.quarkus - camel-quarkus-xml-io - ${project.version} - pom - test - - - * - * - - - org.apache.camel.quarkus camel-quarkus-xml-io-dsl diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 51018a904a23..971bb6aaaa34 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -316,7 +316,6 @@ *** xref:reference/extensions/workday.adoc[Workday] *** xref:reference/extensions/xchange.adoc[XChange] *** xref:reference/extensions/xj.adoc[XJ] -*** xref:reference/extensions/xml-io.adoc[XML IO] *** xref:reference/extensions/xml-io-dsl.adoc[XML IO DSL] *** xref:reference/extensions/xml-jaxb.adoc[XML JAXB] *** xref:reference/extensions/xml-jaxp.adoc[XML JAXP] diff --git a/docs/modules/ROOT/pages/reference/extensions/xml-io.adoc b/docs/modules/ROOT/pages/reference/extensions/xml-io.adoc deleted file mode 100644 index 2d1625db106c..000000000000 --- a/docs/modules/ROOT/pages/reference/extensions/xml-io.adoc +++ /dev/null @@ -1,30 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -= XML IO -:page-aliases: extensions/xml-io.adoc -:linkattrs: -:cq-artifact-id: camel-quarkus-xml-io -:cq-native-supported: true -:cq-status: Stable -:cq-status-deprecation: Stable -:cq-description: An XML stack for parsing XML route definitions. A fast an light weight alternative to camel-quarkus-xml-jaxp -: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## - -An XML stack for parsing XML route definitions. A fast an light weight alternative to camel-quarkus-xml-jaxp - -== Maven coordinates - -[source,xml] ----- - - org.apache.camel.quarkus - camel-quarkus-xml-io - ----- - -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/xml-jaxb.adoc b/docs/modules/ROOT/pages/reference/extensions/xml-jaxb.adoc index 140310385e36..c5a36e6f68bc 100644 --- a/docs/modules/ROOT/pages/reference/extensions/xml-jaxb.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/xml-jaxb.adoc @@ -7,7 +7,7 @@ :cq-native-supported: true :cq-status: Stable :cq-status-deprecation: Stable -:cq-description: An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io +:cq-description: An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io-dsl :cq-deprecated: false :cq-jvm-since: 1.0.0 :cq-native-since: 1.0.0 @@ -15,7 +15,7 @@ [.badges] [.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## -An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io +An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io-dsl == Maven coordinates 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 faf1aa897720..80c3c946fa21 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 @@ -29,6 +29,7 @@ public String dumpModelAsXml(CamelContext context, NamedNode definition) throws @Override public String dumpModelAsXml(CamelContext context, NamedNode definition, boolean resolvePlaceholders, boolean resolveDelegateEndpoints) throws Exception { - throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io"); + 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/DisabledPredicateValidatorReifier.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java index 8b1471349833..d26c9049dcbe 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledPredicateValidatorReifier.java @@ -30,7 +30,8 @@ public DisabledPredicateValidatorReifier(CamelContext camelContext, ValidatorDef @Override protected Validator doCreateValidator() { - throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io"); + 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/DisabledValidateReifier.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java index a9b8144321d0..9ea629bee2c9 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledValidateReifier.java @@ -30,6 +30,7 @@ public DisabledValidateReifier(Route route, ProcessorDefinition definition) { @Override public Processor createProcessor() throws Exception { - throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io"); + 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/DisabledXMLRoutesDefinitionLoader.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java index ed92c66ff761..155549cc8b18 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledXMLRoutesDefinitionLoader.java @@ -24,16 +24,16 @@ public class DisabledXMLRoutesDefinitionLoader implements XMLRoutesDefinitionLoader { @Override public Object loadRoutesDefinition(CamelContext context, InputStream inputStream) throws Exception { - throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io"); + throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io-dsl"); } @Override public Object loadRouteTemplatesDefinition(CamelContext context, InputStream inputStream) throws Exception { - throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io"); + throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io-dsl"); } @Override public Object loadRestsDefinition(CamelContext context, InputStream inputStream) throws Exception { - throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io"); + throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-xml-io-dsl"); } } diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml index d379bc2e5ecc..f02124b702c5 100644 --- a/extensions-core/pom.xml +++ b/extensions-core/pom.xml @@ -37,7 +37,6 @@ http-common reactive-executor threadpoolfactory-vertx - xml-io xml-io-dsl xml-jaxb xml-jaxp diff --git a/extensions-core/xml-io/deployment/pom.xml b/extensions-core/xml-io/deployment/pom.xml deleted file mode 100644 index d1369bde5738..000000000000 --- a/extensions-core/xml-io/deployment/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-xml-io-parent - 2.0.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-xml-io-deployment - Camel Quarkus :: XML :: XML IO :: Deployment - - - - org.apache.camel.quarkus - camel-quarkus-xml-io-dsl-deployment - - - org.apache.camel.quarkus - camel-quarkus-xml-io - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${quarkus.version} - - - - - - - - diff --git a/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java b/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.java deleted file mode 100644 index 7da290dd2a2a..000000000000 --- a/extensions-core/xml-io/deployment/src/main/java/org/apache/camel/quarkus/component/xml/io/deployment/XmlIoProcessor.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.component.xml.io.deployment; - -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; - -class XmlIoProcessor { - private static final String FEATURE = "camel-xml-io"; - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(FEATURE); - } - -} diff --git a/extensions-core/xml-io/pom.xml b/extensions-core/xml-io/pom.xml deleted file mode 100644 index 2efea8c32ad6..000000000000 --- a/extensions-core/xml-io/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-xml-io-parent - Camel Quarkus :: XML IO - pom - - - deployment - runtime - - diff --git a/extensions-core/xml-io/runtime/pom.xml b/extensions-core/xml-io/runtime/pom.xml deleted file mode 100644 index 0c733c90664e..000000000000 --- a/extensions-core/xml-io/runtime/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 4.0.0 - - org.apache.camel.quarkus - camel-quarkus-xml-io-parent - 2.0.0-SNAPSHOT - ../pom.xml - - - camel-quarkus-xml-io - Camel Quarkus :: XML IO :: Runtime - An XML stack for parsing XML route definitions. A fast an light weight alternative to camel-quarkus-xml-jaxp - - - 1.0.0 - 1.0.0 - true - true - - - - - - org.apache.camel.quarkus - camel-quarkus-bom - ${project.version} - pom - import - - - - - - - org.apache.camel.quarkus - camel-quarkus-xml-io-dsl - - - - - - - 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-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index d9b3f97122e9..000000000000 --- a/extensions-core/xml-io/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /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. -# - -# 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 XML IO" -description: "An XML stack for parsing XML route definitions. A fast an light weight alternative to camel-quarkus-xml-jaxp" -metadata: - unlisted: true - guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/xml-io.html" - categories: - - "integration" - status: - - "stable" - - "deprecated" \ No newline at end of file diff --git a/extensions-core/xml-jaxb/runtime/pom.xml b/extensions-core/xml-jaxb/runtime/pom.xml index a7416e9b0fc6..1837a28fc68c 100644 --- a/extensions-core/xml-jaxb/runtime/pom.xml +++ b/extensions-core/xml-jaxb/runtime/pom.xml @@ -28,7 +28,7 @@ camel-quarkus-xml-jaxb Camel Quarkus :: XML JAXB :: Runtime - An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io + An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io-dsl 1.0.0 diff --git a/extensions-core/xml-jaxb/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-core/xml-jaxb/runtime/src/main/resources/META-INF/quarkus-extension.yaml index 2a9686c549fd..2ce3fee25258 100644 --- a/extensions-core/xml-jaxb/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/extensions-core/xml-jaxb/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -22,7 +22,7 @@ # --- name: "Camel XML JAXB" -description: "An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io" +description: "An XML stack for parsing XML route definitions. A legacy alternative to the fast an light weight camel-quarkus-xml-io-dsl" metadata: guide: "https://camel.apache.org/camel-quarkus/latest/reference/extensions/xml-jaxb.html" categories: diff --git a/integration-tests/csimple/pom.xml b/integration-tests/csimple/pom.xml index 51313f51aa38..ad4c66c1c2d5 100644 --- a/integration-tests/csimple/pom.xml +++ b/integration-tests/csimple/pom.xml @@ -57,7 +57,7 @@ org.apache.camel.quarkus - camel-quarkus-xml-io + camel-quarkus-xml-io-dsl @@ -101,7 +101,7 @@ org.apache.camel.quarkus - camel-quarkus-xml-io-deployment + camel-quarkus-xml-io-dsl-deployment ${project.version} pom test diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 3e82102538a2..a960886e649a 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -5475,16 +5475,6 @@ camel-quarkus-xj-deployment ${camel-quarkus.version} - - org.apache.camel.quarkus - camel-quarkus-xml-io - ${camel-quarkus.version} - - - org.apache.camel.quarkus - camel-quarkus-xml-io-deployment - ${camel-quarkus.version} - org.apache.camel.quarkus camel-quarkus-xml-io-dsl From 4322e5d27b29fc01bc35553d941777e997772505 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 12:19:20 +0200 Subject: [PATCH 03/16] Fixup e780587 Expand Sql test coverage #2623 --- integration-tests/sql/pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/integration-tests/sql/pom.xml b/integration-tests/sql/pom.xml index 0cc9f08ac1a1..c42bd490f66e 100644 --- a/integration-tests/sql/pom.xml +++ b/integration-tests/sql/pom.xml @@ -73,6 +73,32 @@ + + org.apache.camel.quarkus + camel-quarkus-direct-deployment + ${project.version} + pom + test + + + * + * + + + + + org.apache.camel.quarkus + camel-quarkus-jta-deployment + ${project.version} + pom + test + + + * + * + + + org.apache.camel.quarkus camel-quarkus-sql-deployment From 8b5229e62837edb0a7a007a39f60fccebc12e89e Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 12:25:46 +0200 Subject: [PATCH 04/16] Remove -H:+InlineBeforeAnalysis from Spring RabbitMQ test once Quarkus has InlineBeforeAnalysisBuildItem #2416 --- .../deployment/SpringRabbitmqProcessor.java | 6 ++++++ .../src/main/resources/application.properties | 17 ----------------- 2 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 integration-tests/spring-rabbitmq/src/main/resources/application.properties diff --git a/extensions/spring-rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/spring/rabbitmq/deployment/SpringRabbitmqProcessor.java b/extensions/spring-rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/spring/rabbitmq/deployment/SpringRabbitmqProcessor.java index 9f9fb06f0e50..a2925552a682 100644 --- a/extensions/spring-rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/spring/rabbitmq/deployment/SpringRabbitmqProcessor.java +++ b/extensions/spring-rabbitmq/deployment/src/main/java/org/apache/camel/quarkus/component/spring/rabbitmq/deployment/SpringRabbitmqProcessor.java @@ -19,6 +19,7 @@ import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.InlineBeforeAnalysisBuildItem; import io.quarkus.deployment.builditem.nativeimage.NativeImageProxyDefinitionBuildItem; import org.springframework.amqp.rabbit.connection.ChannelProxy; import org.springframework.aop.SpringProxy; @@ -43,4 +44,9 @@ void initProxies(BuildProducer proxies) { DecoratingProxy.class.getCanonicalName())); } + @BuildStep + InlineBeforeAnalysisBuildItem inlineBeforeAnalysis() { + return new InlineBeforeAnalysisBuildItem(); + } + } diff --git a/integration-tests/spring-rabbitmq/src/main/resources/application.properties b/integration-tests/spring-rabbitmq/src/main/resources/application.properties deleted file mode 100644 index 03b5ac275a20..000000000000 --- a/integration-tests/spring-rabbitmq/src/main/resources/application.properties +++ /dev/null @@ -1,17 +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. -## --------------------------------------------------------------------------- -quarkus.native.additional-build-args=-H:+InlineBeforeAnalysis \ No newline at end of file From 20beea15b79129053185c7b2f5d3c1476cced710 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 12:35:10 +0200 Subject: [PATCH 05/16] 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 From 1258a57b97ef0c5bf2e2c40c338ad01046e9aaec Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 12:53:36 +0200 Subject: [PATCH 06/16] Import Debezium BOM #1310, sync Debezium version with Camel --- pom.xml | 2 +- poms/bom/pom.xml | 42 +++++++----------------------------------- 2 files changed, 8 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 0040b8fd9d43..30954aba9356 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 2.6 3.6.1 4.3.0 - 1.4.0.Final + ${debezium-version} 10.15.2.0 ${eddsa-version} 2.3.31 diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index e476be60b496..8eeb623a2a9a 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -89,6 +89,13 @@ pom import + + io.debezium + debezium-bom + ${debezium.version} + pom + import + @@ -5836,41 +5843,6 @@ commons-lang ${commons-lang.version} - - io.debezium - debezium-api - ${debezium.version} - - - io.debezium - debezium-connector-mongodb - ${debezium.version} - - - io.debezium - debezium-connector-mysql - ${debezium.version} - - - io.debezium - debezium-connector-postgres - ${debezium.version} - - - io.debezium - debezium-connector-sqlserver - ${debezium.version} - - - io.debezium - debezium-core - ${debezium.version} - - - io.debezium - debezium-embedded - ${debezium.version} - io.minio minio From 19be09f39073544fc35152e3c6fb92e95eb84654 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 13:55:53 +0200 Subject: [PATCH 07/16] Upgrade to Quarkus 2.0.0.CR3 --- docs/antora.yml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index b2db741840f6..910538962cc7 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -24,4 +24,4 @@ asciidoc: attributes: cq-camel-components: 3.10.x@components # replace ${camel.docs.components.xref} min-maven-version: 3.6.2 # replace ${min-maven-version} - quarkus-version: 2.0.0.CR2 # replace ${quarkus.version} \ No newline at end of file + quarkus-version: 2.0.0.CR3 # replace ${quarkus.version} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 30954aba9356..3e81f84a4bb6 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 1.0.1 0.2.7 0.2.3 - 2.0.0.CR2 + 2.0.0.CR3 0.6.0 1.2.0 0.24.0 @@ -113,7 +113,7 @@ 2.5.0 1.5.3 2.11.12 - 3.3.2 + 3.4.0 ${spring5-version} ${snakeyaml-version} 1.1.7.7 From 4e04a5071d107d1b5c32542c78d9002b695079ab Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 14:01:04 +0200 Subject: [PATCH 08/16] ClassNotFoundException: com.aayushatharva.brotli4j.decoder.DecoderJNI$Wrapper in Google Storage, PubSub and BigQuery test #2692 Fixed by the upgrade to Quarkus 2.0.0.CR3 This reverts commit ff1bf3a191db256a7a3835715a615dd8e5467d5c. --- integration-tests/google-bigquery/pom.xml | 4 ++-- integration-tests/google-pubsub/pom.xml | 4 ++-- integration-tests/google-storage/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/google-bigquery/pom.xml b/integration-tests/google-bigquery/pom.xml index ab12119b8df6..09f8b0ef83e4 100644 --- a/integration-tests/google-bigquery/pom.xml +++ b/integration-tests/google-bigquery/pom.xml @@ -77,10 +77,10 @@ - native-off + native - native-off + native diff --git a/integration-tests/google-pubsub/pom.xml b/integration-tests/google-pubsub/pom.xml index 4968b583c6a2..b0888786db4d 100644 --- a/integration-tests/google-pubsub/pom.xml +++ b/integration-tests/google-pubsub/pom.xml @@ -74,10 +74,10 @@ - native-off + native - native-off + native diff --git a/integration-tests/google-storage/pom.xml b/integration-tests/google-storage/pom.xml index e877063a3f1f..f534a8ce48fe 100644 --- a/integration-tests/google-storage/pom.xml +++ b/integration-tests/google-storage/pom.xml @@ -112,10 +112,10 @@ - native-off + native - native-off + native From 55e17d3483400496bc3c9ddba14b3ea53dc7336b Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 14:19:43 +0200 Subject: [PATCH 09/16] Upgrade to Quarkiverse Google Cloud Services 0.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3e81f84a4bb6..9abc09d23603 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ 0.2.7 0.2.3 2.0.0.CR3 - 0.6.0 + 0.7.0 1.2.0 0.24.0 From 3543f961b65723645ed6f96b6ae0dbe084ef5590 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 15:24:05 +0200 Subject: [PATCH 10/16] Workaround #2724 cassandra-driver-core 3.5.0 managed in Debezium BOM too old for testcontainers 1.15.3 --- pom.xml | 1 + poms/bom-test/pom.xml | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9abc09d23603..89a3f62ac337 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,7 @@ 1.10.2 1.11.714 ${azure-sdk-bom-version} + 3.11.0 ${commons-beanutils-version} 1.4 3.2.2 diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index d7870aa92d2d..ce84a50b6354 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> - + 4.0.0 @@ -221,6 +222,11 @@ aws-java-sdk-core ${aws-java-sdk.version} + + com.datastax.cassandra + cassandra-driver-core + ${cassandra-driver.version} + From 5aee40ef9803009f30b1d3911662b5d617406de4 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 17:07:20 +0200 Subject: [PATCH 11/16] Disable Kafka SASL tests for now #2729 --- .../org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslIT.java | 2 ++ .../org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java | 2 ++ .../java/org/apache/camel/quarkus/kafka/ssl/KafkaSslIT.java | 2 ++ .../java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslIT.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslIT.java index 113d16c00603..29dddaa0095d 100644 --- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslIT.java +++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslIT.java @@ -17,7 +17,9 @@ package org.apache.camel.quarkus.kafka.sasl; import io.quarkus.test.junit.NativeImageTest; +import org.junit.jupiter.api.Disabled; +@Disabled("https://github.com/apache/camel-quarkus/issues/2729") @NativeImageTest public class KafkaSaslSslIT extends KafkaSaslSslTest { } diff --git a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java index 947a7ee94933..8ab3c4bb9e72 100644 --- a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java +++ b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTest.java @@ -22,10 +22,12 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +@Disabled("https://github.com/apache/camel-quarkus/issues/2729") @QuarkusTest @QuarkusTestResource(KafkaSaslSslTestResource.class) public class KafkaSaslSslTest { diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslIT.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslIT.java index 839cf6d847d6..f8c539c7dd9d 100644 --- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslIT.java +++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslIT.java @@ -17,7 +17,9 @@ package org.apache.camel.quarkus.kafka.ssl; import io.quarkus.test.junit.NativeImageTest; +import org.junit.jupiter.api.Disabled; +@Disabled("https://github.com/apache/camel-quarkus/issues/2729") @NativeImageTest public class KafkaSslIT extends KafkaSslTest { } diff --git a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java index 6e555e922caf..1a316ed5a5f8 100644 --- a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java +++ b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTest.java @@ -22,10 +22,12 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.path.json.JsonPath; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; +@Disabled("https://github.com/apache/camel-quarkus/issues/2729") @QuarkusTest @QuarkusTestResource(KafkaSslTestResource.class) public class KafkaSslTest { From 592446470dbf4d56b65a58faa51143426bfb8f11 Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 19:15:01 +0200 Subject: [PATCH 12/16] Upgrade to Quarkiverse Freemarker 0.3.0.CR1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 89a3f62ac337..20dd43dce9a8 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ camel-${camel.major.minor}.x 1.0.1 - 0.2.7 + 0.3.0.CR1 0.2.3 2.0.0.CR3 0.7.0 From 2fc6b8d9b6eb6ee443b9441465bb8bf677cbb77c Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Fri, 4 Jun 2021 23:49:20 +0200 Subject: [PATCH 13/16] Fixup 8ce5068 Intermittent failures in MongoDbTest.testTailingConsumer() #2658 --- .../component/mongodb/it/MongoDbResource.java | 12 ++++++------ .../component/mongodb/it/MongoDbRoute.java | 15 +++++++++------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java b/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java index cf01d65fc7fa..e3d274eb5518 100644 --- a/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java +++ b/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbResource.java @@ -184,14 +184,14 @@ public String restartRoute(@PathParam("routeId") String routeId, @PathParam("ope @Path("/resultsReset/{resultId}") @Produces(MediaType.APPLICATION_JSON) public Map getResultsAndReset(@PathParam("resultId") String resultId) { - synchronized (results) { - int size = results.get(resultId).size(); + final List list = results.get(resultId); + synchronized (list) { + int size = list.size(); Document last = null; - if (!results.get(resultId).isEmpty()) { - last = results.get(resultId).get(size - 1); - results.get(resultId).clear(); + if (!list.isEmpty()) { + last = list.get(size - 1); + list.clear(); } - return CollectionHelper.mapOf("size", size, "last", last); } } diff --git a/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java b/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java index 50d27cc0951e..d0746d3bf174 100644 --- a/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java +++ b/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java @@ -45,8 +45,9 @@ public void configure() { from(String.format("mongodb:%s?database=test&collection=%s&tailTrackIncreasingField=increasing", MongoDbResource.DEFAULT_MONGO_CLIENT_NAME, COLLECTION_TAILING)) .process(e -> { - synchronized (results) { - results.get(COLLECTION_TAILING).add(e.getMessage().getBody(Document.class)); + final List list = results.get(COLLECTION_TAILING); + synchronized (list) { + list.add(e.getMessage().getBody(Document.class)); } }); @@ -55,8 +56,9 @@ public void configure() { MongoDbResource.DEFAULT_MONGO_CLIENT_NAME, COLLECTION_PERSISTENT_TAILING)) .id(COLLECTION_PERSISTENT_TAILING) .process(e -> { - synchronized (results) { - results.get(COLLECTION_PERSISTENT_TAILING).add(e.getMessage().getBody(Document.class)); + final List list = results.get(COLLECTION_PERSISTENT_TAILING); + synchronized (list) { + list.add(e.getMessage().getBody(Document.class)); } }); @@ -64,8 +66,9 @@ public void configure() { MongoDbResource.DEFAULT_MONGO_CLIENT_NAME, COLLECTION_STREAM_CHANGES)) .routeProperty("streamFilter", "{'$match':{'$or':[{'fullDocument.string': 'value2'}]}}") .process(e -> { - synchronized (results) { - results.get(COLLECTION_STREAM_CHANGES).add(e.getMessage().getBody(Document.class)); + final List list = results.get(COLLECTION_STREAM_CHANGES); + synchronized (list) { + list.add(e.getMessage().getBody(Document.class)); } }); } From 277b94c7d9e5b4f2461440ff8729b0c11f9d5a4f Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Sun, 6 Jun 2021 22:09:03 +0200 Subject: [PATCH 14/16] Increase timeout in FTPS tests --- .../org/apache/camel/quarkus/component/ftp/it/FtpResource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/ftp/it/FtpResource.java b/integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/ftp/it/FtpResource.java index 0e87e4f0d2f4..c2e11ef5e372 100644 --- a/integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/ftp/it/FtpResource.java +++ b/integration-tests/ftp/src/main/java/org/apache/camel/quarkus/component/ftp/it/FtpResource.java @@ -39,7 +39,7 @@ @ApplicationScoped public class FtpResource { - private static final long TIMEOUT_MS = 1000; + private static final long TIMEOUT_MS = 10000; @Inject ProducerTemplate producerTemplate; From c7dc2c36ee96345b01cd82a33965b34ff0fad44b Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Sun, 6 Jun 2021 22:24:14 +0200 Subject: [PATCH 15/16] Fail at end of the build if any of the tests fails --- .github/workflows/ci-build.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index 25c612cfc1dc..7339176de962 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -181,6 +181,7 @@ jobs: eval ./mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} clean verify \ -Dformatter.skip -Dimpsort.skip -Denforcer.skip \ -Pnative,docker,ci \ + --fail-at-end \ -pl "${NATIVE_MODULES[*]}" fi - name: Fail if there are uncommitted changes @@ -289,6 +290,7 @@ jobs: cd extensions-jvm ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \ -Dformatter.skip -Dimpsort.skip -Denforcer.skip \ + --fail-at-end \ clean test integration-tests-alternative-jvm: @@ -339,6 +341,7 @@ jobs: cd integration-tests ../mvnw ${MAVEN_ARGS} ${BRANCH_OPTIONS} \ -Dformatter.skip -Dimpsort.skip -Denforcer.skip \ + --fail-at-end \ clean verify examples-tests: From 2750baff69e9b97f0c2461b4512f031247a3f8da Mon Sep 17 00:00:00 2001 From: Peter Palaga Date: Mon, 7 Jun 2021 11:41:10 +0200 Subject: [PATCH 16/16] Temporarily disable MongoDbTest.testTailingConsumer() and MongoDbTest.testPersistentTailingConsumer() #2658 --- .../camel/quarkus/component/mongodb/it/MongoDbRoute.java | 6 +++--- .../camel/quarkus/component/mongodb/it/MongoDbTest.java | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java b/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java index d0746d3bf174..01970bde8249 100644 --- a/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java +++ b/integration-tests/mongodb/src/main/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbRoute.java @@ -32,9 +32,9 @@ @ApplicationScoped public class MongoDbRoute extends RouteBuilder { - public static String COLLECTION_TAILING = "tailingCollection"; - public static String COLLECTION_PERSISTENT_TAILING = "persistentTailingCollection"; - public static String COLLECTION_STREAM_CHANGES = "streamChangesCollection"; + public static final String COLLECTION_TAILING = "tailingCollection"; + public static final String COLLECTION_PERSISTENT_TAILING = "persistentTailingCollection"; + public static final String COLLECTION_STREAM_CHANGES = "streamChangesCollection"; @Inject @Named("results") diff --git a/integration-tests/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java b/integration-tests/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java index 601f3383bd31..612ef4974b82 100644 --- a/integration-tests/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java +++ b/integration-tests/mongodb/src/test/java/org/apache/camel/quarkus/component/mongodb/it/MongoDbTest.java @@ -36,6 +36,7 @@ import org.eclipse.microprofile.config.ConfigProvider; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -142,6 +143,7 @@ public void testDynamicOperation() { } + @Disabled("https://github.com/apache/camel-quarkus/issues/2658") @Test public void testTailingConsumer() throws Exception { MongoCollection collection = db.getCollection(COLLECTION_TAILING, Document.class); @@ -156,6 +158,7 @@ public void testTailingConsumer() throws Exception { } } + @Disabled("https://github.com/apache/camel-quarkus/issues/2658") @Test public void testPersistentTailingConsumer() throws Exception { MongoCollection collection = db.getCollection(COLLECTION_PERSISTENT_TAILING, Document.class);