Repository: camel Updated Branches: refs/heads/master 0aed44aa2 -> 7d5704d5b
camel-cdi upgraded to weld2 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/867607eb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/867607eb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/867607eb Branch: refs/heads/master Commit: 867607eb0f795194597ddc367d45ee9d3260a733 Parents: 0aed44a Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Sep 7 10:01:13 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Sep 7 10:01:13 2014 +0200 ---------------------------------------------------------------------- components/camel-cdi/pom.xml | 29 ++------------------ .../camel/cdi/internal/CamelContextBean.java | 3 +- examples/camel-example-cdi/pom.xml | 4 +-- parent/pom.xml | 4 +-- tests/camel-itest-cdi/pom.xml | 2 +- 5 files changed, 9 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/867607eb/components/camel-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index ef8ebe9..2427215 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -135,11 +135,10 @@ </profile> <profile> - <id>weld-1</id> - <!-- active by default as the overriding of InvocationTarget is currently broken in owb which breaks ProduceInjectTest --> <activation> <activeByDefault>true</activeByDefault> </activation> + <id>weld</id> <dependencies> <dependency> <groupId>org.apache.deltaspike.cdictrl</groupId> @@ -150,34 +149,12 @@ <dependency> <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se-core</artifactId> - <version>${weld-version}</version> - <scope>test</scope> - </dependency> - - </dependencies> - </profile> - <profile> - <id>weld-2</id> - <properties> - <weld-version>2.1.0.Final</weld-version> - <cdi-api.version>1.1</cdi-api.version> - </properties> - <dependencies> - <dependency> - <groupId>org.apache.deltaspike.cdictrl</groupId> - <artifactId>deltaspike-cdictrl-weld</artifactId> - <version>${deltaspike-version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se-core</artifactId> - <version>${weld-version}</version> + <version>${weld2-version}</version> <scope>provided</scope> </dependency> - </dependencies> </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/867607eb/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java ---------------------------------------------------------------------- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java index 439b175..abb51d2 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelContextBean.java @@ -24,6 +24,7 @@ import java.util.Set; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanAttributes; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; import javax.enterprise.inject.spi.InjectionTarget; @@ -38,7 +39,7 @@ import org.apache.deltaspike.core.api.literal.DefaultLiteral; * Description of camel context bean. */ @SuppressWarnings("unchecked") -public class CamelContextBean implements Bean<CdiCamelContext> { +public class CamelContextBean implements Bean<CdiCamelContext>, BeanAttributes<CdiCamelContext> { private final BeanManager beanManager; private final String name; http://git-wip-us.apache.org/repos/asf/camel/blob/867607eb/examples/camel-example-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml index a22478c..be1c314 100644 --- a/examples/camel-example-cdi/pom.xml +++ b/examples/camel-example-cdi/pom.xml @@ -110,7 +110,7 @@ <dependency> <groupId>org.jboss.weld.se</groupId> <artifactId>weld-se-core</artifactId> - <version>${weld-version}</version> + <version>${weld2-version}</version> </dependency> </dependencies> </plugin> @@ -168,7 +168,7 @@ <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> - <version>${weld-version}</version> + <version>${weld2-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/867607eb/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f934d8e..98411d3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -431,9 +431,7 @@ <velocity-version>1.7</velocity-version> <vertx-version>2.1.2</vertx-version> <vysper-version>0.7</vysper-version> - <!-- should be in-sync with deltaspike --> - <weld-version>1.1.18.Final</weld-version> - <weld2-version>2.1.2.Final</weld2-version> + <weld2-version>2.2.4.Final</weld2-version> <werken-xpath-bundle-version>0.9.4_5</werken-xpath-bundle-version> <woodstox-version>4.2.1</woodstox-version> <ws-commons-util-bundle-version>1.0.2_2</ws-commons-util-bundle-version> http://git-wip-us.apache.org/repos/asf/camel/blob/867607eb/tests/camel-itest-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml index 75878ac..560de6a 100644 --- a/tests/camel-itest-cdi/pom.xml +++ b/tests/camel-itest-cdi/pom.xml @@ -101,7 +101,7 @@ <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> - <version>${weld-version}</version> + <version>${weld2-version}</version> <scope>test</scope> </dependency> </dependencies>
