Repository: camel Updated Branches: refs/heads/master 18dffc32d -> fef296eee
CAMEL-8449: camel-cdi - Support CDI 1.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fef296ee Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fef296ee Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fef296ee Branch: refs/heads/master Commit: fef296eee5e838ce18a1bd16183a314ee8b5edb1 Parents: 18dffc3 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Mar 6 10:45:38 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Mar 6 10:45:38 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/camel/cdi/internal/CamelContextBean.java | 3 +-- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fef296ee/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 3dc34f9..6824ee6 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,7 +24,6 @@ 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 +37,7 @@ import org.apache.deltaspike.core.api.literal.DefaultLiteral; /** * Description of camel context bean. */ -public class CamelContextBean implements Bean<CdiCamelContext>, BeanAttributes<CdiCamelContext> { +public class CamelContextBean implements Bean<CdiCamelContext> { private final BeanManager beanManager; private final String name; http://git-wip-us.apache.org/repos/asf/camel/blob/fef296ee/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index ebb749d..e37fbaa 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -82,7 +82,7 @@ <cassandra-version>2.1.2</cassandra-version> <cassandra-unit-version>2.0.2.2</cassandra-unit-version> <castor-bundle-version>1.3.2_2</castor-bundle-version> - <cdi-api-version>1.2</cdi-api-version> + <cdi-api-version>1.0</cdi-api-version> <cglib-bundle-version>2.1_3_7</cglib-bundle-version> <cglib-version>2.2</cglib-version> <chunk-templates-version>2.6.3</chunk-templates-version>
