This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push: new a68f54b Review extensions' dependencies chains #56 a68f54b is described below commit a68f54b6bad1ac41bc05cdea72608cba6ea55551 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Wed Jul 10 12:49:17 2019 +0200 Review extensions' dependencies chains #56 --- extensions/aws-s3/deployment/pom.xml | 13 +--- extensions/aws-s3/runtime/pom.xml | 19 +----- extensions/aws-sns/deployment/pom.xml | 13 +--- extensions/aws-sns/runtime/pom.xml | 19 +----- extensions/aws-sqs/deployment/pom.xml | 13 +--- extensions/aws-sqs/runtime/pom.xml | 19 +----- extensions/core/deployment/pom.xml | 10 +-- extensions/core/runtime/pom.xml | 21 +++--- extensions/infinispan/deployment/pom.xml | 99 +++++++++++++--------------- extensions/infinispan/runtime/pom.xml | 17 ++--- extensions/jdbc/deployment/pom.xml | 11 ++-- extensions/jdbc/runtime/pom.xml | 5 -- extensions/netty4-http/deployment/pom.xml | 97 +++++++++++++--------------- extensions/netty4-http/runtime/pom.xml | 20 ++---- extensions/salesforce/deployment/pom.xml | 89 ++++++++++++------------- extensions/salesforce/runtime/pom.xml | 17 +---- extensions/servlet/deployment/pom.xml | 104 ++++++++++++++---------------- extensions/servlet/runtime/pom.xml | 13 ++-- integration-tests/aws-s3/pom.xml | 29 +-------- integration-tests/aws-sns/pom.xml | 29 +-------- integration-tests/aws-sqs/pom.xml | 29 +-------- integration-tests/core/pom.xml | 18 +----- integration-tests/jdbc/pom.xml | 6 -- integration-tests/salesforce/pom.xml | 30 +-------- integration-tests/servlet/pom.xml | 1 - 25 files changed, 233 insertions(+), 508 deletions(-) diff --git a/extensions/aws-s3/deployment/pom.xml b/extensions/aws-s3/deployment/pom.xml index 7ff2861..1360c29 100644 --- a/extensions/aws-s3/deployment/pom.xml +++ b/extensions/aws-s3/deployment/pom.xml @@ -31,23 +31,14 @@ <name>Camel Quarkus :: AWS S3 :: Deployment</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core-deployment</artifactId> - </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc-deployment</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> - - <!-- camel --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-s3</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/aws-s3/runtime/pom.xml b/extensions/aws-s3/runtime/pom.xml index 11cad11..a023322 100644 --- a/extensions/aws-s3/runtime/pom.xml +++ b/extensions/aws-s3/runtime/pom.xml @@ -31,23 +31,11 @@ <name>Camel Quarkus :: AWS S3 :: Runtime</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> - <groupId>com.oracle.substratevm</groupId> - <artifactId>svm</artifactId> - </dependency> - - <!-- camel --> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws-s3</artifactId> <exclusions> @@ -61,17 +49,14 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-cbor</artifactId> </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/aws-sns/deployment/pom.xml b/extensions/aws-sns/deployment/pom.xml index ffa9e76..45355da 100644 --- a/extensions/aws-sns/deployment/pom.xml +++ b/extensions/aws-sns/deployment/pom.xml @@ -31,23 +31,14 @@ <name>Camel Quarkus :: AWS SNS :: Deployment</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core-deployment</artifactId> - </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc-deployment</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> - - <!-- camel --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-sns</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/aws-sns/runtime/pom.xml b/extensions/aws-sns/runtime/pom.xml index b08d210..41ccbc1 100644 --- a/extensions/aws-sns/runtime/pom.xml +++ b/extensions/aws-sns/runtime/pom.xml @@ -31,23 +31,11 @@ <name>Camel Quarkus :: AWS SNS :: Runtime</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> - <groupId>com.oracle.substratevm</groupId> - <artifactId>svm</artifactId> - </dependency> - - <!-- camel --> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws-sns</artifactId> <exclusions> @@ -61,17 +49,14 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-cbor</artifactId> </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/aws-sqs/deployment/pom.xml b/extensions/aws-sqs/deployment/pom.xml index a20b46b..884ec9c 100644 --- a/extensions/aws-sqs/deployment/pom.xml +++ b/extensions/aws-sqs/deployment/pom.xml @@ -31,23 +31,14 @@ <name>Camel Quarkus :: AWS SQS :: Deployment</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core-deployment</artifactId> - </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc-deployment</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> - - <!-- camel --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-sqs</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/aws-sqs/runtime/pom.xml b/extensions/aws-sqs/runtime/pom.xml index fe1fc21..90fefde 100644 --- a/extensions/aws-sqs/runtime/pom.xml +++ b/extensions/aws-sqs/runtime/pom.xml @@ -31,23 +31,11 @@ <name>Camel Quarkus :: AWS SQS :: Runtime</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> - <groupId>com.oracle.substratevm</groupId> - <artifactId>svm</artifactId> - </dependency> - - <!-- camel --> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-aws-sqs</artifactId> <exclusions> @@ -61,17 +49,14 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-cbor</artifactId> </dependency> - <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/core/deployment/pom.xml b/extensions/core/deployment/pom.xml index 7506388..930adf9 100644 --- a/extensions/core/deployment/pom.xml +++ b/extensions/core/deployment/pom.xml @@ -38,11 +38,6 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-arc-deployment</artifactId> </dependency> - <!-- camel --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-jaxb-deployment</artifactId> @@ -51,6 +46,11 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-caffeine-deployment</artifactId> </dependency> + <!-- camel --> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> + </dependency> </dependencies> <build> <plugins> diff --git a/extensions/core/runtime/pom.xml b/extensions/core/runtime/pom.xml index b3b5db2..c20f3e5 100644 --- a/extensions/core/runtime/pom.xml +++ b/extensions/core/runtime/pom.xml @@ -31,8 +31,6 @@ <name>Camel Quarkus :: Core :: Runtime</name> <dependencies> - - <!-- quarkus --> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-core</artifactId> @@ -42,16 +40,6 @@ <artifactId>quarkus-arc</artifactId> </dependency> <dependency> - <groupId>com.oracle.substratevm</groupId> - <artifactId>svm</artifactId> - </dependency> - - <!-- camel --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-jaxb</artifactId> </dependency> @@ -59,6 +47,15 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-caffeine</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + + <dependency> + <groupId>com.oracle.substratevm</groupId> + <artifactId>svm</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions/infinispan/deployment/pom.xml b/extensions/infinispan/deployment/pom.xml index 40cd4ff..fa6dc29 100644 --- a/extensions/infinispan/deployment/pom.xml +++ b/extensions/infinispan/deployment/pom.xml @@ -17,64 +17,55 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-infinispan-parent</artifactId> <version>0.0.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-infinispan-deployment</artifactId> - <name>Camel Quarkus :: Infinispan :: Deployment</name> + <artifactId>camel-quarkus-infinispan-deployment</artifactId> + <name>Camel Quarkus :: Infinispan :: Deployment</name> - <dependencies> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> + <dependencies> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-infinispan-client-deployment</artifactId> + </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-infinispan</artifactId> + </dependency> + </dependencies> - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-infinispan-client-deployment</artifactId> - </dependency> - - <!-- camel --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-infinispan</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/extensions/infinispan/runtime/pom.xml b/extensions/infinispan/runtime/pom.xml index 7054c49..1bce589 100644 --- a/extensions/infinispan/runtime/pom.xml +++ b/extensions/infinispan/runtime/pom.xml @@ -31,17 +31,10 @@ <name>Camel Quarkus :: Infinispan :: Runtime</name> <dependencies> - <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-infinispan-client</artifactId> @@ -51,16 +44,14 @@ <artifactId>infinispan-core</artifactId> </dependency> <dependency> - <groupId>com.oracle.substratevm</groupId> - <artifactId>svm</artifactId> - </dependency> - - <!-- camel --> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-infinispan</artifactId> </dependency> + <dependency> + <groupId>com.oracle.substratevm</groupId> + <artifactId>svm</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions/jdbc/deployment/pom.xml b/extensions/jdbc/deployment/pom.xml index 7775448..0417191 100644 --- a/extensions/jdbc/deployment/pom.xml +++ b/extensions/jdbc/deployment/pom.xml @@ -30,12 +30,6 @@ <name>Camel Quarkus :: JDBC :: Deployment</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-agroal-deployment</artifactId> @@ -46,9 +40,12 @@ </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-jdbc</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/jdbc/runtime/pom.xml b/extensions/jdbc/runtime/pom.xml index c7d0f8c..5ee86c3 100644 --- a/extensions/jdbc/runtime/pom.xml +++ b/extensions/jdbc/runtime/pom.xml @@ -31,8 +31,6 @@ <name>Camel Quarkus :: JDBC :: Runtime</name> <dependencies> - - <!-- quarkus --> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> @@ -49,13 +47,10 @@ <groupId>org.jboss.spec.javax.security.jacc</groupId> <artifactId>jboss-jacc-api_1.5_spec</artifactId> </dependency> - - <!-- camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jdbc</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/netty4-http/deployment/pom.xml b/extensions/netty4-http/deployment/pom.xml index 964de44..5fc0ba7 100644 --- a/extensions/netty4-http/deployment/pom.xml +++ b/extensions/netty4-http/deployment/pom.xml @@ -18,63 +18,54 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-netty4-http-parent</artifactId> <version>0.0.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-netty4-http-deployment</artifactId> - <name>Camel Quarkus :: Netty 4 HTTP :: Deployment</name> + <artifactId>camel-quarkus-netty4-http-deployment</artifactId> + <name>Camel Quarkus :: Netty 4 HTTP :: Deployment</name> - <dependencies> + <dependencies> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-netty-deployment</artifactId> + </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-netty4-http</artifactId> + </dependency> + </dependencies> - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-netty-deployment</artifactId> - </dependency> - - <!-- camel --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-netty4-http</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/extensions/netty4-http/runtime/pom.xml b/extensions/netty4-http/runtime/pom.xml index 53744ec..87f4a25 100644 --- a/extensions/netty4-http/runtime/pom.xml +++ b/extensions/netty4-http/runtime/pom.xml @@ -31,31 +31,23 @@ <name>Camel Quarkus :: Netty 4 HTTP :: Runtime</name> <dependencies> - - <!-- quarkus --> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-netty</artifactId> </dependency> <dependency> - <groupId>com.oracle.substratevm</groupId> - <artifactId>svm</artifactId> - </dependency> - - <!-- camel --> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-netty4-http</artifactId> </dependency> + <dependency> + <groupId>com.oracle.substratevm</groupId> + <artifactId>svm</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions/salesforce/deployment/pom.xml b/extensions/salesforce/deployment/pom.xml index c40e87d..1183ea0 100644 --- a/extensions/salesforce/deployment/pom.xml +++ b/extensions/salesforce/deployment/pom.xml @@ -18,59 +18,50 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-salesforce-parent</artifactId> <version>0.0.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-salesforce-deployment</artifactId> - <name>Camel Quarkus :: Salesforce :: Deployment</name> + <artifactId>camel-quarkus-salesforce-deployment</artifactId> + <name>Camel Quarkus :: Salesforce :: Deployment</name> - <dependencies> + <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-salesforce</artifactId> + </dependency> + </dependencies> - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc-deployment</artifactId> - </dependency> - - <!-- camel --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-salesforce</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <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> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/extensions/salesforce/runtime/pom.xml b/extensions/salesforce/runtime/pom.xml index d5625fa..3ddd6a1 100644 --- a/extensions/salesforce/runtime/pom.xml +++ b/extensions/salesforce/runtime/pom.xml @@ -31,27 +31,14 @@ <name>Camel Quarkus :: Salesforce :: Runtime</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-core</artifactId> </dependency> <dependency> - <groupId>com.oracle.substratevm</groupId> - <artifactId>svm</artifactId> - </dependency> - - <!-- camel --> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-salesforce</artifactId> </dependency> - </dependencies> <build> diff --git a/extensions/servlet/deployment/pom.xml b/extensions/servlet/deployment/pom.xml index aa91566..428abfc 100644 --- a/extensions/servlet/deployment/pom.xml +++ b/extensions/servlet/deployment/pom.xml @@ -17,66 +17,58 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <parent> +<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <parent> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-servlet-parent</artifactId> <version>0.0.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> + </parent> + <modelVersion>4.0.0</modelVersion> - <artifactId>camel-quarkus-servlet-deployment</artifactId> - <name>Camel Quarkus :: Servlet :: Deployment</name> + <artifactId>camel-quarkus-servlet-deployment</artifactId> + <name>Camel Quarkus :: Servlet :: Deployment</name> - <dependencies> + <dependencies> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-undertow-deployment</artifactId> + </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-servlet</artifactId> + </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-junit5-internal</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>io.rest-assured</groupId> + <artifactId>rest-assured</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <!-- quarkus --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core-deployment</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-undertow-deployment</artifactId> - </dependency> - - <!-- camel --> - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-servlet</artifactId> - </dependency> - - - <!-- test dependencies --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-junit5-internal</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.rest-assured</groupId> - <artifactId>rest-assured</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <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> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths> + <path> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-extension-processor</artifactId> + <version>${quarkus.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/extensions/servlet/runtime/pom.xml b/extensions/servlet/runtime/pom.xml index cbc8a74..feaa80d 100644 --- a/extensions/servlet/runtime/pom.xml +++ b/extensions/servlet/runtime/pom.xml @@ -31,23 +31,18 @@ <name>Camel Quarkus :: Servlet :: Runtime</name> <dependencies> - - <!-- quarkus --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-undertow</artifactId> - </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> - - <!-- camel --> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-undertow</artifactId> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-servlet</artifactId> </dependency> - </dependencies> <build> diff --git a/integration-tests/aws-s3/pom.xml b/integration-tests/aws-s3/pom.xml index 46bff62..4c19feb 100644 --- a/integration-tests/aws-s3/pom.xml +++ b/integration-tests/aws-s3/pom.xml @@ -34,37 +34,12 @@ <dependencies> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - - <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-s3</artifactId> </dependency> - - <dependency> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logging</artifactId> - <scope>provided</scope> - </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <scope>provided</scope> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy</artifactId> </dependency> <!-- test dependencies --> diff --git a/integration-tests/aws-sns/pom.xml b/integration-tests/aws-sns/pom.xml index 714bd01..34c995c 100644 --- a/integration-tests/aws-sns/pom.xml +++ b/integration-tests/aws-sns/pom.xml @@ -34,37 +34,12 @@ <dependencies> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - - <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-sns</artifactId> </dependency> - - <dependency> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logging</artifactId> - <scope>provided</scope> - </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <scope>provided</scope> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy</artifactId> </dependency> <!-- test dependencies --> diff --git a/integration-tests/aws-sqs/pom.xml b/integration-tests/aws-sqs/pom.xml index 2cc8c44..1581727 100644 --- a/integration-tests/aws-sqs/pom.xml +++ b/integration-tests/aws-sqs/pom.xml @@ -34,37 +34,12 @@ <dependencies> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - - <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-aws-sqs</artifactId> </dependency> - - <dependency> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logging</artifactId> - <scope>provided</scope> - </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <scope>provided</scope> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy</artifactId> </dependency> <!-- test dependencies --> diff --git a/integration-tests/core/pom.xml b/integration-tests/core/pom.xml index 2b7215e..c965e4b 100644 --- a/integration-tests/core/pom.xml +++ b/integration-tests/core/pom.xml @@ -34,18 +34,6 @@ <dependencies> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> - </dependency> - <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> @@ -53,11 +41,9 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-netty4-http</artifactId> </dependency> - <dependency> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logging</artifactId> - <scope>provided</scope> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy</artifactId> </dependency> <!-- test dependencies --> diff --git a/integration-tests/jdbc/pom.xml b/integration-tests/jdbc/pom.xml index 9043bd6..8265713 100644 --- a/integration-tests/jdbc/pom.xml +++ b/integration-tests/jdbc/pom.xml @@ -46,12 +46,6 @@ <artifactId>quarkus-jdbc-h2</artifactId> </dependency> - <!-- Undertow is here only for the test runner to be able to detect that the server has started --> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-undertow</artifactId> - </dependency> - <!-- test dependencies --> <dependency> <groupId>io.quarkus</groupId> diff --git a/integration-tests/salesforce/pom.xml b/integration-tests/salesforce/pom.xml index 6203108..b10df03 100644 --- a/integration-tests/salesforce/pom.xml +++ b/integration-tests/salesforce/pom.xml @@ -31,40 +31,14 @@ <name>Camel Quarkus :: Integration Tests :: Salesforce</name> <description>The camel integration tests</description> - <dependencies> <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-arc</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-resteasy</artifactId> - </dependency> - <dependency> - <groupId>io.quarkus</groupId> - <artifactId>quarkus-core</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-core</artifactId> - </dependency> - - <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-salesforce</artifactId> </dependency> - - <dependency> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logging</artifactId> - <scope>provided</scope> - </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <scope>provided</scope> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-resteasy</artifactId> </dependency> <!-- test dependencies --> diff --git a/integration-tests/servlet/pom.xml b/integration-tests/servlet/pom.xml index 2146eee..c833553 100644 --- a/integration-tests/servlet/pom.xml +++ b/integration-tests/servlet/pom.xml @@ -31,7 +31,6 @@ <name>Camel Quarkus :: Integration Tests :: Servlet</name> <description>Integration tests for Camel Servlet component</description> - <dependencies> <dependency> <groupId>org.apache.camel.quarkus</groupId>