This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4a0376aa3ae2fcd77a4c63576de7069cec8a6879 Author: James Netherton <[email protected]> AuthorDate: Thu May 26 10:21:09 2022 +0100 Add extension camel-quarkus-support-google-cloud --- .../google-cloud}/deployment/pom.xml | 17 ++++----- .../google-cloud}/pom.xml | 44 ++++++---------------- .../google-cloud/runtime}/pom.xml | 34 +++++++++-------- .../DefaultHttpTransportFactorySubstitutions.java | 34 +++++++++++++++++ .../main/resources/META-INF/quarkus-extension.yaml | 28 ++++++++++++++ extensions-support/pom.xml | 1 + extensions/google-bigquery/deployment/pom.xml | 4 ++ extensions/google-bigquery/runtime/pom.xml | 4 ++ extensions/google-pubsub/deployment/pom.xml | 4 ++ extensions/google-pubsub/runtime/pom.xml | 4 ++ extensions/google-storage/deployment/pom.xml | 4 ++ extensions/google-storage/runtime/pom.xml | 4 ++ poms/bom/pom.xml | 10 +++++ poms/bom/src/main/generated/flattened-full-pom.xml | 10 +++++ .../src/main/generated/flattened-reduced-pom.xml | 10 +++++ .../generated/flattened-reduced-verbose-pom.xml | 10 +++++ 16 files changed, 163 insertions(+), 59 deletions(-) diff --git a/extensions/google-storage/deployment/pom.xml b/extensions-support/google-cloud/deployment/pom.xml similarity index 80% copy from extensions/google-storage/deployment/pom.xml copy to extensions-support/google-cloud/deployment/pom.xml index 7dacea4bb2..befc1b2562 100644 --- a/extensions/google-storage/deployment/pom.xml +++ b/extensions-support/google-cloud/deployment/pom.xml @@ -18,32 +18,30 @@ --> <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-google-storage-parent</artifactId> + <artifactId>camel-quarkus-support-google-cloud-parent</artifactId> <version>2.10.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-google-storage-deployment</artifactId> - <name>Camel Quarkus :: Google Storage :: Deployment</name> + <artifactId>camel-quarkus-support-google-cloud-deployment</artifactId> + <name>Camel Quarkus :: Support :: Google Cloud :: Deployment</name> <dependencies> <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-core-deployment</artifactId> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-google-storage</artifactId> + <artifactId>camel-quarkus-support-google-cloud</artifactId> </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <annotationProcessorPaths> @@ -57,5 +55,4 @@ </plugin> </plugins> </build> - </project> diff --git a/extensions/google-storage/deployment/pom.xml b/extensions-support/google-cloud/pom.xml similarity index 51% copy from extensions/google-storage/deployment/pom.xml copy to extensions-support/google-cloud/pom.xml index 7dacea4bb2..b85c90940a 100644 --- a/extensions/google-storage/deployment/pom.xml +++ b/extensions-support/google-cloud/pom.xml @@ -18,44 +18,22 @@ --> <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-google-storage-parent</artifactId> + <artifactId>camel-quarkus-extensions-support</artifactId> <version>2.10.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>camel-quarkus-google-storage-deployment</artifactId> - <name>Camel Quarkus :: Google Storage :: 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-google-storage</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> + <modelVersion>4.0.0</modelVersion> + + <artifactId>camel-quarkus-support-google-cloud-parent</artifactId> + <name>Camel Quarkus :: Support :: Google Cloud</name> + <packaging>pom</packaging> + <modules> + <module>deployment</module> + <module>runtime</module> + </modules> </project> diff --git a/extensions/google-pubsub/deployment/pom.xml b/extensions-support/google-cloud/runtime/pom.xml similarity index 73% copy from extensions/google-pubsub/deployment/pom.xml copy to extensions-support/google-cloud/runtime/pom.xml index d8c01e42f5..2400cba445 100644 --- a/extensions/google-pubsub/deployment/pom.xml +++ b/extensions-support/google-cloud/runtime/pom.xml @@ -18,46 +18,49 @@ --> <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-google-pubsub-parent</artifactId> + <artifactId>camel-quarkus-support-google-cloud-parent</artifactId> <version>2.10.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-google-pubsub-deployment</artifactId> - <name>Camel Quarkus :: Google Pubsub :: Deployment</name> + <artifactId>camel-quarkus-support-google-cloud</artifactId> + <name>Camel Quarkus :: Support :: Google Cloud :: Runtime</name> <dependencies> <dependency> <groupId>io.quarkus</groupId> - <artifactId>quarkus-jackson-deployment</artifactId> + <artifactId>quarkus-core</artifactId> </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-grpc-common-deployment</artifactId> + <groupId>com.google.http-client</groupId> + <artifactId>google-http-client</artifactId> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-google-pubsub</artifactId> + <groupId>org.graalvm.nativeimage</groupId> + <artifactId>svm</artifactId> + <scope>provided</scope> </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-bootstrap-maven-plugin</artifactId> + </plugin> + <plugin> <artifactId>maven-compiler-plugin</artifactId> <configuration> <annotationProcessorPaths> @@ -71,5 +74,4 @@ </plugin> </plugins> </build> - </project> diff --git a/extensions-support/google-cloud/runtime/src/main/java/org/apache/camel/quarkus/support/google/cloud/graal/DefaultHttpTransportFactorySubstitutions.java b/extensions-support/google-cloud/runtime/src/main/java/org/apache/camel/quarkus/support/google/cloud/graal/DefaultHttpTransportFactorySubstitutions.java new file mode 100644 index 0000000000..6ec6e59366 --- /dev/null +++ b/extensions-support/google-cloud/runtime/src/main/java/org/apache/camel/quarkus/support/google/cloud/graal/DefaultHttpTransportFactorySubstitutions.java @@ -0,0 +1,34 @@ +package org.apache.camel.quarkus.support.google.cloud.graal; + +import java.util.function.BooleanSupplier; + +import com.google.api.client.http.HttpTransport; +import com.google.api.client.http.javanet.NetHttpTransport; +import com.oracle.svm.core.annotate.Substitute; +import com.oracle.svm.core.annotate.TargetClass; + +import static org.apache.camel.quarkus.support.google.cloud.graal.DefaultHttpTransportFactorySubstitutions.DefaultHttpTransportFactoryPresent; + +@TargetClass(className = "com.google.cloud.http.HttpTransportOptions$DefaultHttpTransportFactory", onlyWith = DefaultHttpTransportFactoryPresent.class) +public final class DefaultHttpTransportFactorySubstitutions { + + @Substitute + public HttpTransport create() { + // Suppress creation of UrlFetchTransport for GAE which is not supported in native mode + return new NetHttpTransport(); + } + + static final class DefaultHttpTransportFactoryPresent implements BooleanSupplier { + + @Override + public boolean getAsBoolean() { + try { + Thread.currentThread().getContextClassLoader() + .loadClass("com.google.cloud.http.HttpTransportOptions$DefaultHttpTransportFactory"); + return true; + } catch (ClassNotFoundException e) { + return false; + } + } + } +} diff --git a/extensions-support/google-cloud/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions-support/google-cloud/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 0000000000..003b62577a --- /dev/null +++ b/extensions-support/google-cloud/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,28 @@ +# +# 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. +# + +--- +name: "Camel Quarkus Support Google Cloud" +description: "Camel Quarkus Support Google Cloud" +metadata: + unlisted: true + keywords: + - "camel" + - "Google Cloud" + guide: "https://quarkus.io/guides/camel" + categories: + - "integration" \ No newline at end of file diff --git a/extensions-support/pom.xml b/extensions-support/pom.xml index cff8902f2b..38fd2ddaaa 100644 --- a/extensions-support/pom.xml +++ b/extensions-support/pom.xml @@ -43,6 +43,7 @@ <module>commons-logging</module> <module>consul-client</module> <module>debezium</module> + <module>google-cloud</module> <module>google-http-client</module> <module>httpclient</module> <module>jackson-dataformat-xml</module> diff --git a/extensions/google-bigquery/deployment/pom.xml b/extensions/google-bigquery/deployment/pom.xml index 94304109ad..3e86cd3430 100644 --- a/extensions/google-bigquery/deployment/pom.xml +++ b/extensions/google-bigquery/deployment/pom.xml @@ -34,6 +34,10 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud-deployment</artifactId> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-google-bigquery</artifactId> diff --git a/extensions/google-bigquery/runtime/pom.xml b/extensions/google-bigquery/runtime/pom.xml index 9a0fd3c129..da36b21b7c 100644 --- a/extensions/google-bigquery/runtime/pom.xml +++ b/extensions/google-bigquery/runtime/pom.xml @@ -44,6 +44,10 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud</artifactId> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-bigquery</artifactId> diff --git a/extensions/google-pubsub/deployment/pom.xml b/extensions/google-pubsub/deployment/pom.xml index d8c01e42f5..e0a597c24b 100644 --- a/extensions/google-pubsub/deployment/pom.xml +++ b/extensions/google-pubsub/deployment/pom.xml @@ -48,6 +48,10 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud-deployment</artifactId> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-google-pubsub</artifactId> diff --git a/extensions/google-pubsub/runtime/pom.xml b/extensions/google-pubsub/runtime/pom.xml index f78d905320..fb41791f44 100644 --- a/extensions/google-pubsub/runtime/pom.xml +++ b/extensions/google-pubsub/runtime/pom.xml @@ -73,6 +73,10 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud</artifactId> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-pubsub</artifactId> diff --git a/extensions/google-storage/deployment/pom.xml b/extensions/google-storage/deployment/pom.xml index 7dacea4bb2..90dc54a9e3 100644 --- a/extensions/google-storage/deployment/pom.xml +++ b/extensions/google-storage/deployment/pom.xml @@ -34,6 +34,10 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud-deployment</artifactId> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-google-storage</artifactId> diff --git a/extensions/google-storage/runtime/pom.xml b/extensions/google-storage/runtime/pom.xml index acf30dbbe3..5c5e41a50b 100644 --- a/extensions/google-storage/runtime/pom.xml +++ b/extensions/google-storage/runtime/pom.xml @@ -44,6 +44,10 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud</artifactId> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-google-storage</artifactId> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 43e9860ddb..53ca873cac 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -8640,6 +8640,16 @@ <artifactId>camel-quarkus-support-debezium-deployment</artifactId> <version>${camel-quarkus.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud-deployment</artifactId> + <version>${camel-quarkus.version}</version> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-support-google-http-client</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index b4ce3f3872..d41f8e7fea 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -8584,6 +8584,16 @@ <artifactId>camel-quarkus-support-debezium-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>2.10.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-support-google-cloud</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.10.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-support-google-cloud-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.10.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-quarkus-support-google-http-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d9dea36f00..be8f87bec1 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -8584,6 +8584,16 @@ <artifactId>camel-quarkus-support-debezium-deployment</artifactId> <version>2.10.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud</artifactId> + <version>2.10.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-google-cloud-deployment</artifactId> + <version>2.10.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-support-google-http-client</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 aaa42c963e..04526b54d1 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -8584,6 +8584,16 @@ <artifactId>camel-quarkus-support-debezium-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>2.10.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-support-google-cloud</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.10.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>camel-quarkus-support-google-cloud-deployment</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>2.10.0-SNAPSHOT</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-quarkus-support-google-http-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
