Simplify Maven dependencies in Camel CDI examples
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/664562d3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/664562d3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/664562d3 Branch: refs/heads/master Commit: 664562d3c3c80bcea4670c99920e67340f934e1f Parents: a48b1ff Author: Antonin Stefanutti <anto...@stefanutti.fr> Authored: Thu Mar 3 15:17:30 2016 +0100 Committer: Antonin Stefanutti <anto...@stefanutti.fr> Committed: Thu Mar 3 15:17:30 2016 +0100 ---------------------------------------------------------------------- examples/camel-example-cdi-metrics/pom.xml | 63 +++++++--------- examples/camel-example-cdi-osgi/pom.xml | 53 +++++++------- examples/camel-example-cdi-properties/pom.xml | 55 +++++++------- examples/camel-example-cdi-rest-servlet/pom.xml | 20 +++--- examples/camel-example-cdi/pom.xml | 64 +++++++---------- examples/camel-example-swagger-cdi/pom.xml | 71 +++++++++--------- .../camel-example-widget-gadget-cdi/pom.xml | 76 ++++++++------------ 7 files changed, 174 insertions(+), 228 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-cdi-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml index 9044e38..0c69cc9 100755 --- a/examples/camel-example-cdi-metrics/pom.xml +++ b/examples/camel-example-cdi-metrics/pom.xml @@ -33,11 +33,15 @@ <dependencies> - <!-- Camel --> + <!-- CDI API --> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${cdi-api-1.2-version}</version> + <scope>provided</scope> </dependency> + + <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cdi</artifactId> @@ -54,47 +58,16 @@ <version>1.3.3</version> </dependency> - <!-- CDI API --> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>${cdi-api-1.2-version}</version> - <scope>provided</scope> - </dependency> - - <!-- need to use a CDI container such as JBoss Weld --> - <!-- lets use weld for CDI --> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.core</groupId> - <artifactId>deltaspike-core-api</artifactId> - <version>${deltaspike-version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.cdictrl</groupId> - <artifactId>deltaspike-cdictrl-weld</artifactId> - <version>${deltaspike-version}</version> - <scope>runtime</scope> - </dependency> - <!-- logging --> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> </dependency> <!-- test --> @@ -128,6 +101,12 @@ <version>${arquillian-weld-se-embedded-version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${weld2-version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -137,6 +116,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-weld</artifactId> + <version>${deltaspike-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + <version>${weld2-version}</version> + </dependency> + </dependencies> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-cdi-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-osgi/pom.xml b/examples/camel-example-cdi-osgi/pom.xml index 706b0b2..ea217cc 100755 --- a/examples/camel-example-cdi-osgi/pom.xml +++ b/examples/camel-example-cdi-osgi/pom.xml @@ -33,11 +33,15 @@ <dependencies> - <!-- Camel --> + <!-- CDI API --> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${cdi-api-1.2-version}</version> + <scope>provided</scope> </dependency> + + <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cdi</artifactId> @@ -52,13 +56,10 @@ <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> </dependency> - - <!-- CDI API --> <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>${cdi-api-1.2-version}</version> - <scope>provided</scope> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-broker</artifactId> + <scope>runtime</scope> </dependency> <!-- OSGi API --> @@ -77,10 +78,12 @@ <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> </dependency> <!-- test --> @@ -203,26 +206,6 @@ </exclusions> </dependency> - <!-- for camel:run --> - <dependency> - <groupId>org.apache.deltaspike.cdictrl</groupId> - <artifactId>deltaspike-cdictrl-weld</artifactId> - <version>${deltaspike-version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - <version>${weld2-version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-broker</artifactId> - <version>${activemq-version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> <build> @@ -236,6 +219,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-weld</artifactId> + <version>${deltaspike-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + <version>${weld2-version}</version> + </dependency> + </dependencies> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-cdi-properties/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml index c80c179..46d5434 100755 --- a/examples/camel-example-cdi-properties/pom.xml +++ b/examples/camel-example-cdi-properties/pom.xml @@ -33,16 +33,6 @@ <dependencies> - <!-- Camel --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-cdi</artifactId> - </dependency> - <!-- CDI API --> <dependency> <groupId>javax.enterprise</groupId> @@ -51,6 +41,12 @@ <scope>provided</scope> </dependency> + <!-- Camel CDI --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-cdi</artifactId> + </dependency> + <!-- DeltaSpike --> <dependency> <groupId>org.apache.deltaspike.core</groupId> @@ -63,33 +59,16 @@ <version>${deltaspike-version}</version> </dependency> - <!-- need to use a CDI container such as JBoss Weld --> - <!-- lets use weld for CDI --> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.cdictrl</groupId> - <artifactId>deltaspike-cdictrl-weld</artifactId> - <version>${deltaspike-version}</version> - <scope>runtime</scope> - </dependency> - <!-- logging --> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> </dependency> <!-- test --> @@ -123,6 +102,12 @@ <version>${arquillian-weld-se-embedded-version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${weld2-version}</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -132,6 +117,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-weld</artifactId> + <version>${deltaspike-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + <version>${weld2-version}</version> + </dependency> + </dependencies> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-cdi-rest-servlet/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml index 79d9bda..7e7248b 100755 --- a/examples/camel-example-cdi-rest-servlet/pom.xml +++ b/examples/camel-example-cdi-rest-servlet/pom.xml @@ -33,11 +33,15 @@ <dependencies> - <!-- Camel --> + <!-- CDI API --> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${cdi-api-1.2-version}</version> + <scope>provided</scope> </dependency> + + <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cdi</artifactId> @@ -48,22 +52,16 @@ <scope>runtime</scope> </dependency> - <!-- CDI API --> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>${cdi-api-1.2-version}</version> - <scope>provided</scope> - </dependency> - <!-- logging --> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> </dependency> <!-- test --> http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml index c555807..555d9a7 100644 --- a/examples/camel-example-cdi/pom.xml +++ b/examples/camel-example-cdi/pom.xml @@ -30,11 +30,6 @@ <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-cdi</artifactId> - </dependency> - <!-- CDI API --> <dependency> <groupId>javax.enterprise</groupId> @@ -43,41 +38,10 @@ <scope>provided</scope> </dependency> - <!-- need to use a CDI container such as JBoss Weld --> - <!-- lets use weld for CDI --> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.core</groupId> - <artifactId>deltaspike-core-api</artifactId> - <version>${deltaspike-version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.cdictrl</groupId> - <artifactId>deltaspike-cdictrl-weld</artifactId> - <version>${deltaspike-version}</version> - <scope>runtime</scope> - </dependency> - - <!-- use log4j as logger --> + <!-- Camel CDI --> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> + <groupId>org.apache.camel</groupId> + <artifactId>camel-cdi</artifactId> </dependency> </dependencies> @@ -90,6 +54,28 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-weld</artifactId> + <version>${deltaspike-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + <version>${weld2-version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j-version}</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j-version}</version> + </dependency> + </dependencies> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-swagger-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-cdi/pom.xml b/examples/camel-example-swagger-cdi/pom.xml index b2f673c..05bdabc 100644 --- a/examples/camel-example-swagger-cdi/pom.xml +++ b/examples/camel-example-swagger-cdi/pom.xml @@ -30,7 +30,15 @@ <dependencies> - <!-- camel --> + <!-- CDI API --> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + + <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cdi</artifactId> @@ -42,50 +50,15 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-undertow</artifactId> + <scope>runtime</scope> </dependency> - <!-- for json support --> + <!-- JSON support --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jackson</artifactId> </dependency> - <!-- cdi api --> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> - - <!-- need to use a CDI container such as JBoss Weld --> - <!-- lets use weld for CDI --> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.cdictrl</groupId> - <artifactId>deltaspike-cdictrl-weld</artifactId> - <version>${deltaspike-version}</version> - </dependency> - - <!-- use log4j as logger --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - </dependencies> <build> @@ -96,6 +69,28 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-weld</artifactId> + <version>${deltaspike-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + <version>${weld2-version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j-version}</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j-version}</version> + </dependency> + </dependencies> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/camel/blob/664562d3/examples/camel-example-widget-gadget-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-widget-gadget-cdi/pom.xml b/examples/camel-example-widget-gadget-cdi/pom.xml index 4cd1654..de3df13 100755 --- a/examples/camel-example-widget-gadget-cdi/pom.xml +++ b/examples/camel-example-widget-gadget-cdi/pom.xml @@ -33,17 +33,21 @@ <dependencies> - <!-- camel --> + <!-- CDI API --> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <version>${cdi-api-1.2-version}</version> + <scope>provided</scope> </dependency> + + <!-- Camel CDI --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cdi</artifactId> </dependency> - <!-- camel jms and activemq --> + <!-- Camel JMS and ActiveMQ --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jms</artifactId> @@ -63,48 +67,6 @@ <artifactId>activemq-pool</artifactId> </dependency> - <!-- CDI API --> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - <version>${cdi-api-1.2-version}</version> - <scope>provided</scope> - </dependency> - - <!-- need to use a CDI container such as JBoss Weld --> - <!-- lets use weld for CDI --> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${weld2-version}</version> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.core</groupId> - <artifactId>deltaspike-core-api</artifactId> - <version>${deltaspike-version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.deltaspike.cdictrl</groupId> - <artifactId>deltaspike-cdictrl-weld</artifactId> - <version>${deltaspike-version}</version> - <scope>runtime</scope> - </dependency> - - <!-- logging --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> </dependencies> <build> @@ -114,6 +76,28 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> <version>${project.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.deltaspike.cdictrl</groupId> + <artifactId>deltaspike-cdictrl-weld</artifactId> + <version>${deltaspike-version}</version> + </dependency> + <dependency> + <groupId>org.jboss.weld.se</groupId> + <artifactId>weld-se</artifactId> + <version>${weld2-version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j-version}</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j-version}</version> + </dependency> + </dependencies> </plugin> </plugins>
