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 681e59d CAMEL-13234: Use weld3 instead of weld2 at maven cdi
archetype and cdi integration tests project
681e59d is described below
commit 681e59dc17ea3d4e26318836f80240076aa2ec5c
Author: Denis Istomin <istomin....@gmail.com>
AuthorDate: Wed May 15 16:02:21 2019 +0500
CAMEL-13234: Use weld3 instead of weld2 at maven cdi archetype and cdi
integration tests project
---
.../main/resources-filtered/META-INF/maven/archetype-metadata.xml | 6 +++---
.../src/main/resources/archetype-resources/pom.xml | 8 ++++++--
tests/camel-itest-cdi/pom.xml | 6 +++---
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
b/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
index 7b09a85..cfd9690 100644
---
a/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
+++
b/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
@@ -25,13 +25,13 @@
<defaultValue>${project.version}</defaultValue>
</requiredProperty>
<requiredProperty key="cdi-api-version">
- <defaultValue>${cdi-api-1.2-version}</defaultValue>
+ <defaultValue>${cdi-api-2.0-version}</defaultValue>
</requiredProperty>
<requiredProperty key="deltaspike-version">
<defaultValue>${deltaspike-version}</defaultValue>
</requiredProperty>
- <requiredProperty key="weld2-version">
- <defaultValue>${weld2-version}</defaultValue>
+ <requiredProperty key="weld3-version">
+ <defaultValue>${weld3-version}</defaultValue>
</requiredProperty>
<requiredProperty key="maven-compiler-plugin-version">
<defaultValue>${maven-compiler-plugin-version}</defaultValue>
diff --git
a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
index 01a2d7e..1afd08b 100644
---
a/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
+++
b/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml
@@ -60,6 +60,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-cdi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
<!-- logging -->
<dependency>
@@ -122,8 +126,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/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml
index a646fac..6f97873 100644
--- a/tests/camel-itest-cdi/pom.xml
+++ b/tests/camel-itest-cdi/pom.xml
@@ -47,7 +47,7 @@
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.1-version}</version>
+ <version>${cdi-api-2.0-version}</version>
</dependency>
<!-- logging -->
@@ -96,7 +96,7 @@
<profiles>
<profile>
- <id>weld-1.2</id>
+ <id>weld-2.0</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-impl</artifactId>
- <version>${weld2-version}</version>
+ <version>${weld3-version}</version>
<scope>test</scope>
</dependency>
<dependency>
