You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/05/14 19:36:44 UTC
[camel] branch master updated: CAMEL-13234: Use weld3 instead of
weld2 at CDI example projects
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 8086195 CAMEL-13234: Use weld3 instead of weld2 at CDI example projects
new e830335 Merge pull request #2914 from DenisIstomin/camel-13234-use-weld3-instead-weld2
8086195 is described below
commit 80861954634918be4bd436700caa950b781702e3
Author: Denis Istomin <is...@gmail.com>
AuthorDate: Tue May 14 23:43:43 2019 +0500
CAMEL-13234: Use weld3 instead of weld2 at CDI example projects
---
components/camel-test-cdi/pom.xml | 2 +-
examples/camel-example-cdi-aws-s3/pom.xml | 6 +++---
examples/camel-example-cdi-cassandraql/pom.xml | 6 +++---
examples/camel-example-cdi-kubernetes/pom.xml | 6 +++---
examples/camel-example-cdi-metrics/pom.xml | 6 +++---
examples/camel-example-cdi-properties/pom.xml | 6 +++---
examples/camel-example-cdi-rest-servlet/pom.xml | 6 +++---
examples/camel-example-cdi-test/pom.xml | 6 +++---
examples/camel-example-cdi-xml/pom.xml | 6 +++---
examples/camel-example-cdi/pom.xml | 6 +++---
examples/camel-example-fhir/pom.xml | 6 +++---
examples/camel-example-opentracing/client/pom.xml | 6 +++---
examples/camel-example-swagger-cdi/pom.xml | 6 +++---
examples/camel-example-transformer-cdi/pom.xml | 6 +++---
examples/camel-example-widget-gadget-cdi/pom.xml | 6 +++---
examples/camel-example-zipkin/client/pom.xml | 6 +++---
16 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/components/camel-test-cdi/pom.xml b/components/camel-test-cdi/pom.xml
index f7c7bb8..7cc65da 100644
--- a/components/camel-test-cdi/pom.xml
+++ b/components/camel-test-cdi/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
- <version>${weld2-version}</version>
+ <version>${weld3-version}</version>
</dependency>
<!-- test dependencies -->
diff --git a/examples/camel-example-cdi-aws-s3/pom.xml b/examples/camel-example-cdi-aws-s3/pom.xml
index 49413af..41b750f 100644
--- a/examples/camel-example-cdi-aws-s3/pom.xml
+++ b/examples/camel-example-cdi-aws-s3/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -95,8 +95,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-cdi-cassandraql/pom.xml b/examples/camel-example-cdi-cassandraql/pom.xml
index 2452541..0d7c191 100644
--- a/examples/camel-example-cdi-cassandraql/pom.xml
+++ b/examples/camel-example-cdi-cassandraql/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -108,8 +108,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-cdi-kubernetes/pom.xml b/examples/camel-example-cdi-kubernetes/pom.xml
index 54dfdf8..a43c03d 100644
--- a/examples/camel-example-cdi-kubernetes/pom.xml
+++ b/examples/camel-example-cdi-kubernetes/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -91,8 +91,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index ee0c9ca..f909bc3 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -130,8 +130,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index 5efcc7b..5f51baa 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -48,7 +48,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -127,8 +127,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index 0732552..e5115eb 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -135,8 +135,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.servlet</groupId>
- <artifactId>weld-servlet</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-servlet-shaded</artifactId>
+ <version>${weld3-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index ba6a46f..bcb9155 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -112,8 +112,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-cdi-xml/pom.xml b/examples/camel-example-cdi-xml/pom.xml
index cad374c..34267bc 100644
--- a/examples/camel-example-cdi-xml/pom.xml
+++ b/examples/camel-example-cdi-xml/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -124,8 +124,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml
index 6f384b4..40c970b 100644
--- a/examples/camel-example-cdi/pom.xml
+++ b/examples/camel-example-cdi/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -76,8 +76,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
<!-- logging -->
<dependency>
diff --git a/examples/camel-example-fhir/pom.xml b/examples/camel-example-fhir/pom.xml
index feff957..331be0a 100644
--- a/examples/camel-example-fhir/pom.xml
+++ b/examples/camel-example-fhir/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -101,8 +101,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/examples/camel-example-opentracing/client/pom.xml b/examples/camel-example-opentracing/client/pom.xml
index a48607b..e61ce9d 100644
--- a/examples/camel-example-opentracing/client/pom.xml
+++ b/examples/camel-example-opentracing/client/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -95,8 +95,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
<!-- logging -->
<dependency>
diff --git a/examples/camel-example-swagger-cdi/pom.xml b/examples/camel-example-swagger-cdi/pom.xml
index a062407..f58106f 100644
--- a/examples/camel-example-swagger-cdi/pom.xml
+++ b/examples/camel-example-swagger-cdi/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>1.2</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -87,8 +87,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
<!-- logging -->
<dependency>
diff --git a/examples/camel-example-transformer-cdi/pom.xml b/examples/camel-example-transformer-cdi/pom.xml
index 2f8c026..a0a7ac3 100644
--- a/examples/camel-example-transformer-cdi/pom.xml
+++ b/examples/camel-example-transformer-cdi/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -88,8 +88,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
<!-- logging -->
<dependency>
diff --git a/examples/camel-example-widget-gadget-cdi/pom.xml b/examples/camel-example-widget-gadget-cdi/pom.xml
index d5a7a22..4ea9690 100644
--- a/examples/camel-example-widget-gadget-cdi/pom.xml
+++ b/examples/camel-example-widget-gadget-cdi/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -105,8 +105,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
<!-- logging -->
<dependency>
diff --git a/examples/camel-example-zipkin/client/pom.xml b/examples/camel-example-zipkin/client/pom.xml
index eaee649..dd50e83 100644
--- a/examples/camel-example-zipkin/client/pom.xml
+++ b/examples/camel-example-zipkin/client/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
+ <version>${cdi-api-2.0-version}</version>
<scope>provided</scope>
</dependency>
@@ -90,8 +90,8 @@
</dependency>
<dependency>
<groupId>org.jboss.weld.se</groupId>
- <artifactId>weld-se</artifactId>
- <version>${weld2-version}</version>
+ <artifactId>weld-se-shaded</artifactId>
+ <version>${weld3-version}</version>
</dependency>
<!-- logging -->
<dependency>