diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index cafc652537f01..de1ec6d22ddf5 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -15,7 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -43,12 +44,22 @@
             org.apache.camel.cdi.component.*;${camel.osgi.version}
         </camel.osgi.export.pkg>
         <camel.osgi.provide.capability>
-          org.ops4j.pax.cdi.extension; extension=camel-cdi-extension
+            org.ops4j.pax.cdi.extension; extension=camel-cdi-extension
         </camel.osgi.provide.capability>
+        <openwebbeans-version>1.1.7</openwebbeans-version>
+        <deltaspike-version>0.5</deltaspike-version>
+        <cdi-api.version>1.0-SP4</cdi-api.version>
     </properties>
 
     <dependencies>
 
+        <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>${cdi-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- Camel -->
        <dependency>
             <groupId>org.apache.camel</groupId>
@@ -65,6 +76,7 @@
             <groupId>org.apache.deltaspike.core</groupId>
             <artifactId>deltaspike-core-impl</artifactId>
             <version>${deltaspike-version}</version>
+            <scope>runtime</scope>
         </dependency>
 
         <!-- only required for the Main -->
@@ -74,21 +86,6 @@
             <version>${deltaspike-version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-            <version>${geronimo-atinject-1.0-spec-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-            <version>${geronimo-jcdi-1.0-spec-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>${geronimo-interceptor-1.1-spec-version}</version>
-        </dependency>
 
         <!-- logging -->
         <dependency>
@@ -137,15 +134,55 @@
                     <version>${openwebbeans-version}</version>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                    <version>${geronimo-atinject-1.0-spec-version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+                    <version>${geronimo-jcdi-1.0-spec-version}</version>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+                    <version>${geronimo-interceptor-1.1-spec-version}</version>
+                    <scope>test</scope>
+                </dependency>
             </dependencies>
         </profile>
 
         <profile>
-            <id>weld</id>
+            <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>
+            <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>
+                    <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>
@@ -159,6 +196,7 @@
                     <version>${weld-version}</version>
                     <scope>provided</scope>
                 </dependency>
+
             </dependencies>
         </profile>
     </profiles>
diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
index 44a44b588633c..b93fb54010c05 100644
--- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
+++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/internal/CamelExtension.java
@@ -16,15 +16,20 @@
  */
 package org.apache.camel.cdi.internal;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.Consume;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.cdi.CdiCamelContext;
+import org.apache.camel.cdi.ContextName;
+import org.apache.camel.impl.DefaultCamelBeanPostProcessor;
+import org.apache.camel.model.RouteContainer;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.ReflectionHelper;
+import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.event.Observes;
@@ -42,22 +47,15 @@
 import javax.enterprise.inject.spi.ProcessProducerMethod;
 import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.Consume;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Produce;
-import org.apache.camel.RoutesBuilder;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.cdi.CdiCamelContext;
-import org.apache.camel.cdi.ContextName;
-import org.apache.camel.impl.DefaultCamelBeanPostProcessor;
-import org.apache.camel.model.RouteContainer;
-import org.apache.camel.util.ObjectHelper;
-import org.apache.camel.util.ReflectionHelper;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
-import org.apache.deltaspike.core.util.metadata.builder.AnnotatedTypeBuilder;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Set of camel specific hooks for CDI.
@@ -128,7 +126,7 @@ private void addRouteBuilderBean(final ProcessAnnotatedType<?> process, ContextN
      *
      * @param process Annotated type.
      */
-    protected void disableDefaultContext(@Observes ProcessAnnotatedType<CamelContext> process) {
+    protected void disableDefaultContext(@Observes ProcessAnnotatedType<? extends CamelContext> process) {
         process.veto();
     }
 
diff --git a/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java b/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java
index 52496c2ae6fcc..17d596a0fc3ee 100644
--- a/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java
+++ b/components/camel-cdi/src/test/java/org/apache/camel/cdi/EndpointDefinedUsingConfigPropertyTest.java
@@ -16,10 +16,6 @@
  */
 package org.apache.camel.cdi;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.inject.Inject;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
 import org.apache.camel.Produce;
@@ -27,9 +23,13 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.store.Item;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.deltaspike.core.api.config.annotation.ConfigProperty;
+import org.apache.deltaspike.core.api.config.ConfigProperty;
 import org.junit.Test;
 
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+
 public class EndpointDefinedUsingConfigPropertyTest extends CdiContextTestSupport {
 
     @Inject @ConfigProperty(name = "directEndpoint")