You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/05/16 16:13:07 UTC
[camel] branch master updated: CAMEL-13234: Remove dependencies
weld1 and weld2
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 aeecbc4 CAMEL-13234: Remove dependencies weld1 and weld2
aeecbc4 is described below
commit aeecbc47c5accd0425c5cc6c2b5ba8b968d51274
Author: Denis Istomin <is...@gmail.com>
AuthorDate: Wed May 15 18:29:23 2019 +0500
CAMEL-13234: Remove dependencies weld1 and weld2
---
components/camel-cdi/pom.xml | 106 +-----------------------------------------
parent/pom.xml | 4 --
tests/camel-itest-cdi/pom.xml | 2 +-
3 files changed, 3 insertions(+), 109 deletions(-)
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index e079a3d..fb43ce1 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -190,7 +190,7 @@
<profiles>
<profile>
- <id>weld-1.0</id>
+ <id>weld-3.0</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -200,108 +200,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*Cdi12Test.java</exclude>
- <exclude>**/*Cdi20Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- provided dependencies -->
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.0-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>${javax.el-api-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <version>${weld1-version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-se-embedded-1.1</artifactId>
- <version>1.0.0.CR9</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </profile>
-
- <profile>
- <id>weld-1.2</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*Cdi20Test.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- provided dependencies -->
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi-api-1.2-version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core-impl</artifactId>
- <version>${weld2-version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <version>${arquillian-weld-embedded-version}</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- </profile>
-
- <profile>
- <id>weld-2.0</id>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -478,7 +376,7 @@
</profile>
<profile>
- <id>jdk9+-weld-2.0</id>
+ <id>jdk9+-weld-3.0</id>
<activation>
<jdk>[9,)</jdk>
</activation>
diff --git a/parent/pom.xml b/parent/pom.xml
index dfab7e9..e2e3c04 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -113,8 +113,6 @@
<cassandra-unit-version>3.1.3.2</cassandra-unit-version>
<castor-version>1.3.3</castor-version>
<castor-bundle-version>1.3.3_1</castor-bundle-version>
- <cdi-api-1.0-version>1.0-SP4</cdi-api-1.0-version>
- <cdi-api-1.1-version>1.1</cdi-api-1.1-version>
<cdi-api-1.2-version>1.2</cdi-api-1.2-version>
<cdi-api-2.0-version>2.0</cdi-api-2.0-version>
<jta-api-1.2-version>1.2</jta-api-1.2-version>
@@ -689,8 +687,6 @@
<vysper-version>0.7</vysper-version>
<web3j-version>3.6.0</web3j-version>
<web3j-quorum-version>0.8.0</web3j-quorum-version>
- <weld1-version>1.1.28.Final</weld1-version>
- <weld2-version>2.4.7.Final</weld2-version>
<weld3-version>3.0.5.Final</weld3-version>
<werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version>
<wiremock-version>2.23.2</wiremock-version>
diff --git a/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml
index 6f97873..591b961 100644
--- a/tests/camel-itest-cdi/pom.xml
+++ b/tests/camel-itest-cdi/pom.xml
@@ -96,7 +96,7 @@
<profiles>
<profile>
- <id>weld-2.0</id>
+ <id>weld-3.0</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>